From: Jan Kiszka <[email protected]> This comes with a number of fixes which we will need for the upcoming ESPRESSObin support.
It also comes with the need to adjust dpkg recipes so that preparation steps such as Debianizations are moved into do_prepare_build. Furthermore, BUILDCHROOT_PREINSTALL_WIC was replaced with IMAGE_INSTALL. Signed-off-by: Jan Kiszka <[email protected]> --- conf/multiconfig/orangepi-zero-jailhouse.conf | 3 +-- kas.yml | 2 +- recipes-core/non-root-initramfs/non-root-initramfs_2018.05.1.bb | 2 +- recipes-jailhouse/jailhouse/jailhouse.inc | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/multiconfig/orangepi-zero-jailhouse.conf b/conf/multiconfig/orangepi-zero-jailhouse.conf index b8605f7..93c886b 100644 --- a/conf/multiconfig/orangepi-zero-jailhouse.conf +++ b/conf/multiconfig/orangepi-zero-jailhouse.conf @@ -22,8 +22,7 @@ IMAGE_INSTALL_append = " xradio" IMAGE_TYPE = "wic-img" WKS_FILE ?= "orangepi-zero" - -BUILDCHROOT_PREINSTALL_WIC_append = " u-boot-sunxi" +IMAGER_INSTALL += "u-boot-sunxi" DISTRO_APT_SOURCES_append = " conf/distro/debian-buster.list" DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.orangepi-zero.conf" diff --git a/kas.yml b/kas.yml index 6ff8e47..87de901 100644 --- a/kas.yml +++ b/kas.yml @@ -19,7 +19,7 @@ repos: isar: url: https://github.com/ilbers/isar - refspec: b18ad30c8ca61670406288070544a755493a5303 + refspec: e231e88b447cdad1a233ad29ff23545bc50f398b layers: meta: meta-isar: diff --git a/recipes-core/non-root-initramfs/non-root-initramfs_2018.05.1.bb b/recipes-core/non-root-initramfs/non-root-initramfs_2018.05.1.bb index 81156ed..9a23f44 100644 --- a/recipes-core/non-root-initramfs/non-root-initramfs_2018.05.1.bb +++ b/recipes-core/non-root-initramfs/non-root-initramfs_2018.05.1.bb @@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "8dc4b9bd22a165a4df0a1737f01de3dd0a6c15d9f8b16989426af06247 S = "${WORKDIR}/buildroot-${PV}" -dpkg_runbuild_prepend() { +do_prepare_build() { cd ${WORKDIR} cp -r debian ${S} diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc index 65585b3..15f2c21 100644 --- a/recipes-jailhouse/jailhouse/jailhouse.inc +++ b/recipes-jailhouse/jailhouse/jailhouse.inc @@ -31,7 +31,7 @@ inherit dpkg DEPENDS = "linux-image-${KERNEL_NAME}" -dpkg_runbuild_prepend() { +do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ if [ "${DISTRO_ARCH}" != "amd64" ]; then # Install device trees only on non-x86 archs as they only exist there -- 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.
