diff options
| author |   Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2017-11-17 14:26:35 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2018-04-16 09:54:19 +0300 |
| commit | 0f2ed5b00d89aec86ea96ae2d982ab8100cd3888 (patch) | |
| tree | 697ef8dc5b8a5ba1d6f0c46eef31028e3c88174b | |
| parent | 80729a9dcfdc5cb8dc774279ff7afb872836a511 (diff) | |
| download | openembedded-core-contrib-0f2ed5b00d89aec86ea96ae2d982ab8100cd3888.tar.gz | |
iptables: enable native
[YOCTO #9338]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | meta/recipes-extended/iptables/iptables/prevent-absolute-path-in-installed-symlink.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-extended/iptables/iptables_1.6.2.bb | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/prevent-absolute-path-in-installed-symlink.patch b/meta/recipes-extended/iptables/iptables/prevent-absolute-path-in-installed-symlink.patch new file mode 100644 index 0000000000..3ca6c0dd28 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/prevent-absolute-path-in-installed-symlink.patch @@ -0,0 +1,29 @@ +From d7a50cf5a9f03f3b65293d556dadfc484456b0d8 Mon Sep 17 00:00:00 2001 +From: Markus Lehtonen <markus.lehtonen@linux.intel.com> +Date: Fri, 17 Nov 2017 14:10:59 +0200 +Subject: [PATCH] prevent absolute path in installed symlink + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> +--- + iptables/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/iptables/Makefile.am b/iptables/Makefile.am +index f92cc4f..55ce793 100644 +--- a/iptables/Makefile.am ++++ b/iptables/Makefile.am +@@ -88,7 +88,8 @@ pkgconfig_DATA = xtables.pc + install-exec-hook: + -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi; + ${INSTALL} -dm0755 "${DESTDIR}${bindir}"; +- for i in ${vx_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done; ++ _relpath=`python -c "import os.path; print(os.path.relpath('${sbindir}/xtables-multi', '${bindir}'))"`; \ ++ for i in ${vx_bin_links}; do ${LN_S} -f "$${_relpath}" "${DESTDIR}${bindir}/$$i"; done; + for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; + for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; + for i in ${x_sbin_links}; do ${LN_S} -f xtables-compat-multi "${DESTDIR}${sbindir}/$$i"; done; +-- +2.13.6 + diff --git a/meta/recipes-extended/iptables/iptables_1.6.2.bb b/meta/recipes-extended/iptables/iptables_1.6.2.bb index 38a83d2b32..fb8b425886 100644 --- a/meta/recipes-extended/iptables/iptables_1.6.2.bb +++ b/meta/recipes-extended/iptables/iptables_1.6.2.bb @@ -21,6 +21,7 @@ FILES_${PN} =+ "${libdir}/xtables/ ${datadir}/xtables" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ + file://prevent-absolute-path-in-installed-symlink.patch \ " SRC_URI[md5sum] = "7d2b7847e4aa8832a18437b8a4c1873d" @@ -45,3 +46,5 @@ do_configure_prepend() { # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive. rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 } + +BBCLASSEXTEND = "native" |