summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2022-10-16 21:16:59 +0100
committerKhem Raj <raj.khem@gmail.com>2022-10-16 18:30:32 -0700
commit4a0e41431e32b13fb6643e6771040495eb82d859 (patch)
tree2ce49ded2164823cd6ea9b9ad7373fbfe64feba2
parent4d8d56d0e7d69f9edc73cb377fbe5dea784bc632 (diff)
downloadmeta-openembedded-4a0e41431e32b13fb6643e6771040495eb82d859.tar.gz
conntrack-tools: Use canonical shell spacing
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb24
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb
index 6f88b5fe31..8b47ceb1c0 100644
--- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb
+++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb
@@ -26,21 +26,21 @@ PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
26INITSCRIPT_NAME = "conntrackd" 26INITSCRIPT_NAME = "conntrackd"
27 27
28do_install:append() { 28do_install:append() {
29 install -d ${D}/${sysconfdir}/conntrackd 29 install -d ${D}/${sysconfdir}/conntrackd
30 install -d ${D}/${sysconfdir}/init.d 30 install -d ${D}/${sysconfdir}/init.d
31 install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample 31 install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
32 install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover 32 install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover
33 install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd 33 install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd
34 34
35 # Fix hardcoded paths in scripts 35 # Fix hardcoded paths in scripts
36 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd 36 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd
37 sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd 37 sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd
38 sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample 38 sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
39 sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd 39 sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd
40} 40}
41 41
42# fix error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-) 42# fix error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-)
43pkg_postinst:${PN} () { 43pkg_postinst:${PN} () {
44 setcap cap_net_admin+ep "$D/${sbindir}/conntrack" 44 setcap cap_net_admin+ep "$D/${sbindir}/conntrack"
45} 45}
46PACKAGE_WRITE_DEPS += "libcap-native" 46PACKAGE_WRITE_DEPS += "libcap-native"