From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Thu, 27 May 2021 08:47:25 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1lm9nh-0002tp-RN
	for lore@lore.pengutronix.de; Thu, 27 May 2021 08:47:25 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1lm9nh-0001YA-D7; Thu, 27 May 2021 08:47:25 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1lm9mD-0005yK-M5; Thu, 27 May 2021 08:45:53 +0200
Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1lm9mD-0006Vd-5G; Thu, 27 May 2021 08:45:53 +0200
Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1lm9mD-00Gxxu-2Q; Thu, 27 May 2021 08:45:53 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Thu, 27 May 2021 08:45:53 +0200
Message-Id: <20210527064553.4043711-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20210519100843.27113-1-christian.melki@t2data.com>
References: <20210519100843.27113-1-christian.melki@t2data.com>
MIME-Version: 1.0
Subject: Re: [ptxdist] [APPLIED] iptables.make: Make .so file installation
 and copying follow CROSS_LIB_DIR.
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

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