From b43165328658087277b667152fdbc04fe07cba08 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 15 May 2018 14:46:21 +0200 Subject: 3rd part of the layer/profile rework [1/2] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the last larger commit in this series and deals with the graphical part. We introduce the graphical profiles: - meta-agl-profile-graphical -- meta-agl-profile-graphical-html5 -- meta-agl-profile-graphical-qt5 Notable changes: - weston-ini-conf moved to the meta-agl-bsp layer. Most BSPs have bbappends, so we need to have the recipes present (but unused) even in the console images. - new image: agl-image-boot = terminal-only + network + package-manaager. Ready for using package-feeds - new image/sdk: agl-image-minimal-crosssdk - agl-service-mediaplayer has a dependency on weston, thus it cannot be in the 'core'. Moved it to profile-graphical. - The wayland-ivi-extension moved to the agl-demo-platform. - The app-framework layer included and pulled 'web-runtime' as dependency. This broke console-only images. This has been moved to be in meta-agl-demo only for now. - added and massaged the agl-features. - found and added a useful script 'oe-depends-dot' that helps to work with the dot files (produced with bitbake -g) Todo: - we'll need another pass through the packagegroups. The dependencies for the layers/profiles are now sorted-out but we might have to add/shuffle a few packages. For further details, see meta-agl/docs/profiles.md. v2: fix meta-agl/meta-security/conf/layer.conf - the immediate expansion previously used in there caused some recipes not being added to BBFILES. v3: fix packagegroup renaming (packagegroup-agl-devel -> packagegroup-agl-core-devel) v4: fix missing packagegroup inclusion (tnx Jose, Scott, Stephane) v5: fix missing packagegroup inclusion v6: explicitely put profile-graphical-qt5 on-top of profile-graphical v7: re-add 'procps' when agl-devel feature is on Bug-AGL: SPEC-145 Change-Id: I24cdcd1118932758d0c55d333338238f2a770877 Signed-off-by: Jan-Simon Möller --- .../packagegroup-agl-core-automotive.bb | 13 ------ .../packagegroup-agl-core-connectivity.bb | 15 ------- .../packagegroup-agl-core-graphics.bb | 10 ----- .../packagegroups/packagegroup-agl-core-kernel.bb | 13 ------ .../packagegroup-agl-core-multimedia.bb | 13 ------ .../packagegroup-agl-core-navi-lbs.bb | 13 ------ .../packagegroup-agl-core-os-commonlibs.bb | 13 ------ .../packagegroup-agl-core-security.bb | 13 ------ .../packagegroup-agl-core-speech-services.bb | 13 ------ .../packagegroups/packagegroup-agl-image-boot.bb | 18 -------- .../packagegroup-agl-image-minimal.bb | 27 ------------ .../packagegroups/packagegroup-core-boot-agl.bb | 50 ---------------------- 12 files changed, 211 deletions(-) delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb delete mode 100644 meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb (limited to 'meta-agl-profile-core/recipes-core/packagegroups') diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb deleted file mode 100644 index d9f2279e1..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-automotive.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Automotive Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-automotive \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb deleted file mode 100644 index e909d5e5f..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Connectivity Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-connectivity \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - dhcp-server \ - ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests connman-tools connman-ncurses','',d)} \ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb deleted file mode 100644 index 1cc6f457b..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-graphics.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Graphics Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-graphics \ - " - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb deleted file mode 100644 index 3d5556fd5..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-kernel.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Kernel Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-kernel \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb deleted file mode 100644 index 01ca4cb85..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-multimedia.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Multimedia Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-multimedia \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb deleted file mode 100644 index 2b04d5387..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-navi-lbs.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Navigation and Location Based Services Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-navi-lbs \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb deleted file mode 100644 index c44166e12..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-os-commonlibs.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Operating System and Common libraries Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-os-commonlibs \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb deleted file mode 100644 index eb5a68f0a..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-security.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Security Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-security \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb deleted file mode 100644 index a494e5889..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-core-speech-services.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The minimal set of packages for Speech Services Subsystem" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-core-speech-services \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb deleted file mode 100644 index 29f859c49..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-boot.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "The minimal set of packages required by AGL" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-image-boot \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - packagegroup-core-boot-agl \ - " - - -RDEPENDS_${PN} += "\ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb deleted file mode 100644 index 630c11d43..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-agl-image-minimal.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "The minimal set of packages required by AGL" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-image-minimal \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "\ - packagegroup-core-boot-agl \ - " - - -RDEPENDS_${PN} += "\ - packagegroup-agl-core-automotive \ - packagegroup-agl-core-connectivity \ - packagegroup-agl-core-graphics \ - packagegroup-agl-core-multimedia \ - packagegroup-agl-core-navi-lbs \ - packagegroup-agl-core-os-commonlibs \ - packagegroup-agl-core-speech-services \ - packagegroup-agl-core-security \ - packagegroup-agl-core-kernel \ - " diff --git a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb b/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb deleted file mode 100644 index c9d679879..000000000 --- a/meta-agl-profile-core/recipes-core/packagegroups/packagegroup-core-boot-agl.bb +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# -# derived from oe-core: meta/recipes-core/packagegroups/packagegroup-core-boot.bb - -SUMMARY = "Minimal boot requirements" -DESCRIPTION = "The minimal set of packages required to boot the system" -LICENSE = "MIT" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - -# Distro can override the following VIRTUAL-RUNTIME providers: -VIRTUAL-RUNTIME_dev_manager ?= "udev" -VIRTUAL-RUNTIME_login_manager ?= "busybox" -VIRTUAL-RUNTIME_init_manager ?= "sysvinit" -VIRTUAL-RUNTIME_initscripts ?= "initscripts" -VIRTUAL-RUNTIME_keymaps ?= "keymaps" - -SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ - modutils-initscripts \ - init-ifupdown \ - ${VIRTUAL-RUNTIME_initscripts} \ - " - -RDEPENDS_${PN} = "\ - base-files \ - base-passwd \ - busybox \ - run-agl-postinsts \ - ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ - netbase \ - ${VIRTUAL-RUNTIME_login_manager} \ - ${VIRTUAL-RUNTIME_init_manager} \ - ${VIRTUAL-RUNTIME_dev_manager} \ - ${VIRTUAL-RUNTIME_update-alternatives} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_${PN} = "\ - tzdata \ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - -- cgit 1.2.3-korg