Bläddra i källkod

Updates for whinlatter UNPACKDIR/WORKDIR transition

Signed-off-by: Kurt Kiefer <kekiefer@gmail.com>
Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
Kurt Kiefer 5 månader sedan
förälder
incheckning
5487248c01

+ 1 - 2
classes-recipe/swupdate-common.bbclass

@@ -4,8 +4,7 @@
 
 inherit swupdate-lib
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 DEPENDS += "\
     cpio-native \

+ 1 - 2
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
 

+ 0 - 1
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}"'
 

+ 0 - 1
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"
 

+ 0 - 1
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"

+ 0 - 1
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}"
 

+ 0 - 1
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
 

+ 0 - 1
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"