[Buildroot] [PATCH v2 1/5] package/rpm: sort selected packages

[Buildroot] [PATCH v2 1/5] package/rpm: sort selected packages

[Romain Naour]

Sort selected packages alphabetically in Config.in

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
v2: new patch

 package/rpm/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 620eb1a..379b15b 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -7,12 +7,12 @@ config BR2_PACKAGE_RPM
 	depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_BEECRYPT
-	select BR2_PACKAGE_POPT
-	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_NEON
+	select BR2_PACKAGE_NEON_SSL
 	select BR2_PACKAGE_NEON_XML
 	select BR2_PACKAGE_NEON_ZLIB
-	select BR2_PACKAGE_NEON_SSL
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_ZLIB
 	help
 	  The RPM package management system.
-- 
1.9.3

[Buildroot] [PATCH v2 2/5] package/rpm: add gettext dependency

[Romain Naour]

rpm check for libintl library if BR2_NEEDS_GETTEXT_IF_LOCALE is set.

checking for GNU gettext in libintl... yes
checking whether to use NLS... yes
checking where the gettext function comes from... external libintl
checking how to link with libintl... -lintl

But the dependency on gettext package is missing to ensures
reproducible builds.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
v2: selected packages are already sorted by the first
    patch. (Yann E. MORIN)
---
 package/rpm/Config.in | 1 +
 package/rpm/rpm.mk    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 379b15b..5ec4167 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_RPM
 	depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_BEECRYPT
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_NEON
 	select BR2_PACKAGE_NEON_SSL
 	select BR2_PACKAGE_NEON_XML
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index c4215b5..74f5b88 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -26,6 +26,10 @@ RPM_CONF_OPTS = \
 	--with-libbeecrypt=$(STAGING_DIR) \
 	--with-popt=$(STAGING_DIR)
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+RPM_DEPENDENCIES += gettext
+endif
+
 ifeq ($(BR2_PACKAGE_PCRE),y)
 RPM_DEPENDENCIES += pcre
 RPM_CONF_OPTS += --with-pcre=external
-- 
1.9.3

[Buildroot] [PATCH v2 3/5] package/rpm: don't use sub-options for bzip2 and xz features

[Romain Naour]

Allow enabling features depends on the relying packages.

Add the old sub-options to Config.in.legacy.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
v2: new patch
---
 Config.in.legacy      | 16 ++++++++++++++++
 package/rpm/Config.in | 19 -------------------
 package/rpm/rpm.mk    |  5 +++--
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 69608c7..7fc9d9d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -102,6 +102,22 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
+	bool "rpm's bzip2 payloads option has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BZIP2
+	help
+	  The bzip2 payloads option rely entirely on the dependant package bzip2.
+	  So, you need to select it to enable this feature.
+
+config BR2_PACKAGE_RPM_XZ_PAYLOADS
+	bool "rpm's xz payloads option has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XZ
+	help
+	  The xz payloads option rely entirely on the dependant package xz.
+	  So, you need to select it to enable this feature.
+
 config BR2_PACKAGE_STRONGSWAN_TOOLS
 	bool "strongswan option has been removed"
 	select BR2_LEGACY
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 5ec4167..c6fc3b7 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -19,22 +19,3 @@ config BR2_PACKAGE_RPM
 	  The RPM package management system.
 
 	  http://rpm5.org
-
-if BR2_PACKAGE_RPM
-
-config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
-	bool "support for bzip2 payloads"
-	select BR2_PACKAGE_BZIP2
-	help
-	  Support for bzip2 payloads in RPM.
-
-config BR2_PACKAGE_RPM_XZ_PAYLOADS
-	bool "support for xz payloads"
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	  Support for xz payloads in RPM.
-
-comment "xz payload support needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
-
-endif
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 74f5b88..68d964a 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -44,11 +44,12 @@ else
 RPM_CONF_OPTS += --with-file=no
 endif
 
-ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
+# xz payload support needs a toolchain w/ C++
+ifeq ($(BR2_PACKAGE_XZ)$(BR2_INSTALL_LIBSTDCPP),yy)
 RPM_CONF_OPTS += --with-xz
 endif
 
-ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
+ifeq ($(BR2_PACKAGE_BZIP2),y)
 RPM_CONF_OPTS += --with-bzip2
 RPM_DEPENDENCIES += bzip2
 endif
-- 
1.9.3

[Buildroot] [PATCH v2 4/5] package/rpm: use external xz library

[Romain Naour]

Internal xz backend is statically linked and need a static
libintl library when BR2_NEEDS_GETTEXT_IF_LOCALE is set.
But for a shared only build, there is no static libintl available
in the sysroot.

Use the external xz library provided by Buildroot instead of
using the internal xz backend.

Fixes:
http://autobuild.buildroot.net/results/2c6/2c61562008418ff58fa3085a3342b0e304923073/

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v2: rebase on top of the 3/5 patch

 package/rpm/rpm.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 68d964a..fda10f2 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -46,7 +46,10 @@ endif
 
 # xz payload support needs a toolchain w/ C++
 ifeq ($(BR2_PACKAGE_XZ)$(BR2_INSTALL_LIBSTDCPP),yy)
-RPM_CONF_OPTS += --with-xz
+RPM_DEPENDENCIES += xz
+RPM_CONF_OPTS += --with-xz=external
+else
+RPM_CONF_OPTS += --with-xz=none
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-- 
1.9.3

[Buildroot] [PATCH v2 5/5] package/rpm: use 'none' for location path

[Romain Naour]

The recognized keywords are:
(location path: "external:internal:none")

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v2: no change

 package/rpm/rpm.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index fda10f2..42a3b64 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -34,14 +34,14 @@ ifeq ($(BR2_PACKAGE_PCRE),y)
 RPM_DEPENDENCIES += pcre
 RPM_CONF_OPTS += --with-pcre=external
 else
-RPM_CONF_OPTS += --with-pcre=no
+RPM_CONF_OPTS += --with-pcre=none
 endif
 
 ifeq ($(BR2_PACKAGE_FILE),y)
 RPM_DEPENDENCIES += file
 RPM_CONF_OPTS += --with-file=external
 else
-RPM_CONF_OPTS += --with-file=no
+RPM_CONF_OPTS += --with-file=none
 endif
 
 # xz payload support needs a toolchain w/ C++
-- 
1.9.3

[Buildroot] [PATCH v2 1/5] package/rpm: sort selected packages

[Thomas Petazzoni]

Dear Romain Naour,

On Sun, 18 Jan 2015 20:53:06 +0100, Romain Naour wrote:
> Sort selected packages alphabetically in Config.in
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>

Applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 2/5] package/rpm: add gettext dependency

[Thomas Petazzoni]

Dear Romain Naour,

On Sun, 18 Jan 2015 20:53:07 +0100, Romain Naour wrote:
> rpm check for libintl library if BR2_NEEDS_GETTEXT_IF_LOCALE is set.
> 
> checking for GNU gettext in libintl... yes
> checking whether to use NLS... yes
> checking where the gettext function comes from... external libintl
> checking how to link with libintl... -lintl
> 
> But the dependency on gettext package is missing to ensures
> reproducible builds.
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
> v2: selected packages are already sorted by the first
>     patch. (Yann E. MORIN)

Applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com