From a8c2a52f00d86b1cd65b7d49b76aedd46003a378 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 14 Dec 2025 19:17:19 -0500 Subject: [PATCH] Updates for whinlatter UNPACKDIR/WORKDIR transition Signed-off-by: Hugo Villeneuve --- .../recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend | 2 +- recipes-extended/screen/screen_%.bbappend | 2 +- recipes-multimedia/hvmpd-manager/hvmpd-manager.bb | 6 ++++-- recipes-multimedia/musicpd/mpd_%.bbappend | 2 +- recipes-multimedia/musicpd/mympd_git.bb | 2 -- recipes-multimedia/musicpd/ympd.bb | 2 -- recipes-multimedia/shairport-sync/shairport-sync_git.bb | 8 +++----- recipes-support/hvutils-lcd/hvutils-lcd.bb | 4 +++- recipes-support/swupdate/swupdate_%.bbappend | 6 +++--- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend b/raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend index 5bac502..54d8fd8 100644 --- a/raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend +++ b/raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend @@ -4,5 +4,5 @@ do_compile:prepend() { sed -e "s!@@ROOT_PART_A_ID@@!${ROOT_PART_A_ID}!g" \ -e "s!@@ROOT_PARENT_DEV@@!${ROOT_PARENT_DEV}!g" \ -e "s!@@ROOT_PART_PREFIX@@!${ROOT_PART_PREFIX}!g" \ - -i "${WORKDIR}/boot.cmd.in" + -i "${UNPACKDIR}/boot.cmd.in" } diff --git a/recipes-extended/screen/screen_%.bbappend b/recipes-extended/screen/screen_%.bbappend index faa7d98..e80ee3e 100644 --- a/recipes-extended/screen/screen_%.bbappend +++ b/recipes-extended/screen/screen_%.bbappend @@ -6,7 +6,7 @@ SRC_URI:append:hvmpd = " \ do_install:append:hvmpd() { install -d ${D}${ROOT_HOME} - install -m 644 ${WORKDIR}/user-screenrc ${D}${ROOT_HOME}/.screenrc + install -m 644 ${UNPACKDIR}/user-screenrc ${D}${ROOT_HOME}/.screenrc } FILES:${PN}:append:hvmpd = "\ diff --git a/recipes-multimedia/hvmpd-manager/hvmpd-manager.bb b/recipes-multimedia/hvmpd-manager/hvmpd-manager.bb index ca5f6fc..01d1090 100644 --- a/recipes-multimedia/hvmpd-manager/hvmpd-manager.bb +++ b/recipes-multimedia/hvmpd-manager/hvmpd-manager.bb @@ -10,14 +10,16 @@ SRC_URI = "\ file://hvmpd.sh \ " +S = "${UNPACKDIR}" + inherit systemd do_install() { install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/hvmpd.sh ${D}${sbindir} + install -m 0755 ${S}/hvmpd.sh ${D}${sbindir} install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/hvmpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/hvmpd.service ${D}${systemd_unitdir}/system } FILES:${PN} = " \ diff --git a/recipes-multimedia/musicpd/mpd_%.bbappend b/recipes-multimedia/musicpd/mpd_%.bbappend index 9b5c0e3..8fccf52 100644 --- a/recipes-multimedia/musicpd/mpd_%.bbappend +++ b/recipes-multimedia/musicpd/mpd_%.bbappend @@ -42,7 +42,7 @@ do_install:append() { echo " mixer_control \"${ALSA_MIXER}\"" >> ${D}/${sysconfdir}/mpd.conf echo "}" >> ${D}/${sysconfdir}/mpd.conf - install -m 644 -o mpd -g audio ${WORKDIR}/*.m3u ${D}/${localstatedir}/lib/mpd/playlists/ + install -m 644 -o mpd -g audio ${UNPACKDIR}/*.m3u ${D}/${localstatedir}/lib/mpd/playlists/ # Disabling autostart of mpd.socket, in order to enable zeroconf: rm ${D}${systemd_unitdir}/system/mpd.socket diff --git a/recipes-multimedia/musicpd/mympd_git.bb b/recipes-multimedia/musicpd/mympd_git.bb index d4a0b7d..ef82e99 100644 --- a/recipes-multimedia/musicpd/mympd_git.bb +++ b/recipes-multimedia/musicpd/mympd_git.bb @@ -11,8 +11,6 @@ SRCBRANCH = "master" SRCREV = "${AUTOREV}" SRC_URI = "git://github.com/jcorporation/myMPD.git;branch=${SRCBRANCH};protocol=https" -S = "${WORKDIR}/git" - inherit pkgconfig cmake systemd # Remove user version of service. We use system version. diff --git a/recipes-multimedia/musicpd/ympd.bb b/recipes-multimedia/musicpd/ympd.bb index f0b94fb..04b54fb 100644 --- a/recipes-multimedia/musicpd/ympd.bb +++ b/recipes-multimedia/musicpd/ympd.bb @@ -13,8 +13,6 @@ SRCREV = "${AUTOREV}" # Original URI: git://github.com/SuperBFG7/ympd.git SRC_URI = "git://git.hugovil.com/git/ympd.git;protocol=http;branch=${SRCBRANCH}" -S = "${WORKDIR}/git" - inherit pkgconfig cmake systemd do_install() { diff --git a/recipes-multimedia/shairport-sync/shairport-sync_git.bb b/recipes-multimedia/shairport-sync/shairport-sync_git.bb index 18a6bd2..30e006a 100644 --- a/recipes-multimedia/shairport-sync/shairport-sync_git.bb +++ b/recipes-multimedia/shairport-sync/shairport-sync_git.bb @@ -14,8 +14,6 @@ SRC_URI += " \ file://mpc-stop.sh \ " -S = "${WORKDIR}/git" - inherit autotools pkgconfig systemd useradd EXTRA_OECONF = " \ @@ -33,16 +31,16 @@ AIRPLAY_SERVER_NAME ?= "%h shairplay-sync" do_install:append() { sed -e "s/@AIRPLAY_SERVER_NAME@/${AIRPLAY_SERVER_NAME}/" \ - ${WORKDIR}/shairport-sync.conf.in > ${WORKDIR}/shairport-sync.conf + ${UNPACKDIR}/shairport-sync.conf.in > ${UNPACKDIR}/shairport-sync.conf install -d ${D}${sysconfdir}/ - install -m 0644 ${WORKDIR}/shairport-sync.conf ${D}${sysconfdir}/ + install -m 0644 ${UNPACKDIR}/shairport-sync.conf ${D}${sysconfdir}/ # Modify shairport-sync start arguments to always stop MPD before playing: sed -i -e "s@^\(ExecStart=.*\)@\1 -w --on-start=${bindir}/mpc-stop.sh@g" \ ${D}${systemd_unitdir}/system/shairport-sync.service install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/mpc-stop.sh ${D}${bindir} + install -m 0755 ${UNPACKDIR}/mpc-stop.sh ${D}${bindir} } SYSTEMD_SERVICE:${PN} = " \ diff --git a/recipes-support/hvutils-lcd/hvutils-lcd.bb b/recipes-support/hvutils-lcd/hvutils-lcd.bb index 7d66979..9a96a53 100644 --- a/recipes-support/hvutils-lcd/hvutils-lcd.bb +++ b/recipes-support/hvutils-lcd/hvutils-lcd.bb @@ -7,10 +7,12 @@ PV = "0.0.1" SRC_URI += "file://hvutils-lcd.sh" +S = "${UNPACKDIR}" + do_install() { # Common header shell script: install -d ${D}${bindir} - install -m 0644 ${WORKDIR}/hvutils-lcd.sh ${D}${bindir}/ + install -m 0644 ${S}/hvutils-lcd.sh ${D}${bindir}/ } FILES:${PN} += "${bindir}/hvutils-lcd.sh" diff --git a/recipes-support/swupdate/swupdate_%.bbappend b/recipes-support/swupdate/swupdate_%.bbappend index 350bd51..5c65fa1 100644 --- a/recipes-support/swupdate/swupdate_%.bbappend +++ b/recipes-support/swupdate/swupdate_%.bbappend @@ -7,13 +7,13 @@ SRC_URI:append:hvmpd = " \ inherit hwrev do_install:append:hvmpd() { - cp ${WORKDIR}/97-hwrevision-hardcoded.sh.in ${WORKDIR}/97-hwrevision-hardcoded.sh + cp ${UNPACKDIR}/97-hwrevision-hardcoded.sh.in ${UNPACKDIR}/97-hwrevision-hardcoded.sh sed -e "s!@MACHINE@!${MACHINE}!g" \ -e "s!@EEPROM_I2C_DEVNUM@!${EEPROM_I2C_DEVNUM}!g" \ -e "s!@HWREV_LATEST@!${HWREV_LATEST}!g" \ - -i ${WORKDIR}/97-hwrevision-hardcoded.sh + -i ${UNPACKDIR}/97-hwrevision-hardcoded.sh install -d ${D}${libdir}/swupdate/conf.d/ - install -m 644 ${WORKDIR}/97-hwrevision-hardcoded.sh ${D}${libdir}/swupdate/conf.d/ + install -m 644 ${UNPACKDIR}/97-hwrevision-hardcoded.sh ${D}${libdir}/swupdate/conf.d/ } -- 2.20.1