From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] iptables.make: Make .so file installation and copying follow CROSS_LIB_DIR.
Date: Wed, 19 May 2021 12:08:43 +0200 [thread overview]
Message-ID: <20210519100843.27113-1-christian.melki@t2data.com> (raw)
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/iptables.make | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/rules/iptables.make b/rules/iptables.make
index 13b28cde9..391a95af0 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -48,7 +48,7 @@ IPTABLES_CONF_OPT := \
--$(call ptx/endis, PTXCONF_IPTABLES_NFTABLES_COMPAT)-nftables \
--disable-connlabel \
--with-kernel=$(KERNEL_HEADERS_DIR) \
- --with-xtlibdir=/usr/lib
+ --with-xtlibdir=/usr/$(CROSS_LIB_DIR)
# ----------------------------------------------------------------------------
# Install
@@ -81,28 +81,28 @@ ifdef PTXCONF_IPTABLES_LIBIPQ
@$(call install_lib, iptables, 0, 0, 0644, libipq)
endif
- @cd $(IPTABLES_PKGDIR)/usr/lib && \
+ @cd $(IPTABLES_PKGDIR)/usr/$(CROSS_LIB_DIR) && \
for file in libxt_*.so; do \
$(call install_copy, iptables, 0, 0, 0644, -,\
- /usr/lib/$$file); \
+ /usr/$(CROSS_LIB_DIR)/$$file); \
done
ifdef PTXCONF_IPTABLES_IPV6
# # install the IPv6 relevant shared libraries
- @cd $(IPTABLES_PKGDIR)/usr/lib && \
+ @cd $(IPTABLES_PKGDIR)/usr/$(CROSS_LIB_DIR) && \
for file in libip6t_*.so; do \
$(call install_copy, iptables, 0, 0, 0644, -, \
- /usr/lib/$$file); \
+ /usr/$(CROSS_LIB_DIR)/$$file); \
done
@$(call install_lib, iptables, 0, 0, 0644, libip6tc)
endif
ifdef PTXCONF_IPTABLES_IPV4
# # install the IPv4 relevant shared libraries
- @cd $(IPTABLES_PKGDIR)/usr/lib && \
+ @cd $(IPTABLES_PKGDIR)/usr/$(CROSS_LIB_DIR) && \
for file in libipt_*.so; do \
$(call install_copy, iptables, 0, 0, 0644, -,\
- /usr/lib/$$file); \
+ /usr/$(CROSS_LIB_DIR)/$$file); \
done
@$(call install_lib, iptables, 0, 0, 0644, libip4tc)
endif
--
2.31.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next reply other threads:[~2021-05-19 10:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 10:08 Christian Melki [this message]
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210519100843.27113-1-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox