9 files changed, 32 insertions, 31 deletions

diff --git a/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.9.2.bb b/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.9.2.bb
index 4c76bd9..0c75d8f 100644
--- a/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.9.2.bb
+++ b/dynamic-layers/networking-layer/recipes-security/sssd/sssd_2.9.2.bb
@@ -90,7 +90,7 @@ do_install () {
     install -d ${D}/${PYTHON_SITEPACKAGES_DIR}
     mv ${D}/${BPN}  ${D}/${PYTHON_SITEPACKAGES_DIR}
 
-    install -m 600 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}
+    install -m 600 ${UNPACKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}
 
     # /var/log/sssd needs to be created in runtime. Use rmdir to catch if
     # upstream stops creating /var/log/sssd, or adds something else in
diff --git a/meta-integrity/recipes-core/systemd/systemd_%.bbappend b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
index 57b3684..f140f02 100644
--- a/meta-integrity/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
@@ -8,6 +8,6 @@ SRC_URI += " \
 do_install:append () {
     for i in machine-id-commit random-seed; do
         install -d ${D}/${systemd_system_unitdir}/systemd-$i.service.d
-        install -m 0644 ${WORKDIR}/$i-sync.conf ${D}/${systemd_system_unitdir}/systemd-$i.service.d
+        install -m 0644 ${UNPACKDIR}/$i-sync.conf ${D}/${systemd_system_unitdir}/systemd-$i.service.d
     done
 }
diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb
index ea2433c..24fd5b5 100644
--- a/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_3.0.0.bb
@@ -40,10 +40,10 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},
 
 do_install:append() {
     install -d "${D}${sysconfdir}/init.d"
-    install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
+    install -m 0755 "${UNPACKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
 
     install -d "${D}${sysconfdir}/default"
-    install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
+    install -m 0644 "${UNPACKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
 }
 
 FILES:${PN} += "${libdir}/systemd/system-preset \
diff --git a/recipes-core/initrdscripts/initramfs-framework.inc b/recipes-core/initrdscripts/initramfs-framework.inc
index 1a724d6..aa04348 100644
--- a/recipes-core/initrdscripts/initramfs-framework.inc
+++ b/recipes-core/initrdscripts/initramfs-framework.inc
@@ -6,7 +6,7 @@ SRC_URI:append = "\
 
 do_install:append() {
     # dm-verity
-    install ${WORKDIR}/dmverity ${D}/init.d/80-dmverity
+    install ${S}/dmverity ${D}/init.d/80-dmverity
 }
 
 PACKAGES:append = " initramfs-module-dmverity"
diff --git a/recipes-ids/samhain/samhain-server.bb b/recipes-ids/samhain/samhain-server.bb
index 8bae2d2..030ec2b 100644
--- a/recipes-ids/samhain/samhain-server.bb
+++ b/recipes-ids/samhain/samhain-server.bb
@@ -16,11 +16,11 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 do_install:append() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/tmpfiles.d
-        install -m 0644 ${WORKDIR}/samhain-server-volatiles.conf \
+        install -m 0644 ${UNPACKDIR}/samhain-server-volatiles.conf \
             ${D}${sysconfdir}/tmpfiles.d/samhain-server.conf
     else
         install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/samhain-server-volatiles \
+        install -m 0644 ${UNPACKDIR}/samhain-server-volatiles \
             ${D}${sysconfdir}/default/volatiles/samhain-server
     fi
 
diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index f5bea1d..61ec0da 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -64,8 +64,8 @@ EXTRA_OEMAKE:append:aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
 EXTRA_OEMAKE:append:mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
 
 do_unpack_samhain() {
-    cd ${WORKDIR}
-    tar -xzvf samhain-${PV}.tar.gz
+    cd ${UNPACKDIR}
+    tar -xzvf samhain-${PV}.tar.gz -C ${WORKDIR}
 }
 
 python do_unpack:append() {
@@ -129,19 +129,19 @@ do_compile:prepend:libc-musl () {
 do_install:append () {
         oe_runmake install DESTDIR='${D}' INSTALL=install-boot
 
-        install -D -m 755 ${WORKDIR}/${INITSCRIPT_NAME}.init \
+        install -D -m 755 ${UNPACKDIR}/${INITSCRIPT_NAME}.init \
                 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 
-        install -D -m 755 ${WORKDIR}/${INITSCRIPT_NAME}.default \
+        install -D -m 755 ${UNPACKDIR}/${INITSCRIPT_NAME}.default \
                 ${D}${sysconfdir}/default/${INITSCRIPT_NAME}
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
                 if [ "${SAMHAIN_MODE}" = "no" ]; then
-                    install -D -m 0644 ${WORKDIR}/samhain.service ${D}/${systemd_system_unitdir}/samhain.service
+                    install -D -m 0644 ${UNPACKDIR}/samhain.service ${D}/${systemd_system_unitdir}/samhain.service
                 else
-                    install -D -m 0644 ${WORKDIR}/samhain.service ${D}/${systemd_system_unitdir}/${BPN}.service
+                    install -D -m 0644 ${UNPACKDIR}/samhain.service ${D}/${systemd_system_unitdir}/${BPN}.service
                 fi
-                install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${libexecdir}/${BPN}
+                install -D -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${libexecdir}/${BPN}
                 sed -i -e 's,@LIBDIR@,${libexecdir},' \
                        -e 's,@SAMHAIN_HELPER@,${BPN},' \
                        -e 's,@MODE_NAME@,${MODE_NAME},' \
diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
index 00e8997..83d37d6 100644
--- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
+++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
@@ -62,7 +62,7 @@ do_install:append() {
            -e 's:-L${STAGING_LIBDIR}::' ${D}/${libdir}/pkgconfig/libecryptfs.pc
     sed -i -e "s: ${base_sbindir}/cryptsetup: ${sbindir}/cryptsetup:" ${D}${bindir}/ecryptfs-setup-swap
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        install -D -m 0644 ${WORKDIR}/ecryptfs.service ${D}${systemd_system_unitdir}/ecryptfs.service
+        install -D -m 0644 ${UNPACKDIR}/ecryptfs.service ${D}${systemd_system_unitdir}/ecryptfs.service
     fi
 }
 
diff --git a/recipes-security/libmhash/libmhash_0.9.9.9.bb b/recipes-security/libmhash/libmhash_0.9.9.9.bb
index 49139d2..f725a26 100644
--- a/recipes-security/libmhash/libmhash_0.9.9.9.bb
+++ b/recipes-security/libmhash/libmhash_0.9.9.9.bb
@@ -31,8 +31,8 @@ do_install:append() {
 
 do_compile_ptest() {
     if [ ! -d ${S}/demo ]; then mkdir ${S}/demo; fi
-    cp ${WORKDIR}/Makefile.test ${S}/demo/Makefile
-    cp ${WORKDIR}/mhash.c ${S}/demo/
+    cp ${UNPACKDIR}/Makefile.test ${S}/demo/Makefile
+    cp ${UNPACKDIR}/mhash.c ${S}/demo/
     make -C ${S}/demo CFLAGS="${CFLAGS} -I${S}/include/" LDFLAGS="${LDFLAGS} -L${S}/lib/.libs"
 }
 
diff --git a/recipes-security/redhat-security/redhat-security_1.0.bb b/recipes-security/redhat-security/redhat-security_1.0.bb
index c47688f..1f0ba6c 100644
--- a/recipes-security/redhat-security/redhat-security_1.0.bb
+++ b/recipes-security/redhat-security/redhat-security_1.0.bb
@@ -18,23 +18,24 @@ SRC_URI = "file://find-chroot-py.sh \
            file://selinux-check-devices.sh \
            file://selinux-ls-unconfined.sh"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install() {
         install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-chroot-py.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-chroot.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-elf4tmp.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-execstack.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-hidden-exec.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-nodrop-groups.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-sh4errors.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/find-sh4tmp.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/lib-bin-check.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/rpm-chksec.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/rpm-drop-groups.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/selinux-check-devices.sh    ${D}${bindir}
-        install -m 0755 ${WORKDIR}/selinux-ls-unconfined.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-chroot-py.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-chroot.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-elf4tmp.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-execstack.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-hidden-exec.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-nodrop-groups.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-sh4errors.sh    ${D}${bindir}
+        install -m 0755 ${S}/find-sh4tmp.sh    ${D}${bindir}
+        install -m 0755 ${S}/lib-bin-check.sh    ${D}${bindir}
+        install -m 0755 ${S}/rpm-chksec.sh    ${D}${bindir}
+        install -m 0755 ${S}/rpm-drop-groups.sh    ${D}${bindir}
+        install -m 0755 ${S}/selinux-check-devices.sh    ${D}${bindir}
+        install -m 0755 ${S}/selinux-ls-unconfined.sh    ${D}${bindir}
 }
 
 RDEPENDS:${PN} = "file libcap-ng procps findutils"