From: Wang Mingyu <wan...@fujitsu.com>
deal with error of un_pack.
Signed-off-by: Wang Mingyu <wan...@fujitsu.com>
---
.../recipes-security/bastille/bastille_3.2.1.bb | 12 ++++++------
.../fail2ban/python3-fail2ban_1.0.2.bb | 2 +-
meta-tpm/recipes-tpm1/trousers/trousers_git.bb | 6 +++---
recipes-ids/samhain/samhain-server.bb | 2 +-
recipes-ids/samhain/samhain.inc | 14 +++++++-------
.../ecryptfs-utils/ecryptfs-utils_111.bb | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
index f2ef335..7074f68 100644
--- a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
+++ b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
@@ -83,11 +83,11 @@ do_install () {
install -m 0644 Bastille/AccountSecurity.pm ${D}${libdir}/Bastille
install -m 0644 Bastille/Apache.pm ${D}${libdir}/Bastille
install -m 0644 Bastille/API.pm ${D}${libdir}/Bastille
- install -m 0644 ${WORKDIR}/AccountPermission.pm
${D}${libdir}/Bastille/API
- install -m 0644 ${WORKDIR}/FileContent.pm ${D}${libdir}/Bastille/API
- install -m 0644 ${WORKDIR}/HPSpecific.pm ${D}${libdir}/Bastille/API
- install -m 0644 ${WORKDIR}/ServiceAdmin.pm ${D}${libdir}/Bastille/API
- install -m 0644 ${WORKDIR}/Miscellaneous.pm
${D}${libdir}/Bastille/API
+ install -m 0644 ${UNPACKDIR}/AccountPermission.pm
${D}${libdir}/Bastille/API
+ install -m 0644 ${UNPACKDIR}/FileContent.pm
${D}${libdir}/Bastille/API
+ install -m 0644 ${UNPACKDIR}/HPSpecific.pm ${D}${libdir}/Bastille/API
+ install -m 0644 ${UNPACKDIR}/ServiceAdmin.pm
${D}${libdir}/Bastille/API
+ install -m 0644 ${UNPACKDIR}/Miscellaneous.pm
${D}${libdir}/Bastille/API
install -m 0644 Bastille/BootSecurity.pm ${D}${libdir}/Bastille
install -m 0644 Bastille/ConfigureMiscPAM.pm ${D}${libdir}/Bastille
install -m 0644 Bastille/DisableUserTools.pm ${D}${libdir}/Bastille
@@ -138,7 +138,7 @@ do_install () {
install -m 0644 OSMap/OSX.bastille ${D}${datadir}/Bastille/OSMap
install -m 0644 OSMap/OSX.system ${D}${datadir}/Bastille/OSMap
- install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/Bastille/config
+ install -m 0644 ${UNPACKDIR}/config ${D}${sysconfdir}/Bastille/config
for file in `cat Modules.txt` ; do
install -m 0644 Questions/$file.txt
${D}${datadir}/Bastille/Questions
diff --git
a/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb
b/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb
index bf5f87d..757336a 100644
---
a/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb
+++
b/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb
@@ -40,7 +40,7 @@ do_install:append () {
rm -f ${D}/${bindir}/fail2ban-python
install -d ${D}/${sysconfdir}/fail2ban
install -d ${D}/${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/initd ${D}${sysconfdir}/init.d/fail2ban-server
+ install -m 0755 ${UNPACKDIR}/initd ${D}${sysconfdir}/init.d/fail2ban-server
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
install -d ${D}${systemd_system_unitdir}
diff --git a/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
index 192c66c..44a4ee6 100644
--- a/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
+++ b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
@@ -32,13 +32,13 @@ 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
}
diff --git a/recipes-ids/samhain/samhain-server.bb
b/recipes-ids/samhain/samhain-server.bb
index 8bae2d2..e7156dd 100644
--- a/recipes-ids/samhain/samhain-server.bb
+++ b/recipes-ids/samhain/samhain-server.bb
@@ -16,7 +16,7 @@ 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
diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index f5bea1d..74123e0 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] =
"ae6ee8eff3cb111b7fc14a57bcc258443dd0bcf1bfacfdf229935ed053
UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html";
UPSTREAM_CHECK_REGEX = "samhain_signed-(?P<pver>(\d+(\.\d+)+))\.tar"
-S = "${WORKDIR}/samhain-${PV}"
+S = "${UNPACKDIR}/samhain-${PV}"
inherit autotools-brokensep update-rc.d pkgconfig systemd
@@ -64,7 +64,7 @@ EXTRA_OEMAKE:append:aarch64 = "
CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
EXTRA_OEMAKE:append:mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
do_unpack_samhain() {
- cd ${WORKDIR}
+ cd ${UNPACKDIR}
tar -xzvf samhain-${PV}.tar.gz
}
@@ -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
}
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#63292): https://lists.yoctoproject.org/g/yocto/message/63292
Mute This Topic: https://lists.yoctoproject.org/mt/106537015/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
