Skip to contentSkip to conversation

Pull request for branch rpm-update

GIT PULL New Nigel Kukard 2 participants 4 messages Dec 21, 2009

lore
Share & tools
lore
#0 lore raw

The following changes since commit 14aa5ee54f33d05a0bd01f21635e095ba07f83ec:
Peter Korsgaard (1):
mtd-utils: move phony dependencies to toplevel mtd-host target

are available in the git repository at:

git://git.busybox.net/~nkukard/git/buildroot rpm-update

Nigel Kukard (1):
Update rpm

 package/rpm/Config.in                             |   26 ++-
 package/rpm/rpm-5.1.6_exclude-some-tools.patch    |   12 -
 package/rpm/rpm-5.1.6_magic-file-fix.patch        |   40 ----
 package/rpm/rpm-5.2.0_depends-fix.patch           |   19 ++
 package/rpm/rpm-5.2.0_exclude-some-tools.patch    |   30 +++
 package/rpm/rpm-5.2.0_no-parentdirs.patch         |   14 ++
 package/rpm/rpm-5.2.0_ordering-fix.patch          |   45 ++++
 package/rpm/rpm-5.2.0_parentdir-vs-requires.patch |   37 ++++
 package/rpm/rpm-5.2.0_short-circuit-c99.patch     |  235 +++++++++++++++++++++
 package/rpm/rpm.mk                                |   21 ++-
 10 files changed, 416 insertions(+), 63 deletions(-)
 delete mode 100755 package/rpm/rpm-5.1.6_exclude-some-tools.patch
 delete mode 100755 package/rpm/rpm-5.1.6_magic-file-fix.patch
 create mode 100644 package/rpm/rpm-5.2.0_depends-fix.patch
 create mode 100644 package/rpm/rpm-5.2.0_exclude-some-tools.patch
 create mode 100644 package/rpm/rpm-5.2.0_no-parentdirs.patch
 create mode 100644 package/rpm/rpm-5.2.0_ordering-fix.patch
 create mode 100644 package/rpm/rpm-5.2.0_parentdir-vs-requires.patch
 create mode 100644 package/rpm/rpm-5.2.0_short-circuit-c99.patch

Thanks,

Signature · 1 line
Nigel Kukard
#1 lore raw

PATCH 1/1 Update rpm

---
 package/rpm/Config.in                             |   26 ++-
 package/rpm/rpm-5.1.6_exclude-some-tools.patch    |   12 -
 package/rpm/rpm-5.1.6_magic-file-fix.patch        |   40 ----
 package/rpm/rpm-5.2.0_depends-fix.patch           |   19 ++
 package/rpm/rpm-5.2.0_exclude-some-tools.patch    |   30 +++
 package/rpm/rpm-5.2.0_no-parentdirs.patch         |   14 ++
 package/rpm/rpm-5.2.0_ordering-fix.patch          |   45 ++++
 package/rpm/rpm-5.2.0_parentdir-vs-requires.patch |   37 ++++
 package/rpm/rpm-5.2.0_short-circuit-c99.patch     |  235 +++++++++++++++++++++
 package/rpm/rpm.mk                                |   21 ++-
 10 files changed, 416 insertions(+), 63 deletions(-)
 delete mode 100755 package/rpm/rpm-5.1.6_exclude-some-tools.patch
 delete mode 100755 package/rpm/rpm-5.1.6_magic-file-fix.patch
 create mode 100644 package/rpm/rpm-5.2.0_depends-fix.patch
 create mode 100644 package/rpm/rpm-5.2.0_exclude-some-tools.patch
 create mode 100644 package/rpm/rpm-5.2.0_no-parentdirs.patch
 create mode 100644 package/rpm/rpm-5.2.0_ordering-fix.patch
 create mode 100644 package/rpm/rpm-5.2.0_parentdir-vs-requires.patch
 create mode 100644 package/rpm/rpm-5.2.0_short-circuit-c99.patch
package/rpm/Config.in +22 -4
index f4f7f90..d50a642 100644
@@ -1,14 +1,32 @@
 config BR2_PACKAGE_RPM
 	bool "rpm"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_BEECRYPT
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_NEON
 	select BR2_PACKAGE_NEON_ZLIB
-	select BR2_PACKAGE_NEON_EXPAT 	if BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_NEON_LIBXML2	if BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_NEON_SSL
 	help
 	  The RPM package management system.
 
 	  http://rpm5.org
+
+config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
+	bool "support for bzip2 payloads"
+	depends on BR2_PACKAGE_RPM
+	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_PACKAGE_RPM
+	depends on BR2_GCC_CROSS_CXX
+	help
+	  Support for xz payloads in RPM.
+
+comment "xz payload support requires a toolchain with c++ support"
+	depends on !BR2_GCC_CROSS_CXX
+
+
package/rpm/rpm-5.1.6_exclude-some-tools.patch deleted +0 -12
deleted file mode 100755
index 04f1ccf..0000000
@@ -1,12 +0,0 @@
-diff -u --new-file --recursive rpm-5.1.6_vanilla/tools/Makefile.am rpm-5.1.6_no-noncompiling-tools/tools/Makefile.am
---- rpm-5.1.6_vanilla/tools/Makefile.am	2008-06-15 08:57:25.000000000 +0000
-+++ rpm-5.1.6_no-noncompiling-tools/tools/Makefile.am	2008-11-29 19:37:55.000000000 +0000
-@@ -39,7 +39,7 @@
- 	$(top_builddir)/build/librpmbuild.la \
- 	$(RPM_LDADD_COMMON)
- 
--bin_PROGRAMS =		rpm2cpio rpmcache rpmdigest rpmmtree rpmrepo
-+bin_PROGRAMS =		rpm2cpio 
- 
- pkglibdir =		@USRLIBRPM@
- pkglib_PROGRAMS =	rpmcmp rpmdeps @WITH_LIBELF_DEBUGEDIT@
package/rpm/rpm-5.1.6_magic-file-fix.patch deleted +0 -40
deleted file mode 100755
index da09445..0000000
@@ -1,40 +0,0 @@
-diff -u --new-file --recursive rpm-5.1.6_vanilla/file/magic/Magdir/audio rpm-5.1.6_magic-file-fix/file/magic/Magdir/audio
---- rpm-5.1.6_vanilla/file/magic/Magdir/audio	2007-05-31 02:19:30.000000000 +0000
-+++ rpm-5.1.6_magic-file-fix/file/magic/Magdir/audio	2008-11-29 15:45:32.000000000 +0000
-@@ -208,7 +208,7 @@
- >22	belong&0x00ffffff	x		%d Hz,
- >18	beshort		=0			no loop,
- >18	beshort		=-1			loop,
-->21	ubyte		<=127			note %d,
-+>21	ubyte		<128			note %d,
- >22	byte		=0			replay 5.485 KHz
- >22	byte		=1			replay 8.084 KHz
- >22	byte		=2			replay 10.971 Khz
-diff -u --new-file --recursive rpm-5.1.6_vanilla/file/magic/Magdir/freebsd rpm-5.1.6_magic-file-fix/file/magic/Magdir/freebsd
---- rpm-5.1.6_vanilla/file/magic/Magdir/freebsd	2003-04-15 16:58:35.000000000 +0000
-+++ rpm-5.1.6_magic-file-fix/file/magic/Magdir/freebsd	2008-11-29 15:45:32.000000000 +0000
-@@ -128,10 +128,10 @@
- # What are you laughing about?
- 0	lelong			011421044151	ld.so hints file (Little Endian
- >4	lelong			>0		\b, version %d)
-->4	belong			<=0		\b)
-+>4	belong			<1		\b)
- 0	belong			011421044151	ld.so hints file (Big Endian
- >4	belong			>0		\b, version %d)
-->4	belong			<=0		\b)
-+>4	belong			<1		\b)
- 
- #
- # Files generated by FreeBSD scrshot(1)/vidcontrol(1) utilities
-diff -u --new-file --recursive rpm-5.1.6_vanilla/file/magic/Magdir/linux rpm-5.1.6_magic-file-fix/file/magic/Magdir/linux
---- rpm-5.1.6_vanilla/file/magic/Magdir/linux	2007-05-31 02:19:30.000000000 +0000
-+++ rpm-5.1.6_magic-file-fix/file/magic/Magdir/linux	2008-11-29 15:45:32.000000000 +0000
-@@ -84,7 +84,7 @@
- # Linux kernel boot images (i386 arch) (Wolfram Kleff)
- 514	string		HdrS		Linux kernel
- >510	leshort		0xAA55		x86 boot executable
-->>518	leshort		>=0x200
-+>>518	leshort		>0x1ff
- >>529	byte		0		zImage,
- >>>529	byte		1		bzImage,
- >>>(526.s+0x200) string	>\0		version %s,
package/rpm/rpm-5.2.0_depends-fix.patch new file +19 -0
new file mode 100644
index 0000000..4a92775
@@ -0,0 +1,19 @@
+Bugfix included upstream
+
+diff -u --new-file --recursive rpm-5.2.0_vanilla/lib/depends.c rpm-5.2.0_depends-fix/lib/depends.c
+--- rpm-5.2.0_vanilla/lib/depends.c	2009-05-23 01:23:46.000000000 +0000
++++ rpm-5.2.0_depends-fix/lib/depends.c	2009-09-22 06:33:37.950783501 +0000
+@@ -2371,11 +2371,11 @@
+ 
+ 	memset(selected, 0, sizeof(*selected) * ts->orderCount);
+ 
+-      if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) {
+-
+ 	/* Avoid narcisstic relations. */
+ 	selected[rpmtsiOc(pi)] = 1;
+ 
++      if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) {
++
+ 	/* T2. Next "q <- p" relation. */
+ 
+ 	/* First, do pre-requisites. */
package/rpm/rpm-5.2.0_exclude-some-tools.patch new file +30 -0
new file mode 100644
index 0000000..2cbc7cb
@@ -0,0 +1,30 @@
+diff -ru rpm-5.2.0_vanilla/tools/Makefile.am rpm-5.2.0_exclude-some-tools/tools/Makefile.am
+--- rpm-5.2.0_vanilla/tools/Makefile.am	2009-06-03 01:24:42.000000000 +0000
++++ rpm-5.2.0_exclude-some-tools/tools/Makefile.am	2009-12-20 07:47:13.000000000 +0000
+@@ -45,9 +45,7 @@
+ bin_PROGRAMS =		rpm2cpio
+ 
+ pkgbindir =		@USRLIBRPM@/bin
+-pkgbin_PROGRAMS =	\
+-	rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \
+-	rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
++pkgbin_PROGRAMS =	
+ dist_man_MANS =		rpmgrep.1
+ 
+ debugedit_SOURCES =	debugedit.c hashtab.c
+diff -ru rpm-5.2.0_vanilla/tools/Makefile.in rpm-5.2.0_exclude-some-tools/tools/Makefile.in
+--- rpm-5.2.0_vanilla/tools/Makefile.in	2009-07-07 21:14:06.000000000 +0000
++++ rpm-5.2.0_exclude-some-tools/tools/Makefile.in	2009-12-20 07:47:37.000000000 +0000
+@@ -39,11 +39,7 @@
+ target_triplet = @target@
+ EXTRA_PROGRAMS = rpmkey$(EXEEXT) debugedit$(EXEEXT)
+ bin_PROGRAMS = rpm2cpio$(EXEEXT)
+-pkgbin_PROGRAMS = rpmcache$(EXEEXT) rpmdigest$(EXEEXT) grep$(EXEEXT) \
+-	mtree$(EXEEXT) rpmrepo$(EXEEXT) rpmspecdump$(EXEEXT) \
+-	wget$(EXEEXT) rpmcmp$(EXEEXT) rpmdeps$(EXEEXT) \
+-	@WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ $(am__EXEEXT_1) \
+-	$(am__EXEEXT_2)
++pkgbin_PROGRAMS = 
+ @WITH_XAR_TRUE at am__append_1 = txar
+ @WITH_DB_INTERNAL_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE at am__append_2 = db_tool
+ @WITH_DB_INTERNAL_TRUE@@WITH_DB_RPC_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_3 = \
package/rpm/rpm-5.2.0_no-parentdirs.patch new file +14 -0
new file mode 100644
index 0000000..d05c99a
@@ -0,0 +1,14 @@
+Reduce parentdirs we use, parentdirs are used for ordering
+Included upstream
+diff -u --new-file --recursive rpm-5.1.9_vanilla/lib/depends.c rpm-5.1.9_no-parentdirs/lib/depends.c
+--- rpm-5.1.9_vanilla/lib/depends.c	2009-04-12 19:46:17.000000000 +0000
++++ rpm-5.1.9_no-parentdirs/lib/depends.c	2009-06-13 15:21:43.504999639 +0000
+@@ -2257,7 +2257,7 @@
+ #define isAuto(_x)	((_x) & _autobits)
+ 
+ /*@unchecked@*/
+-static int slashDepth = 100;	/* #slashes pemitted in parentdir deps. */
++static int slashDepth = 2;	/* #slashes pemitted in parentdir deps. */
+ 
+ static int countSlashes(const char * dn)
+ 	/*@*/
package/rpm/rpm-5.2.0_ordering-fix.patch new file +45 -0

45 lines not on this page · raw message

package/rpm/rpm-5.2.0_parentdir-vs-requires.patch new file +37 -0
new file mode 100644
index 0000000..309ab25
@@ -0,0 +1,37 @@
+Avoid looking up files or directories that this package provides
+Included upstream
+diff -u --new-file --recursive rpm-5.2.0_vanilla/lib/depends.c rpm-5.2.0_parentdir-vs-requires/lib/depends.c
+--- rpm-5.2.0_vanilla/lib/depends.c	2009-05-23 01:23:46.000000000 +0000
++++ rpm-5.2.0_parentdir-vs-requires/lib/depends.c	2009-09-22 17:00:24.880956271 +0000
+@@ -2095,6 +2095,7 @@
+     rpmtsi qi; rpmte q;
+     tsortInfo tsi;
+     nsType NSType = rpmdsNSType(requires);
++    const char * N = rpmdsN(requires);
+     fnpyKey key;
+     int teType = rpmteType(p);
+     alKey pkgKey;
+@@ -2128,6 +2129,23 @@
+ 	break;
+     }
+ 
++    /* Avoid looking up files/directories that are "owned" by _THIS_ package. */
++    if (*N == '/') {
++    rpmfi fi = rpmteFI(p, RPMTAG_BASENAMES);
++    int bingo = 0;
++
++    fi = rpmfiInit(fi, 0);
++    while (rpmfiNext(fi) >= 0) {
++        const char * fn = rpmfiFN(fi);
++        if (strcmp(N, fn))
++        continue;
++        bingo = 1;
++        break;
++    }
++    if (bingo)
++        return 0;
++    }
++
+     pkgKey = RPMAL_NOMATCH;
+     key = rpmalSatisfiesDepend(al, requires, &pkgKey);
+ 
package/rpm/rpm-5.2.0_short-circuit-c99.patch new file +235 -0

235 lines not on this page · raw message

package/rpm/rpm.mk +14 -7
index d3da779..cbc318b 100644
@@ -3,12 +3,12 @@
 # rpm
 #
 #############################################################
-RPM_VERSION = 5.1.6
-RPM_SITE = http://rpm5.org/files/rpm/rpm-5.1/
-RPM_AUTORECONF = YES
+RPM_VERSION = 5.2.0
+RPM_SITE = http://rpm5.org/files/rpm/rpm-5.2/
+RPM_AUTORECONF = NO
 RPM_LIBTOOL_PATCH = NO
 
-RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt
+RPM_DEPENDENCIES = zlib beecrypt neon popt
 
 RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon" \
 		ac_cv_va_copy=yes
@@ -20,9 +20,16 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 	--without-python --without-perl \
 	--with-zlib=$(STAGING_DIR) \
 	--with-libbeecrypt=$(STAGING_DIR) \
-	--with-popt=$(STAGING_DIR) \
-	--with-mutex=UNIX/fcntl \
-	--with-bzip2
+	--with-popt=$(STAGING_DIR) 
+
+ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
+RPM_CONF_OPT+=--with-xz
+endif
+
+ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
+RPM_CONF_OPT+=--with-bzip2
+RPM_DEPENDENCIES+=bzip2
+endif
 
 RPM_MAKE = $(MAKE1)
 
Signature · 1 line
1.6.4
#2 lore raw

PATCH 1/1 Update rpm

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Nigel" == Nigel Kukard <[email protected]> writes:

Nigel> Signed-off-by: Nigel Kukard <[email protected]> Nigel> ---

 Nigel>  package/rpm/Config.in                             |   26 ++-
 Nigel>  package/rpm/rpm-5.1.6_exclude-some-tools.patch    |   12 -
 Nigel>  package/rpm/rpm-5.1.6_magic-file-fix.patch        |   40 ----
 Nigel>  package/rpm/rpm-5.2.0_depends-fix.patch           |   19 ++
 Nigel>  package/rpm/rpm-5.2.0_exclude-some-tools.patch    |   30 +++
 Nigel>  package/rpm/rpm-5.2.0_no-parentdirs.patch         |   14 ++
 Nigel>  package/rpm/rpm-5.2.0_ordering-fix.patch          |   45 ++++
 Nigel>  package/rpm/rpm-5.2.0_parentdir-vs-requires.patch |   37 ++++
 Nigel>  package/rpm/rpm-5.2.0_short-circuit-c99.patch     |  235 +++++++++++++++++++++
 Nigel>  package/rpm/rpm.mk                                |   21 ++-
 Nigel>  10 files changed, 416 insertions(+), 63 deletions(-)
 Nigel>  delete mode 100755 package/rpm/rpm-5.1.6_exclude-some-tools.patch
 Nigel>  delete mode 100755 package/rpm/rpm-5.1.6_magic-file-fix.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_depends-fix.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_exclude-some-tools.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_no-parentdirs.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_ordering-fix.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_parentdir-vs-requires.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_short-circuit-c99.patch

Where does those patches come from? Are you the author? Have they been pushed upstream where possible?

Nigel> diff --git a/package/rpm/Config.in b/package/rpm/Config.in Nigel> index f4f7f90..d50a642 100644
Nigel> --- a/package/rpm/Config.in
Nigel> +++ b/package/rpm/Config.in
Nigel> @@ -1,14 +1,32 @@
Nigel> config BR2_PACKAGE_RPM
Nigel> bool "rpm"
Nigel> - select BR2_PACKAGE_ZLIB
Nigel> - select BR2_PACKAGE_BZIP2

 Nigel>  	select BR2_PACKAGE_BEECRYPT
 Nigel>  	select BR2_PACKAGE_POPT
 Nigel>  	select BR2_PACKAGE_NEON
 Nigel>  	select BR2_PACKAGE_NEON_ZLIB

Nigel> - select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
Nigel> - select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
Nigel> + select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
Nigel> + select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
Nigel> + select BR2_PACKAGE_NEON_SSL

Select doesn't work recursively, so you need to select openssl as well.

Nigel> help
Nigel> The RPM package management system.

Nigel> http://rpm5.org
Nigel> +
Nigel> +config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
Nigel> + bool "support for bzip2 payloads"
Nigel> + depends on BR2_PACKAGE_RPM
Nigel> + select BR2_PACKAGE_BZIP2
Nigel> + help
Nigel> + Support for bzip2 payloads in RPM.
Nigel> +
Nigel> +config BR2_PACKAGE_RPM_XZ_PAYLOADS
Nigel> + bool "support for xz payloads"
Nigel> + depends on BR2_PACKAGE_RPM
Nigel> + depends on BR2_GCC_CROSS_CXX

Doesn't this need liblzma?

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 Update rpm

Quoted 24 lines · Peter Korsgaard
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Nigel" == Nigel Kukard <[email protected]> writes:

Nigel> Signed-off-by: Nigel Kukard <[email protected]> Nigel> ---

 Nigel>  package/rpm/Config.in                             |   26 ++-
 Nigel>  package/rpm/rpm-5.1.6_exclude-some-tools.patch    |   12 -
 Nigel>  package/rpm/rpm-5.1.6_magic-file-fix.patch        |   40 ----
 Nigel>  package/rpm/rpm-5.2.0_depends-fix.patch           |   19 ++
 Nigel>  package/rpm/rpm-5.2.0_exclude-some-tools.patch    |   30 +++
 Nigel>  package/rpm/rpm-5.2.0_no-parentdirs.patch         |   14 ++
 Nigel>  package/rpm/rpm-5.2.0_ordering-fix.patch          |   45 ++++
 Nigel>  package/rpm/rpm-5.2.0_parentdir-vs-requires.patch |   37 ++++
 Nigel>  package/rpm/rpm-5.2.0_short-circuit-c99.patch     |  235 +++++++++++++++++++++
 Nigel>  package/rpm/rpm.mk                                |   21 ++-
 Nigel>  10 files changed, 416 insertions(+), 63 deletions(-)
 Nigel>  delete mode 100755 package/rpm/rpm-5.1.6_exclude-some-tools.patch
 Nigel>  delete mode 100755 package/rpm/rpm-5.1.6_magic-file-fix.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_depends-fix.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_exclude-some-tools.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_no-parentdirs.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_ordering-fix.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_parentdir-vs-requires.patch
 Nigel>  create mode 100644 package/rpm/rpm-5.2.0_short-circuit-c99.patch
Quoted 3 lines

Where does those patches come from? Are you the author? Have they been pushed upstream where possible?

All relevant fixes have been resolved upstream in line for 5.3.x.

These will not be uptream:

exclude-some-tools - simply excludes tools we don't want

short-circuit-c99 - after alot of hair pulling, this just ignores the c99 test and shoves in "gcc -std=c99"

Quoted 13 lines

Nigel> diff --git a/package/rpm/Config.in b/package/rpm/Config.in Nigel> index f4f7f90..d50a642 100644
Nigel> --- a/package/rpm/Config.in
Nigel> +++ b/package/rpm/Config.in
Nigel> @@ -1,14 +1,32 @@
Nigel> config BR2_PACKAGE_RPM
Nigel> bool "rpm"
Nigel> - select BR2_PACKAGE_ZLIB
Nigel> - select BR2_PACKAGE_BZIP2

 Nigel>  	select BR2_PACKAGE_BEECRYPT
 Nigel>  	select BR2_PACKAGE_POPT
 Nigel>  	select BR2_PACKAGE_NEON
 Nigel>  	select BR2_PACKAGE_NEON_ZLIB
Quoted 8 lines

Nigel> - select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
Nigel> - select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
Nigel> + select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
Nigel> + select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
Nigel> + select BR2_PACKAGE_NEON_SSL

Select doesn't work recursively, so you need to select openssl as well.

ok

Quoted 17 lines

Nigel> help
Nigel> The RPM package management system.

Nigel> http://rpm5.org
Nigel> +
Nigel> +config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
Nigel> + bool "support for bzip2 payloads"
Nigel> + depends on BR2_PACKAGE_RPM
Nigel> + select BR2_PACKAGE_BZIP2
Nigel> + help
Nigel> + Support for bzip2 payloads in RPM.
Nigel> +
Nigel> +config BR2_PACKAGE_RPM_XZ_PAYLOADS
Nigel> + bool "support for xz payloads"
Nigel> + depends on BR2_PACKAGE_RPM
Nigel> + depends on BR2_GCC_CROSS_CXX

Quoted 2 lines

Doesn't this need liblzma?

If it finds xz, it will use it, if it doesn't, it will use internal copy. So its not required, no.