From 509fe4a6de108464aed16e7b49aa44e779c5e11a Mon Sep 17 00:00:00 2001 From: Nigel Kukard Date: Tue, 29 Apr 2008 05:04:14 +0000 Subject: [PATCH] * Bump version to 5.1.1 * Use bzip2 compression (rpms can have gzip or bzip2 payloads) * -j1, rpm cannot build with more than 1 thread --- package/rpm/Config.in | 1 + package/rpm/rpm.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/rpm/Config.in b/package/rpm/Config.in index b5aec85803..42e82e2a5f 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_RPM bool "rpm" default n select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_BEECRYPT select BR2_PACKAGE_NEON select BR2_PACKAGE_POPT diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 32dd3b1c8e..d83f0d49ec 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -3,11 +3,11 @@ # rpm # ############################################################# -RPM_VERSION = 5.1.0 -RPM_SITE = http://rpm5.org/files/rpm/rpm-5.0/ +RPM_VERSION = 5.1.1 +RPM_SITE = http://rpm5.org/files/rpm/rpm-5.1/ RPM_AUTORECONF = YES -RPM_DEPENDENCIES = zlib beecrypt neon popt +RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt RPM_CONF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon" \ ac_cv_va_copy=yes @@ -19,8 +19,11 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \ --with-libbeecrypt=$(STAGING_DIR) \ --with-popt=$(STAGING_DIR) \ --with-mutex=UNIX/fcntl \ + --with-bzip2 \ $(DISABLE_NLS) +RPM_MAKE_OPT = -j1 + RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install $(eval $(call AUTOTARGETS,package,rpm)) -- 2.30.2