소스 검색

* 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

Nigel Kukard 17 년 전
부모
커밋
509fe4a6de
2개의 변경된 파일7개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 0
      package/rpm/Config.in
  2. 6 3
      package/rpm/rpm.mk

+ 1 - 0
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

+ 6 - 3
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))