[meta-swupdate][PATCH v2 1/2] Updates for whinlatter UNPACKDIR/WORKDIR transition

[geo...@gmail.com]

From: Kurt Kiefer <keki...@gmail.com>

Signed-off-by: Kurt Kiefer <keki...@gmail.com>
Signed-off-by: Geoff Parker <geoffre...@arthrex.com>
---
classes-recipe/swupdate-common.bbclass | 3 +--
recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb | 3 +--
recipes-lua/luafilesystem/luafilesystem_git.bb | 1 -
recipes-lua/luasocket/luasocket_git.bb | 1 -
recipes-lua/tekui/tekui_1.12.bb | 1 -
recipes-support/rescuegui/rescuegui_git.bb | 1 -
recipes-support/rescuegui/swupdate-gui_git.bb | 1 -
recipes-support/swupdate/swupdate.inc | 1 -
8 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/classes-recipe/swupdate-common.bbclass b/classes-recipe/swupdate-common.bbclass
index 7b49561..c8cf14a 100644
--- a/classes-recipe/swupdate-common.bbclass
+++ b/classes-recipe/swupdate-common.bbclass
@@ -4,8 +4,7 @@

inherit swupdate-lib

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

DEPENDS += "\
cpio-native \
diff --git a/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb b/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb
index 92104bf..2b6da07 100644
--- a/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb
+++ b/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
SRC_URI = "file://rcS.swupdate \
"

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

inherit allarch update-alternatives

diff --git a/recipes-lua/luafilesystem/luafilesystem_git.bb b/recipes-lua/luafilesystem/luafilesystem_git.bb
index 10e6db8..175cf11 100644
--- a/recipes-lua/luafilesystem/luafilesystem_git.bb
+++ b/recipes-lua/luafilesystem/luafilesystem_git.bb
@@ -13,7 +13,6 @@ SRCREV = "7c6e1b013caec0602ca4796df3b1d7253a2dd258"

inherit pkgconfig

-S = "${WORKDIR}/git"

EXTRA_OEMAKE = 'PREFIX=${D}/${prefix} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} -fpic" LDFLAGS="${LDFLAGS}"'

diff --git a/recipes-lua/luasocket/luasocket_git.bb b/recipes-lua/luasocket/luasocket_git.bb
index c5325ff..d448848 100644
--- a/recipes-lua/luasocket/luasocket_git.bb
+++ b/recipes-lua/luasocket/luasocket_git.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/diegonehab/luasocket;protocol=https;branch=master \
PV = "0.0+git${SRCPV}"
SRCREV = "652959890943c34d7180cae372339b91e62f0d7b"

-S = "${WORKDIR}/git"

FILES:${PN} = "${libdir} ${datadir}/lua"

diff --git a/recipes-lua/tekui/tekui_1.12.bb b/recipes-lua/tekui/tekui_1.12.bb
index 73de48d..6c90ec9 100644
--- a/recipes-lua/tekui/tekui_1.12.bb
+++ b/recipes-lua/tekui/tekui_1.12.bb
@@ -23,7 +23,6 @@ SRCREV = "b0a20f57e47548099e443d54fc6fb33666543b72"

PR = "r1"

-S = "${WORKDIR}/git"

PACKAGES += "${PN}-examples"
FILES:${PN} = "${libdir} ${datadir}/lua"
diff --git a/recipes-support/rescuegui/rescuegui_git.bb b/recipes-support/rescuegui/rescuegui_git.bb
index 7dad2bb..53d93c6 100644
--- a/recipes-support/rescuegui/rescuegui_git.bb
+++ b/recipes-support/rescuegui/rescuegui_git.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https;branch=master
PV = "1.0+git${SRCPV}"
SRCREV = "a52b3d3bc315eb1195fc6311c8170651a54d7893"

-S = "${WORKDIR}/git"

FILES:${PN} = "/opt ${sysconfdir}"

diff --git a/recipes-support/rescuegui/swupdate-gui_git.bb b/recipes-support/rescuegui/swupdate-gui_git.bb
index 68875c3..0d18345 100644
--- a/recipes-support/rescuegui/swupdate-gui_git.bb
+++ b/recipes-support/rescuegui/swupdate-gui_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https;branch=main \
"
SRCREV = "d6bd129b4cea1e5c53bcad077a7d25af8260ef84"

-S = "${WORKDIR}/git"

inherit cmake update-rc.d systemd

diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc
index c1bca4e..091bbc2 100644
--- a/recipes-support/swupdate/swupdate.inc
+++ b/recipes-support/swupdate/swupdate.inc
@@ -103,7 +103,6 @@ RDEPENDS:${PN}-tools += "${PN}-client ${PN}-progress ${PN}-tools-hawkbit \
RDEPENDS:${PN}-dev += "${PN}-ipc"
RRECOMMENDS:${PN} += "${PN}-ipc"

-S = "${WORKDIR}/git"
B = "${WORKDIR}/build"

EXTRA_OEMAKE += " O=${B} HOSTCC="${BUILD_CC}" HOSTCXX="${BUILD_CXX}" LD="${CC}" DESTDIR="${D}" LIBDIR="${libdir}" V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
--
2.39.5

[geo...@gmail.com]

From: Geoff Parker <geoffre...@arthrex.com>

LAYERSERIES_COMPAT: switch to whinlatter Yocto 5.3.
Drop styhead and walnascar due to UNPACKDIR/WORKDIR changes.

Signed-off-by: Geoff Parker <geoffre...@arthrex.com>
---

conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 73ffcb8..b733291 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "swupdate"
BBFILE_PATTERN_swupdate := "^${LAYERDIR}/"
BBFILE_PRIORITY_swupdate = "6"

-LAYERSERIES_COMPAT_swupdate = "styhead walnascar"
+LAYERSERIES_COMPAT_swupdate = "whinlatter"

LAYERDEPENDS_swupdate = "openembedded-layer"
--
2.39.5

[Stefano Babic]

Applied to -amster (and only master), thanks !

Best regards,
Stefano Babic

[Stefano Babic]

On 7/1/25 08:14, geo...@gmail.com wrote: