[ptxdist] [PATCH] opkg: beautifying and fixing

[ptxdist] [PATCH] opkg: beautifying and fixing

[Juergen Beisert]

While working on the "use pre-build archives" feature of PTXdist I stumbled
about opkg. And while already there also some beautifying of the rule file.

jbe


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] opkg: clean up rule file

[Juergen Beisert]

While working on the opkg package its time to do the dishes.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 rules/opkg.make | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/rules/opkg.make b/rules/opkg.make
index a433054..8fc464f 100644
--- a/rules/opkg.make
+++ b/rules/opkg.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2009 by Robert Schwebel
+# Copyright (C) 2014 by Juergen Beisert
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -37,40 +38,17 @@ OPKG_ENV 	:= $(CROSS_ENV)
 OPKG_CONF_TOOL	:= autoconf
 OPKG_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-static \
+	--$(call ptx/endis, PTXCONF_OPKG_PATHFINDER)-pathfinder \
+	--$(call ptx/endis, PTXCONF_OPKG_CURL)-curl \
+	--$(call ptx/endis, PTXCONF_OPKG_SHA256)-sha256 \
+	--$(call ptx/endis, PTXCONF_OPKG_OPENSSL)-openssl \
+	--$(call ptx/endis, PTXCONF_OPKG_SSL_CURL)-ssl-curl \
+	--$(call ptx/endis, PTXCONF_OPKG_GPG)-gpg \
 	--enable-shave \
 	--with-opkglockfile=/var/lock/opkg.lock
 
-ifdef PTXCONF_OPKG_PATHFINDER
-OPKG_CONF_OPT += --enable-pathfinder
-else
-OPKG_CONF_OPT += --disable-pathfinder
-endif
-ifdef PTXCONF_OPKG_CURL
-OPKG_CONF_OPT += --enable-curl
-else
-OPKG_CONF_OPT += --disable-curl
-endif
-ifdef PTXCONF_OPKG_SHA256
-OPKG_CONF_OPT += --enable-sha256
-else
-OPKG_CONF_OPT += --disable-sha256
-endif
-ifdef PTXCONF_OPKG_OPENSSL
-OPKG_CONF_OPT += --enable-openssl
-else
-OPKG_CONF_OPT += --disable-openssl
-endif
-ifdef PTXCONF_OPKG_SSL_CURL
-OPKG_CONF_OPT += --enable-ssl-curl
-else
-OPKG_CONF_OPT += --disable-ssl-curl
-endif
-ifdef PTXCONF_OPKG_GPG
-OPKG_CONF_OPT += --enable-gpg
-else
-OPKG_CONF_OPT += --disable-gpg
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
1.8.5.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] opkg: do not grab files from the build directory

[Juergen Beisert]

To just rename a file while installing, we also can grab this file from
the install directory. This change enables the opkg package to be used as
a pre-build archive.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 rules/opkg.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/opkg.make b/rules/opkg.make
index 8fc464f..4e78509 100644
--- a/rules/opkg.make
+++ b/rules/opkg.make
@@ -67,7 +67,7 @@ ifdef PTXCONF_OPKG_GPG
 	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/opkg-key)
 endif
 #	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/update-alternatives)
-	@$(call install_copy, opkg, 0, 0, 0755, $(OPKG_DIR)/src/opkg-cl, /usr/bin/opkg)
+	@$(call install_copy, opkg, 0, 0, 0755, $(OPKG_PKGDIR)/usr/bin/opkg-cl, /usr/bin/opkg)
 
 	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/share/opkg/intercept/ldconfig)
 	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/share/opkg/intercept/depmod)
-- 
1.8.5.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/2] opkg: do not grab files from the build directory

[Michael Olbrich]

On Tue, Jan 21, 2014 at 04:27:02PM +0100, Juergen Beisert wrote:
> To just rename a file while installing, we also can grab this file from
> the install directory. This change enables the opkg package to be used as
> a pre-build archive.
> 

Thanks, both applied.

Michael

> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> ---
>  rules/opkg.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/opkg.make b/rules/opkg.make
> index 8fc464f..4e78509 100644
> --- a/rules/opkg.make
> +++ b/rules/opkg.make
> @@ -67,7 +67,7 @@ ifdef PTXCONF_OPKG_GPG
>  	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/opkg-key)
>  endif
>  #	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/update-alternatives)
> -	@$(call install_copy, opkg, 0, 0, 0755, $(OPKG_DIR)/src/opkg-cl, /usr/bin/opkg)
> +	@$(call install_copy, opkg, 0, 0, 0755, $(OPKG_PKGDIR)/usr/bin/opkg-cl, /usr/bin/opkg)
>  
>  	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/share/opkg/intercept/ldconfig)
>  	@$(call install_copy, opkg, 0, 0, 0755, -, /usr/share/opkg/intercept/depmod)
> -- 
> 1.8.5.2
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de