summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iptables
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-30 14:23:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-02 15:15:51 +0100
commit0ea63b6a439fe97f840c69d08cf381687baaae3f (patch)
treec632ba15d6b67617859f335fe9263930cbf1a0fa /meta/recipes-extended/iptables
parent3288587aeb009fb65652776242c0a526b90771e2 (diff)
downloadpoky-0ea63b6a439fe97f840c69d08cf381687baaae3f.tar.gz
recipes: Update WORKDIR references to UNPACKDIR
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR references in recipe do_compile/do_install tasks to use UNPACKDIR in the appropraite places instead. (From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables')
-rw-r--r--meta/recipes-extended/iptables/iptables_1.8.10.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb
index cd2f3bce0b..5a87897742 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.10.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb
@@ -52,10 +52,10 @@ IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}"
52 52
53do_install:append() { 53do_install:append() {
54 install -d ${D}${IPTABLES_RULES_DIR} 54 install -d ${D}${IPTABLES_RULES_DIR}
55 install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} 55 install -m 0644 ${UNPACKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR}
56 56
57 install -d ${D}${systemd_system_unitdir} 57 install -d ${D}${systemd_system_unitdir}
58 install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} 58 install -m 0644 ${UNPACKDIR}/iptables.service ${D}${systemd_system_unitdir}
59 59
60 sed -i \ 60 sed -i \
61 -e 's,@SBINDIR@,${sbindir},g' \ 61 -e 's,@SBINDIR@,${sbindir},g' \
@@ -63,8 +63,8 @@ do_install:append() {
63 ${D}${systemd_system_unitdir}/iptables.service 63 ${D}${systemd_system_unitdir}/iptables.service
64 64
65 if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then 65 if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then
66 install -m 0644 ${WORKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} 66 install -m 0644 ${UNPACKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR}
67 install -m 0644 ${WORKDIR}/ip6tables.service ${D}${systemd_system_unitdir} 67 install -m 0644 ${UNPACKDIR}/ip6tables.service ${D}${systemd_system_unitdir}
68 68
69 sed -i \ 69 sed -i \
70 -e 's,@SBINDIR@,${sbindir},g' \ 70 -e 's,@SBINDIR@,${sbindir},g' \