recipes: WORKDIR -> UNPACKDIR transition

* WORKDIR -> UNPACKDIR transition
* Switch away from S = WORKDIR

Signed-off-by: Changqing Li <changqing.li@windriver.com>
[Fixed up the smack changes due to prior patch]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Changqing Li
2024-05-28 13:44:06 +08:00
committed by Armin Kuster
parent 651767d028
commit ceb47a8a39
9 changed files with 32 additions and 31 deletions
@@ -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
}
@@ -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"
}
@@ -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"