diff mbox series

[meta-security,08/17] trousers: UNPACKDIR fixes

Message ID 20240725090131.75860-8-mikko.rapeli@linaro.org
State New
Headers show
Series [meta-security,01/17] bastille: UNPACKDIR fixes | expand

Commit Message

Mikko Rapeli July 25, 2024, 9:01 a.m. UTC 
New poky uses UNPACKDIR instead of WORKDIR. Combine
with whitespace fixes.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 .../recipes-tpm1/trousers/trousers_git.bb     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta-tpm/recipes-tpm1/trousers/trousers_git.bb b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
index 192c66c..0940f76 100644
--- a/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
+++ b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
@@ -10,13 +10,13 @@  SRCREV = "94144b0a1dcef6e31845d6c319e9bd7357208eb9"
 PV = "0.3.15+git${SRCPV}"
 
 SRC_URI = " \
-	git://git.code.sf.net/p/trousers/trousers;branch=master \
-    	file://trousers.init.sh \
-    	file://trousers-udev.rules \
-    	file://tcsd.service \
-        file://get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch \
-        file://0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch \
-    	"
+    git://git.code.sf.net/p/trousers/trousers;branch=master \
+    file://trousers.init.sh \
+    file://trousers-udev.rules \
+    file://tcsd.service \
+    file://get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch \
+    file://0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch \
+"
 
 S = "${WORKDIR}/git"
 
@@ -32,15 +32,15 @@  do_install () {
 
 do_install:append() {
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/trousers.init.sh ${D}${sysconfdir}/init.d/trousers
+    install -m 0755 ${UNPACKDIR}/trousers.init.sh ${D}${sysconfdir}/init.d/trousers
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/trousers-udev.rules ${D}${sysconfdir}/udev/rules.d/45-trousers.rules
+    install -m 0644 ${UNPACKDIR}/trousers-udev.rules ${D}${sysconfdir}/udev/rules.d/45-trousers.rules
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/tcsd.service ${D}${systemd_unitdir}/system/
+        install -m 0644 ${UNPACKDIR}/tcsd.service ${D}${systemd_unitdir}/system/
         sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/tcsd.service
-    fi        
+    fi
 }
 
 CONFFILES:${PN} += "${sysconfig}/tcsd.conf"