From 33d7e2bb51fb94b5a50d6d488fa8f1c54216fce2 Mon Sep 17 00:00:00 2001 From: alperak Date: Wed, 5 Jun 2024 17:18:24 +0300 Subject: [PATCH] recipes: Switch away from S = WORKDIR and use UNPACKDIR instead of WORKDIR - The layer compability has also been updated in this PR. * Using S = ${WORKDIR} is no longer supported. * UNPACKDIR is new contruct for do_unpack things in latest master we should be using that instead of WORKDIR for referencing those files. * We don't know yet what changes will be needed to stay compatible with final styhead, but we already know that the last changes for UNPACKDIR aren't compatible with scarthgap, nanbield or others. https://lists.openembedded.org/g/openembedded-architecture/message/2007 https://docs.yoctoproject.org/dev/ref-manual/variables.html?highlight=unpackdir#term-UNPACKDIR Signed-off-by: alperak --- conf/layer.conf | 2 +- recipes-bsp/u-boot/u-boot_%.bbappend | 14 +++++++------- recipes-devtools/python/pya20_0.2.12.bb | 2 +- .../xorg-xserver/xf86-video-fbturbo_git.bb | 2 +- recipes-kernel/linux/linux.inc | 4 ++-- .../uwe5622-firmware/uwe5622-firmware.bb | 3 ++- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 6dbdfcc..93bd08d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1" LAYERDEPENDS_sunxi = "core meta-python meta-arm" -LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap" +LAYERSERIES_COMPAT_sunxi = "styhead" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 0a87357..93bba10 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -12,12 +12,12 @@ DEFAULT_PREFERENCE:sun8i = "1" DEFAULT_PREFERENCE:sun50i = "1" SRC_URI:append:sunxi = " \ - file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ - file://0002-Added-nanopi-r1-board-support.patch \ - file://0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch \ - file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \ - file://0004-OrangePi-3-LTS-support.patch \ - file://boot.cmd \ + file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ + file://0002-Added-nanopi-r1-board-support.patch \ + file://0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch \ + file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \ + file://0004-OrangePi-3-LTS-support.patch \ + file://boot.cmd \ " UBOOT_ENV_SUFFIX:sunxi = "scr" @@ -29,5 +29,5 @@ EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null" do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy" do_compile:append:sunxi() { - ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY} + ${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY} } diff --git a/recipes-devtools/python/pya20_0.2.12.bb b/recipes-devtools/python/pya20_0.2.12.bb index be7e332..430ea79 100644 --- a/recipes-devtools/python/pya20_0.2.12.bb +++ b/recipes-devtools/python/pya20_0.2.12.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/pyA20-${PV}" inherit distutils3 do_compile:prepend() { -cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h + cp ${UNPACKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h } SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f" diff --git a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb index 4ba1949..ed5a049 100644 --- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb +++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb @@ -20,7 +20,7 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg " do_install:append() { install -d ${D}${datadir}/X11/xorg.conf.d - install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d + install -m 0644 ${UNPACKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d } FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf" diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index f43fdc3..c0e108e 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -45,8 +45,8 @@ do_configure:prepend() { # # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used # - if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then - install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm + if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then + install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm kernel_conf_variable LOGO y kernel_conf_variable LOGO_LINUX_CLUT224 y fi diff --git a/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb index 06a3868..4882604 100644 --- a/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb +++ b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb @@ -2,7 +2,8 @@ DESCRIPTION = "UWE5622 Wifi firmware" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"