From: Jan Kiszka <[email protected]> The customizations package no longer depends on u-boot-script because it no longer modifies its default conf. So it's cleaner to select the u-boot-script installation via the respective machine conf.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/machine/espressobin.conf | 2 ++ conf/machine/macchiatobin.conf | 2 ++ conf/machine/orangepi-zero.conf | 2 +- recipes-core/customizations/customizations.bb | 9 --------- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/conf/machine/espressobin.conf b/conf/machine/espressobin.conf index 29ebe63..20a0df9 100644 --- a/conf/machine/espressobin.conf +++ b/conf/machine/espressobin.conf @@ -12,3 +12,5 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE = "wic-img" + +IMAGE_INSTALL += "u-boot-script" diff --git a/conf/machine/macchiatobin.conf b/conf/machine/macchiatobin.conf index 7086fa3..0b6b869 100644 --- a/conf/machine/macchiatobin.conf +++ b/conf/machine/macchiatobin.conf @@ -15,5 +15,7 @@ IMAGE_TYPE = "wic-img" IMAGER_INSTALL += "u-boot-macchiatobin" IMAGER_BUILD_DEPS += "u-boot-macchiatobin" +IMAGE_INSTALL += "u-boot-script" + PREFERRED_PROVIDER_u-boot-macchiatobin = "u-boot-macchiatobin" PREFERRED_PROVIDER_u-boot-tools = "u-boot-macchiatobin" diff --git a/conf/machine/orangepi-zero.conf b/conf/machine/orangepi-zero.conf index 377c9c6..8d6c134 100644 --- a/conf/machine/orangepi-zero.conf +++ b/conf/machine/orangepi-zero.conf @@ -17,4 +17,4 @@ IMAGER_INSTALL += "u-boot-sunxi" DISTRO_APT_SOURCES_append = " conf/distro/debian-buster.list" DISTRO_APT_PREFERENCES += "conf/machine/preferences.orangepi-zero.conf" -IMAGE_INSTALL_append = " xradio-${KERNEL_NAME}" +IMAGE_INSTALL += "u-boot-script xradio-${KERNEL_NAME}" diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb index d2221e9..5cd20f8 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/customizations.bb @@ -28,15 +28,6 @@ SRC_URI = " \ DEBIAN_DEPENDS = "openssh-server, passwd" -DEBIAN_DEPENDS_append_orangepi-zero = ", u-boot-script" -DEPENDS_append_orangepi-zero = "u-boot-script" - -DEBIAN_DEPENDS_append_espressobin = ", u-boot-script" -DEPENDS_append_espressobin = "u-boot-script" - -DEBIAN_DEPENDS_append_macchiatobin = ", u-boot-script" -DEPENDS_append_macchiatobin = "u-boot-tools u-boot-script" - do_install() { install -v -d ${D}/etc/modprobe.d install -v -m 644 ${WORKDIR}/e1000e-intx.conf ${D}/etc/modprobe.d/ -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
