* [PATCH v2] busybox: add virtual reference instead
@ 2015-10-21 15:42 Alejandro Joya
2015-10-26 22:45 ` Joya Cruz, Alejandro
0 siblings, 1 reply; 2+ messages in thread
From: Alejandro Joya @ 2015-10-21 15:42 UTC (permalink / raw)
To: openembedded-core
These recipes have a hardcoded dependency to busybox,
in order to be able to have a flexible selection,
instead of the hardcoded dependency, now it is point to virtual reference
base-utils.
Signed-off-by: Alejandro Joya <alejandro.joya.cruz@intel.com>
---
meta/conf/distro/include/default-providers.inc | 3 +++
meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +-
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +-
meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++--
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 9f84d5c..bb382bd 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/base-utils ?= "busybox"
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
#
@@ -23,6 +24,8 @@ VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools"
+VIRTUAL-RUNTIME_base-utils ?= "busybox"
+VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock"
#
# Default recipe providers
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 1f0fa95..a26286e 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \
the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
first 'init' program more efficiently."
-PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
+PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES = ""
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 6c37b9a..0664a95 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -1,7 +1,7 @@
SUMMARY = "Modular initramfs system"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-RDEPENDS_${PN} += "busybox"
+RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}"
PR = "r2"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 09f5373..7e40445 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -24,7 +24,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
-SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
+SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc','${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \
modutils-initscripts \
init-ifupdown \
${VIRTUAL-RUNTIME_initscripts} \
@@ -33,7 +33,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc
RDEPENDS_${PN} = "\
base-files \
base-passwd \
- busybox \
+ ${VIRTUAL-RUNTIME_base-utils} \
${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
netbase \
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] busybox: add virtual reference instead
2015-10-21 15:42 [PATCH v2] busybox: add virtual reference instead Alejandro Joya
@ 2015-10-26 22:45 ` Joya Cruz, Alejandro
0 siblings, 0 replies; 2+ messages in thread
From: Joya Cruz, Alejandro @ 2015-10-26 22:45 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org
Any comments on this?
On mié, 2015-10-21 at 10:42 -0500, Alejandro Joya wrote:
> These recipes have a hardcoded dependency to busybox,
> in order to be able to have a flexible selection,
> instead of the hardcoded dependency, now it is point to virtual reference
> base-utils.
>
> Signed-off-by: Alejandro Joya <alejandro.joya.cruz@intel.com>
> ---
> meta/conf/distro/include/default-providers.inc | 3 +++
> meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +-
> meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +-
> meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++--
> 4 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> index 9f84d5c..bb382bd 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
> PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
> PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
> +PREFERRED_PROVIDER_virtual/base-utils ?= "busybox"
> PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
>
> #
> @@ -23,6 +24,8 @@ VIRTUAL-RUNTIME_apm ?= "apm"
> VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
> VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
> VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools"
> +VIRTUAL-RUNTIME_base-utils ?= "busybox"
> +VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock"
>
> #
> # Default recipe providers
> diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
> index 1f0fa95..a26286e 100644
> --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
> +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
> @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \
> the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
> first 'init' program more efficiently."
>
> -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
> +PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
>
> # Do not pollute the initrd image with rootfs features
> IMAGE_FEATURES = ""
> diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
> index 6c37b9a..0664a95 100644
> --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
> +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
> @@ -1,7 +1,7 @@
> SUMMARY = "Modular initramfs system"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> -RDEPENDS_${PN} += "busybox"
> +RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}"
>
> PR = "r2"
>
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> index 09f5373..7e40445 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> @@ -24,7 +24,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
> VIRTUAL-RUNTIME_initscripts ?= "initscripts"
> VIRTUAL-RUNTIME_keymaps ?= "keymaps"
>
> -SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
> +SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc','${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \
> modutils-initscripts \
> init-ifupdown \
> ${VIRTUAL-RUNTIME_initscripts} \
> @@ -33,7 +33,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc
> RDEPENDS_${PN} = "\
> base-files \
> base-passwd \
> - busybox \
> + ${VIRTUAL-RUNTIME_base-utils} \
> ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
> ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
> netbase \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-26 22:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-21 15:42 [PATCH v2] busybox: add virtual reference instead Alejandro Joya
2015-10-26 22:45 ` Joya Cruz, Alejandro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox