mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

packagegroup: Move inherit packagegroup to after PACKAGE_ARCH

Browse Source 
This means these classes now avoid the allarch inherit entirely.

(From OE-Core rev: a56aed2e6e1b73bffd2bf82145fe48b82fde9292)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2014-08-19 13:36:45 +01:00
parent 9541ec7b55
commit 9e213ddea2
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/packagegroups/packagegroup-base.bb
+5 -5
View File
@@ -2,6 +2,11 @@ SUMMARY = "Merge machine and distro options to create a basic machine task/packa
LICENSE = "MIT" LICENSE = "MIT"
PR = "r83" PR = "r83"
#
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup inherit packagegroup
PROVIDES = "${PACKAGES}" PROVIDES = "${PACKAGES}"
@@ -39,11 +44,6 @@ PACKAGES = ' \
\ \
' '
#
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
# Override by distro if needed # Override by distro if needed
VIRTUAL-RUNTIME_keymaps ?= "keymaps" VIRTUAL-RUNTIME_keymaps ?= "keymaps"
meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+2 -2
View File
@@ -7,10 +7,10 @@ DESCRIPTION = "The minimal set of packages required to boot the system"
LICENSE = "MIT" LICENSE = "MIT"
PR = "r17" PR = "r17"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
# #
# Set by the machine configuration with packages essential for device bootup # Set by the machine configuration with packages essential for device bootup
# #
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+2 -2
View File
@@ -7,10 +7,10 @@ LICENSE = "MIT"
PR = "r3" PR = "r3"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}"
PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+2 -2
View File
@@ -7,10 +7,10 @@ LICENSE = "MIT"
PR = "r2" PR = "r2"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
# kexec-tools doesn't work on Mips # kexec-tools doesn't work on Mips
KEXECTOOLS ?= "kexec" KEXECTOOLS ?= "kexec"
KEXECTOOLS_mips ?= "" KEXECTOOLS_mips ?= ""
meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
+2 -2
View File
@@ -6,10 +6,10 @@ SUMMARY = "X11 display server"
LICENSE = "MIT" LICENSE = "MIT"
PR = "r40" PR = "r40"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
XSERVERCODECS ?= "" XSERVERCODECS ?= ""
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+2 -2
View File
@@ -6,10 +6,10 @@ SUMMARY = "Sato desktop"
LICENSE = "MIT" LICENSE = "MIT"
PR = "r33" PR = "r33"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\