diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-06 23:49:52 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-06 23:52:32 +0100 |
| commit | 0a63e81109ed7b163ed2219cc4ae44a82d35ac12 (patch) | |
| tree | 099790152c6af04faf71740f0bf9ad7fb897c199 | |
| parent | b300901960ed218b64726cab81f750ee06d087d3 (diff) | |
| download | ptxdist-0a63e81109ed7b163ed2219cc4ae44a82d35ac12.tar.gz ptxdist-0a63e81109ed7b163ed2219cc4ae44a82d35ac12.tar.xz | |
[iptables] fix installation of libraries
The IPv6 section installs the IPv4 library and associated links, and
the IPv4 section installs the IPv6 library and links.
When only one is selected, the iptables command fails.
Reported-by: Rene Huber <renehuber2@netscape.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cheery-picked from master: 5bf4a731783708fd3c51714e6fa210ff434184e8
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/iptables.make | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/iptables.make b/rules/iptables.make index df631caf3..98261c894 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -82,9 +82,9 @@ ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES_MULTI @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/ip6tables-multi) @$(call install_copy, iptables, 0, 0, 0644, -, \ - /usr/lib/libip4tc.so.0.0.0) - @$(call install_link, iptables, libip4tc.so.0.0.0, /usr/lib/libip4tc.so) - @$(call install_link, iptables, libip4tc.so.0.0.0, /usr/lib/libip4tc.so.0) + /usr/lib/libip6tc.so.0.0.0) + @$(call install_link, iptables, libip6tc.so.0.0.0, /usr/lib/libip6tc.so) + @$(call install_link, iptables, libip6tc.so.0.0.0, /usr/lib/libip6tc.so.0) endif ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES @@ -113,9 +113,9 @@ ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_MULTI @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/iptables-multi) @$(call install_copy, iptables, 0, 0, 0644, -, \ - /usr/lib/libip6tc.so.0.0.0) - @$(call install_link, iptables, libip6tc.so.0.0.0, /usr/lib/libip6tc.so) - @$(call install_link, iptables, libip6tc.so.0.0.0, /usr/lib/libip6tc.so.0) + /usr/lib/libip4tc.so.0.0.0) + @$(call install_link, iptables, libip4tc.so.0.0.0, /usr/lib/libip4tc.so) + @$(call install_link, iptables, libip4tc.so.0.0.0, /usr/lib/libip4tc.so.0) endif ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES |