[ptxdist] [PATCH] iptables.make: Make .so file installation and copying follow CROSS_LIB_DIR.

[ptxdist] [PATCH] iptables.make: Make .so file installation and copying follow CROSS_LIB_DIR.

[Christian Melki]

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

Re: [ptxdist] [APPLIED] iptables.make: Make .so file installation and copying follow CROSS_LIB_DIR.

[Michael Olbrich]

Thanks, applied as 7060193580ee92b6b9866c41d9cdb6f8f9f7aaf5.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:52 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20210519100843.27113-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/iptables.make b/rules/iptables.make
> index 13b28cde92d9..391a95af06e5 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

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de