mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-01 13:10:33 +00:00
Code Issues Projects Releases Wiki Activity

recipes: WORKDIR -> UNPACKDIR transition

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
recipes-ids/samhain/samhain-server.bb
+2 -2
View File
@@ -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
recipes-ids/samhain/samhain.inc
+7 -7
View File
@@ -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},' \