package/rpm: sort selected packages
PATCH v2 1/5 package/rpm: sort selected packages
Sort selected packages alphabetically in Config.in
---
v2: new patch
package/rpm/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/rpm/Config.in +3 -3
@@ -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.
Signature · 1 line
1.9.3
PATCH v2 2/5 package/rpm: add gettext dependency
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.
---
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(+)
package/rpm/Config.in +1 -0
@@ -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
package/rpm/rpm.mk +4 -0
@@ -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
Signature · 1 line
1.9.3
Thomas Petazzoni
AppliedPATCH v2 2/5 package/rpm: add gettext dependency
Dear Romain Naour,
Quoted 7 lines · Romain Naour
rpm check for libintl library if
BR2_NEEDS_GETTEXT_IF_LOCALEis 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
Quoted 7 lines
But the dependency on gettext package is missing to ensures reproducible builds.
Signed-off-by Romain Naour <[email protected]>---
v2: selected packages are already sorted by the first
patch. (Yann E. MORIN)
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 3/5 package/rpm: don't use sub-options for bzip2 and xz features
In reply to Romain NaourAllow enabling features depends on the relying packages.
Add the old sub-options to Config.in.legacy.
---
v2: new patch
--- Config.in.legacy | 16 ++++++++++++++++ package/rpm/Config.in | 19 ------------------- package/rpm/rpm.mk | 5 +++-- 3 files changed, 19 insertions(+), 21 deletions(-)
Config.in.legacy +16 -0
@@ -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
package/rpm/Config.in +0 -19
@@ -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
package/rpm/rpm.mk +3 -2
@@ -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
Signature · 1 line
1.9.3
PATCH v2 4/5 package/rpm: use external xz library
In reply to Romain NaourInternal 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/
---
v2: rebase on top of the 3/5 patch
package/rpm/rpm.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
package/rpm/rpm.mk +4 -1
@@ -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)
Signature · 1 line
1.9.3
PATCH v2 5/5 package/rpm: use 'none' for location path
In reply to Romain NaourThe recognized keywords are:
(location path: "external:internal:none")
---
v2: no change
package/rpm/rpm.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/rpm/rpm.mk +2 -2
@@ -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++
Signature · 1 line
1.9.3
Thomas Petazzoni
AppliedPATCH v2 1/5 package/rpm: sort selected packages
In reply to Romain NaourDear Romain Naour,
Quoted 3 lines · Romain Naour
Sort selected packages alphabetically in Config.in
Signed-off-by Romain Naour <[email protected]>
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com