[Buildroot] [git commit] package/rpm: bump version to 4.17.0
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Sat Sep 11 20:33:37 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=429e247b869027f6ecd4efa0f31bccd2765e3875
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Bumping the version of the rpm package to v4.17. This new release
includes a series of key changes [1], notables includes:
- Explicit requirement for lua v5.3+.
- Berkeley DB database backend has been dropped.
- beecrypt and NSS crypto backends have been dropped.
The argument `--with-external-db` was tied to Berkeley-related support,
which was removed in an older revision [2]. The argument
`--without-hackingdocs` was dropped in an older revision [3].
[1]: https://rpm.org/wiki/Releases/4.17.0
[2]: https://github.com/rpm-software-management/rpm/commit/e1d3811883dc9fe79fe7b5ff90f69b9998611128
[3]: https://github.com/rpm-software-management/rpm/commit/3017eae9a3952823f80932e84a7a1e81f983639a
Signed-off-by: James Knight <james.d.knight at live.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
package/rpm/Config.in | 8 +++++---
package/rpm/rpm.hash | 4 ++--
package/rpm/rpm.mk | 25 ++++---------------------
3 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index ac979fdbad..9da8d51df0 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,5 +1,6 @@
-comment "rpm needs a toolchain w/ dynamic library and threads"
- depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+comment "rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
+ || !BR2_PACKAGE_LUA_5_3
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
depends on BR2_USE_MMU
@@ -7,9 +8,10 @@ config BR2_PACKAGE_RPM
bool "rpm"
depends on !BR2_STATIC_LIBS # dlfcn.h
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+ depends on BR2_PACKAGE_LUA_5_3
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
- select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_LIBNSS && !BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_FILE
select BR2_PACKAGE_POPT
select BR2_PACKAGE_ZLIB
diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash
index 9389f8290f..19b6dd9176 100644
--- a/package/rpm/rpm.hash
+++ b/package/rpm/rpm.hash
@@ -1,5 +1,5 @@
-# From https://rpm.org/wiki/Releases/4.16.1.3.html
-sha256 513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d rpm-4.16.1.3.tar.bz2
+# From https://rpm.org/wiki/Releases/4.17.0.html
+sha256 2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a rpm-4.17.0.tar.bz2
# Hash for license file
sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index ae324fbeef..816deceff7 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -4,8 +4,8 @@
#
################################################################################
-RPM_VERSION_MAJOR = 4.16
-RPM_VERSION = $(RPM_VERSION_MAJOR).1.3
+RPM_VERSION_MAJOR = 4.17
+RPM_VERSION = $(RPM_VERSION_MAJOR).0
RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
RPM_DEPENDENCIES = \
@@ -13,6 +13,7 @@ RPM_DEPENDENCIES = \
$(if $(BR2_PACKAGE_BZIP2),bzip2) \
$(if $(BR2_PACKAGE_ELFUTILS),elfutils) \
file \
+ lua \
popt \
$(if $(BR2_PACKAGE_XZ),xz) \
zlib \
@@ -28,10 +29,7 @@ RPM_SELINUX_MODULES = rpm
RPM_CONF_OPTS = \
--disable-python \
--disable-rpath \
- --with-external-db \
- --with-gnu-ld \
- --without-hackingdocs \
- --without-lua
+ --with-gnu-ld
ifeq ($(BR2_PACKAGE_ACL),y)
RPM_DEPENDENCIES += acl
@@ -40,13 +38,6 @@ else
RPM_CONF_OPTS += --without-acl
endif
-ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
-RPM_DEPENDENCIES += berkeleydb
-RPM_CONF_OPTS += --enable-bdb
-else
-RPM_CONF_OPTS += --disable-bdb
-endif
-
ifeq ($(BR2_PACKAGE_DBUS),y)
RPM_DEPENDENCIES += dbus
RPM_CONF_OPTS += --enable-plugins
@@ -64,14 +55,6 @@ endif
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
RPM_DEPENDENCIES += libgcrypt
RPM_CONF_OPTS += --with-crypto=libgcrypt
-else ifeq ($(BR2_PACKAGE_LIBNSS),y)
-RPM_DEPENDENCIES += libnss
-RPM_CONF_OPTS += --with-crypto=nss
-RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr
-else ifeq ($(BR2_PACKAGE_BEECRYPT),y)
-RPM_DEPENDENCIES += beecrypt
-RPM_CONF_OPTS += --with-crypto=beecrypt
-RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt
else
RPM_DEPENDENCIES += openssl
RPM_CONF_OPTS += --with-crypto=openssl
More information about the buildroot
mailing list