From afbf2cd8035434f27c0a67998f3dc1b721924709 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 30 Apr 2013 13:27:48 +0200 Subject: [PATCH] meta-digi: rework setting VIRTUAL-RUNTIME_dev_manager As a result fix CRDA hard-dependence on busybox mdev. https://jira.digi.com/browse/DEL-434 Signed-off-by: Javier Viguera --- meta-digi-dbl/recipes-core/images/dbl-image-base.bb | 4 +--- .../packagegroups/packagegroup-dbl-core.bb | 8 +++++--- meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb | 4 ---- .../recipes-core/images/del-image-graphical.bb | 2 -- .../recipes-core/images/del-image-minimal-dev.bb | 4 +--- meta-digi-del/recipes-core/images/del-image-minimal.bb | 4 +--- .../packagegroups/packagegroup-del-core.bb | 10 +++++++--- 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/meta-digi-dbl/recipes-core/images/dbl-image-base.bb b/meta-digi-dbl/recipes-core/images/dbl-image-base.bb index 88a0bb837..78113dd68 100644 --- a/meta-digi-dbl/recipes-core/images/dbl-image-base.bb +++ b/meta-digi-dbl/recipes-core/images/dbl-image-base.bb @@ -3,9 +3,7 @@ # DESCRIPTION = "DBL busybox based image." -VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" - -IMAGE_INSTALL = "packagegroup-dbl-core ${VIRTUAL-RUNTIME_dev_manager} ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" +IMAGE_INSTALL = "packagegroup-dbl-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_LINGUAS = " " diff --git a/meta-digi-dbl/recipes-core/packagegroups/packagegroup-dbl-core.bb b/meta-digi-dbl/recipes-core/packagegroups/packagegroup-dbl-core.bb index f441161e0..ed72aa7c1 100644 --- a/meta-digi-dbl/recipes-core/packagegroups/packagegroup-dbl-core.bb +++ b/meta-digi-dbl/recipes-core/packagegroups/packagegroup-dbl-core.bb @@ -24,21 +24,23 @@ VIRTUAL-RUNTIME_passwd_manager ?= "shadow" VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" +VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" RDEPENDS_${PN} = "\ base-files \ base-passwd \ busybox \ - ${VIRTUAL-RUNTIME_passwd_manager} \ - ${VIRTUAL-RUNTIME_initscripts} \ ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)} \ modutils-initscripts \ netbase \ nvram \ - ${VIRTUAL-RUNTIME_login_manager} \ + ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ + ${VIRTUAL-RUNTIME_initscripts} \ + ${VIRTUAL-RUNTIME_login_manager} \ + ${VIRTUAL-RUNTIME_passwd_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ ubootenv \ update-flash \ diff --git a/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb b/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb index f51c7e984..c1c62ef95 100644 --- a/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb +++ b/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb @@ -9,11 +9,7 @@ LICENSE = "ISC" PR = "${DISTRO}.r0" -# The distribution could set this to its device manger, for example udev. -VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" - DEPENDS = "libnl" -RDEPENDS_${PN} = '${VIRTUAL-RUNTIME_dev_manager}' REG_RELEASE_DATE = "2013.01.11" SRC_URI = " \ diff --git a/meta-digi-del/recipes-core/images/del-image-graphical.bb b/meta-digi-del/recipes-core/images/del-image-graphical.bb index 0aa681570..c3bae4021 100644 --- a/meta-digi-del/recipes-core/images/del-image-graphical.bb +++ b/meta-digi-del/recipes-core/images/del-image-graphical.bb @@ -9,8 +9,6 @@ IMAGE_FEATURES += "splash package-management x11-base x11-sato" LICENSE = "MIT" -VIRTUAL-RUNTIME_dev_manager = "udev" - include del-image-minimal.bb DISTRO_FEATURES += "pulseaudio" diff --git a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb index fc93cf352..3b875c5c0 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb @@ -6,9 +6,7 @@ DESCRIPTION = "DEL busybox based image (non graphical) suitable for development INC_PR = "r0" PR = "${INC_PR}" -VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" - -IMAGE_INSTALL = "packagegroup-del-core ${VIRTUAL-RUNTIME_dev_manager} ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" +IMAGE_INSTALL = "packagegroup-del-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" VIRTUAL-RUNTIME_accel-graphics = '${@base_contains("DISTRO_FEATURES", "x11", "", "amd-gpu-bin-mx51", d)}' IMAGE_INSTALL_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accel-graphics', '${VIRTUAL-RUNTIME_accel-graphics}', '', d)}" diff --git a/meta-digi-del/recipes-core/images/del-image-minimal.bb b/meta-digi-del/recipes-core/images/del-image-minimal.bb index 936972ce0..fc4262ed2 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal.bb @@ -6,9 +6,7 @@ DESCRIPTION = "DEL busybox based image (non graphical)." INC_PR = "r0" PR = "${INC_PR}" -VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" - -IMAGE_INSTALL = "packagegroup-del-core ${VIRTUAL-RUNTIME_dev_manager} ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" +IMAGE_INSTALL = "packagegroup-del-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" VIRTUAL-RUNTIME_accel-graphics = '${@base_contains("DISTRO_FEATURES", "x11", "", "amd-gpu-bin-mx51", d)}' IMAGE_INSTALL_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accel-graphics', '${VIRTUAL-RUNTIME_accel-graphics}', '', d)}" diff --git a/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb index 60b893113..0663448c0 100644 --- a/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb +++ b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb @@ -24,20 +24,24 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" +# Set device manager depending on X11 feature +VIRTUAL-RUNTIME_dev_manager ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'udev', 'busybox-mdev', d)}" + RDEPENDS_${PN} = "\ base-files \ base-passwd \ busybox \ - ${VIRTUAL-RUNTIME_passwd_manager} \ - ${VIRTUAL-RUNTIME_initscripts} \ ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)} \ modutils-initscripts \ netbase \ nvram \ - ${VIRTUAL-RUNTIME_login_manager} \ + ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ + ${VIRTUAL-RUNTIME_initscripts} \ + ${VIRTUAL-RUNTIME_login_manager} \ + ${VIRTUAL-RUNTIME_passwd_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ ubootenv \ update-flash \