Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-04-30 13:27:48 +02:00
parent 88ea40e38a
commit afbf2cd803
7 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dbl/recipes-core/images/dbl-image-base.bb
View File

@ -3,9 +3,7 @@
# #
DESCRIPTION = "DBL busybox based image." DESCRIPTION = "DBL busybox based image."
VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" IMAGE_INSTALL = "packagegroup-dbl-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_INSTALL = "packagegroup-dbl-core ${VIRTUAL-RUNTIME_dev_manager} ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_LINGUAS = " " IMAGE_LINGUAS = " "

8
meta-digi-dbl/recipes-core/packagegroups/packagegroup-dbl-core.bb
View File

@ -24,21 +24,23 @@ VIRTUAL-RUNTIME_passwd_manager ?= "shadow"
VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps" VIRTUAL-RUNTIME_keymaps ?= "keymaps"
VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev"
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
base-files \ base-files \
base-passwd \ base-passwd \
busybox \ busybox \
${VIRTUAL-RUNTIME_passwd_manager} \
${VIRTUAL-RUNTIME_initscripts} \
${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)} \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)} \
modutils-initscripts \ modutils-initscripts \
netbase \ netbase \
nvram \ nvram \
${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_dev_manager} \
${VIRTUAL-RUNTIME_init_manager} \ ${VIRTUAL-RUNTIME_init_manager} \
${VIRTUAL-RUNTIME_initscripts} \
${VIRTUAL-RUNTIME_login_manager} \
${VIRTUAL-RUNTIME_passwd_manager} \
${VIRTUAL-RUNTIME_update-alternatives} \ ${VIRTUAL-RUNTIME_update-alternatives} \
ubootenv \ ubootenv \
update-flash \ update-flash \

4
meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb
View File

@ -9,11 +9,7 @@ LICENSE = "ISC"
PR = "${DISTRO}.r0" PR = "${DISTRO}.r0"
# The distribution could set this to its device manger, for example udev.
VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev"
DEPENDS = "libnl" DEPENDS = "libnl"
RDEPENDS_${PN} = '${VIRTUAL-RUNTIME_dev_manager}'
REG_RELEASE_DATE = "2013.01.11" REG_RELEASE_DATE = "2013.01.11"
SRC_URI = " \ SRC_URI = " \

2
meta-digi-del/recipes-core/images/del-image-graphical.bb
View File

@ -9,8 +9,6 @@ IMAGE_FEATURES += "splash package-management x11-base x11-sato"
LICENSE = "MIT" LICENSE = "MIT"
VIRTUAL-RUNTIME_dev_manager = "udev"
include del-image-minimal.bb include del-image-minimal.bb
DISTRO_FEATURES += "pulseaudio" DISTRO_FEATURES += "pulseaudio"

4
meta-digi-del/recipes-core/images/del-image-minimal-dev.bb
View File

@ -6,9 +6,7 @@ DESCRIPTION = "DEL busybox based image (non graphical) suitable for development
INC_PR = "r0" INC_PR = "r0"
PR = "${INC_PR}" PR = "${INC_PR}"
VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" IMAGE_INSTALL = "packagegroup-del-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_INSTALL = "packagegroup-del-core ${VIRTUAL-RUNTIME_dev_manager} ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
VIRTUAL-RUNTIME_accel-graphics = '${@base_contains("DISTRO_FEATURES", "x11", "", "amd-gpu-bin-mx51", d)}' 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)}" IMAGE_INSTALL_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accel-graphics', '${VIRTUAL-RUNTIME_accel-graphics}', '', d)}"

4
meta-digi-del/recipes-core/images/del-image-minimal.bb
View File

@ -6,9 +6,7 @@ DESCRIPTION = "DEL busybox based image (non graphical)."
INC_PR = "r0" INC_PR = "r0"
PR = "${INC_PR}" PR = "${INC_PR}"
VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" IMAGE_INSTALL = "packagegroup-del-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_INSTALL = "packagegroup-del-core ${VIRTUAL-RUNTIME_dev_manager} ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
VIRTUAL-RUNTIME_accel-graphics = '${@base_contains("DISTRO_FEATURES", "x11", "", "amd-gpu-bin-mx51", d)}' 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)}" IMAGE_INSTALL_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accel-graphics', '${VIRTUAL-RUNTIME_accel-graphics}', '', d)}"

10
meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb
View File

@ -24,20 +24,24 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps" 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} = "\ RDEPENDS_${PN} = "\
base-files \ base-files \
base-passwd \ base-passwd \
busybox \ busybox \
${VIRTUAL-RUNTIME_passwd_manager} \
${VIRTUAL-RUNTIME_initscripts} \
${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)} \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)} \
modutils-initscripts \ modutils-initscripts \
netbase \ netbase \
nvram \ nvram \
${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_dev_manager} \
${VIRTUAL-RUNTIME_init_manager} \ ${VIRTUAL-RUNTIME_init_manager} \
${VIRTUAL-RUNTIME_initscripts} \
${VIRTUAL-RUNTIME_login_manager} \
${VIRTUAL-RUNTIME_passwd_manager} \
${VIRTUAL-RUNTIME_update-alternatives} \ ${VIRTUAL-RUNTIME_update-alternatives} \
ubootenv \ ubootenv \
update-flash \ update-flash \