Signed-off-by: Alex Kiernan <[email protected]>
---
.../conntrack-tools/conntrack-tools_1.4.7.bb | 24 +++++++++----------
1 file 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 6f88b5fe31b8..8b47ceb1c054 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"
INITSCRIPT_NAME = "conntrackd"
do_install:append() {
- install -d ${D}/${sysconfdir}/conntrackd
- install -d ${D}/${sysconfdir}/init.d
- install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf
${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
- install -m 0755 ${WORKDIR}/conntrack-failover
${D}/${sysconfdir}/init.d/conntrack-failover
- install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd
-
- # Fix hardcoded paths in scripts
- sed -i 's!/usr/sbin/!${sbindir}/!g'
${D}/${sysconfdir}/init.d/conntrack-failover
${D}/${sysconfdir}/init.d/conntrackd
- sed -i 's!/etc/!${sysconfdir}/!g'
${D}/${sysconfdir}/init.d/conntrack-failover
${D}/${sysconfdir}/init.d/conntrackd
- sed -i 's!/var/!${localstatedir}/!g'
${D}/${sysconfdir}/init.d/conntrack-failover
${D}/${sysconfdir}/init.d/conntrackd
${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
- sed -i 's!^export PATH=.*!export
PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!'
${D}/${sysconfdir}/init.d/conntrackd
+ install -d ${D}/${sysconfdir}/conntrackd
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf
${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
+ install -m 0755 ${WORKDIR}/conntrack-failover
${D}/${sysconfdir}/init.d/conntrack-failover
+ install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd
+
+ # Fix hardcoded paths in scripts
+ sed -i 's!/usr/sbin/!${sbindir}/!g'
${D}/${sysconfdir}/init.d/conntrack-failover
${D}/${sysconfdir}/init.d/conntrackd
+ sed -i 's!/etc/!${sysconfdir}/!g'
${D}/${sysconfdir}/init.d/conntrack-failover
${D}/${sysconfdir}/init.d/conntrackd
+ sed -i 's!/var/!${localstatedir}/!g'
${D}/${sysconfdir}/init.d/conntrack-failover
${D}/${sysconfdir}/init.d/conntrackd
${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
+ sed -i 's!^export PATH=.*!export
PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!'
${D}/${sysconfdir}/init.d/conntrackd
}
# fix error message: Do not forget that you need *root* or CAP_NET_ADMIN
capabilities ;-)
pkg_postinst:${PN} () {
- setcap cap_net_admin+ep "$D/${sbindir}/conntrack"
+ setcap cap_net_admin+ep "$D/${sbindir}/conntrack"
}
PACKAGE_WRITE_DEPS += "libcap-native"
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#99182):
https://lists.openembedded.org/g/openembedded-devel/message/99182
Mute This Topic: https://lists.openembedded.org/mt/94370788/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
