| Message ID | 20240526010209.33012-1-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip] u-boot: updates for WORKDIR/UNPACKDIR cleanup | expand |
Hi Trevor, On 5/26/24 3:02 AM, Trevor Woerner via lists.yoctoproject.org wrote: > Builds no longer work if artifacts are placed in WORKDIR. > > oe-core: b84eec5c4cbf ("base: Switch UNPACKDIR to a subdir of WORKDIR") > Signed-off-by: Trevor Woerner <twoerner@gmail.com> Note that this isn't compatible with Scarthgap, so we need to branch off master into scarthgap in meta-rockchip before merging this? Except if OE-Core is planning on backporting an UNPACKDIR="something-reasonable" to scarthgap? Are you aware of such a plan? For the change itself: Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de> I also saw that we still have WORKDIR used in classes/rockchip-gpt-img.bbclass, probably some changes to be made there as well? Thanks! Quentin
On Mon 2024-05-27 @ 02:23:02 PM, Quentin Schulz via lists.yoctoproject.org wrote: > Hi Trevor, > > On 5/26/24 3:02 AM, Trevor Woerner via lists.yoctoproject.org wrote: > > Builds no longer work if artifacts are placed in WORKDIR. > > > > oe-core: b84eec5c4cbf ("base: Switch UNPACKDIR to a subdir of WORKDIR") > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > > Note that this isn't compatible with Scarthgap, so we need to branch off > master into scarthgap in meta-rockchip before merging this? Done. > Except if OE-Core is planning on backporting an > UNPACKDIR="something-reasonable" to scarthgap? Are you aware of such a plan? I haven't heard any such thing (then again I don't read or listen to everything). > For the change itself: > > Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de> Thanks! Applied to meta-rockchip, master branch. > I also saw that we still have WORKDIR used in > classes/rockchip-gpt-img.bbclass, probably some changes to be made there as > well? Probably :-) It would be interesting to see if anyone notices (in practice).
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 5c9e442cca8d..7d2e4a02e151 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -58,7 +58,7 @@ rk_generate_env() { UBOOT_ENV_SIZE="$(cat ${B}/.config | grep "^CONFIG_ENV_SIZE=" | cut -d'=' -f2)" # linux user-space U-Boot env config file - echo "/dev/disk/by-partlabel/uboot_env 0x0000 ${UBOOT_ENV_SIZE}" > ${WORKDIR}/fw_env.config + echo "/dev/disk/by-partlabel/uboot_env 0x0000 ${UBOOT_ENV_SIZE}" > ${UNPACKDIR}/fw_env.config # convert text-based environment to binary suitable for image if [ "${@bb.utils.to_boolean(d.getVar('RK_IMAGE_INCLUDES_UBOOT_ENV'), False)}" = "True" ]; then @@ -66,14 +66,14 @@ rk_generate_env() { echo "initial, text-formatted U-Boot environment file \"${B}/u-boot-initial-env\" not found" return 1 fi - mkenvimage -s ${UBOOT_ENV_SIZE} ${B}/u-boot-initial-env -o ${WORKDIR}/u-boot.env + mkenvimage -s ${UBOOT_ENV_SIZE} ${B}/u-boot-initial-env -o ${B}/u-boot.env fi } do_compile[postfuncs] += "${@'rk_generate_env' if 'rk-u-boot-env' in d.getVar('MACHINEOVERRIDES').split(':') else 'rk_no_env'}" do_deploy:append:rk-u-boot-env() { - if [ -f ${WORKDIR}/u-boot.env -a "${@bb.utils.to_boolean(d.getVar('RK_IMAGE_INCLUDES_UBOOT_ENV'),False)}" = "True" ]; then + if [ -f ${B}/u-boot.env -a "${@bb.utils.to_boolean(d.getVar('RK_IMAGE_INCLUDES_UBOOT_ENV'),False)}" = "True" ]; then install -d ${DEPLOYDIR} - install -m 0644 ${WORKDIR}/u-boot.env ${DEPLOYDIR} + install -m 0644 ${B}/u-boot.env ${DEPLOYDIR} fi }
Builds no longer work if artifacts are placed in WORKDIR. oe-core: b84eec5c4cbf ("base: Switch UNPACKDIR to a subdir of WORKDIR") Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- recipes-bsp/u-boot/u-boot_%.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)