diff mbox series

[meta-swupdate,2/2] general: fix some left over migration changes

Message ID 20241121145934.230850-2-sidali.teir@cysec.com
State New
Delegated to: Stefano Babic
Headers show
Series [meta-swupdate,1/2] licenses: use correct Upstream-Status | expand

Commit Message

Sid-Ali Teir Nov. 21, 2024, 2:59 p.m. UTC 
Signed-off-by: Sid-Ali Teir <sidali.teir@cysec.com>
---
 recipes-lua/swupdate-lualoader/swupdate-lualoader_1.0.bb | 7 +++++--
 recipes-support/rescuegui/rescuegui_git.bb               | 5 +++--
 recipes-support/rescuegui/swupdate-gui_git.bb            | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/recipes-lua/swupdate-lualoader/swupdate-lualoader_1.0.bb b/recipes-lua/swupdate-lualoader/swupdate-lualoader_1.0.bb
index 044cad2..82d7b97 100644
--- a/recipes-lua/swupdate-lualoader/swupdate-lualoader_1.0.bb
+++ b/recipes-lua/swupdate-lualoader/swupdate-lualoader_1.0.bb
@@ -2,15 +2,18 @@  SUMMARY = "Loader for swupdate"
 LICENSE = "MIT"
 SECTION = "devel/lua"
 DEPENDS = "lua"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/swupdate_handlers.lua;md5=354cf4af377edd962d2e8d78085d3ed7;beginline=1;endline=19"
+LIC_FILES_CHKSUM = "file://${S}/swupdate_handlers.lua;md5=354cf4af377edd962d2e8d78085d3ed7;beginline=1;endline=19"
 
 SRC_URI = "file://swupdate_handlers.lua"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 inherit pkgconfig
 
 do_install() {
     LUAVER=$(pkg-config --modversion lua | grep -o '^[0-9]\+\.[0-9]\+')
-    install -D -m 0644 ${WORKDIR}/swupdate_handlers.lua ${D}${libdir}/lua/$LUAVER/swupdate_handlers.lua
+    install -D -m 0644 ${S}/swupdate_handlers.lua ${D}${libdir}/lua/$LUAVER/swupdate_handlers.lua
     sed -e 's,@libdir@,${libdir},g' \
         -i ${D}${libdir}/lua/$LUAVER/swupdate_handlers.lua
 
diff --git a/recipes-support/rescuegui/rescuegui_git.bb b/recipes-support/rescuegui/rescuegui_git.bb
index 77e3c12..646e9b8 100644
--- a/recipes-support/rescuegui/rescuegui_git.bb
+++ b/recipes-support/rescuegui/rescuegui_git.bb
@@ -20,6 +20,7 @@  PV = "1.0+git${SRCPV}"
 SRCREV = "a52b3d3bc315eb1195fc6311c8170651a54d7893"
 
 S = "${WORKDIR}/git"
+UNPACKDIR = "${S}"
 
 FILES:${PN} = "/opt ${sysconfdir}"
 
@@ -42,10 +43,10 @@  do_install () {
 	for f in ${S}/tek/ui/locale/SWUpdate/SWUpdate-GUI/*;do
 		install -m 644 ${f} ${D}/opt/rescueGUI/tek/ui/locale/SWUpdate/SWUpdate-GUI
 	done
-	
+
 	install -m 644 ${S}/config.lua ${D}/opt/rescueGUI
 	install -d ${D}/${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/rescuegui ${D}${sysconfdir}/init.d
+	install -m 755 ${S}/rescuegui ${D}${sysconfdir}/init.d
 }
 
 # Be sure to run the GUI after starting SWUpdate
diff --git a/recipes-support/rescuegui/swupdate-gui_git.bb b/recipes-support/rescuegui/swupdate-gui_git.bb
index 68875c3..ccd31ab 100644
--- a/recipes-support/rescuegui/swupdate-gui_git.bb
+++ b/recipes-support/rescuegui/swupdate-gui_git.bb
@@ -16,6 +16,7 @@  SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https;branch=main \
 SRCREV = "d6bd129b4cea1e5c53bcad077a7d25af8260ef84"
 
 S = "${WORKDIR}/git"
+UNPACKDIR = "${S}"
 
 inherit cmake update-rc.d systemd
 
@@ -29,8 +30,8 @@  SYSTEMD_SERVICE:${PN} = "swupdate-gui.service"
 do_install:append () {
         install -d ${D}${sysconfdir}/init.d
     	install -d ${D}${systemd_system_unitdir}
-        install -m 0755 ${WORKDIR}/swupdate-gui ${D}${sysconfdir}/init.d/
-    	install -m 644 ${WORKDIR}/swupdate-gui.service ${D}${systemd_system_unitdir}
+        install -m 0755 ${S}/swupdate-gui ${D}${sysconfdir}/init.d/
+    	install -m 644 ${S}/swupdate-gui.service ${D}${systemd_system_unitdir}
         install -d ${D}${sysconfdir}/recovery_gui
         install -m 0644 ${S}/config/config.txt ${D}${sysconfdir}/recovery_gui/
         install -m 0755 ${S}/scripts/recovery-check-bridge-interface.sh ${D}${bindir}