* [Buildroot] svn commit: trunk/buildroot/package/rpm
@ 2008-04-15 8:25 nkukard at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: nkukard at uclibc.org @ 2008-04-15 8:25 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-15 01:25:32 -0700 (Tue, 15 Apr 2008)
New Revision: 21737
Log:
* Disable DB3 mutexes in rpm, this caused a segfault after a "Function Not Implemented" error
Modified:
trunk/buildroot/package/rpm/rpm.mk
Changeset:
Modified: trunk/buildroot/package/rpm/rpm.mk
===================================================================
--- trunk/buildroot/package/rpm/rpm.mk 2008-04-15 08:23:19 UTC (rev 21736)
+++ trunk/buildroot/package/rpm/rpm.mk 2008-04-15 08:25:32 UTC (rev 21737)
@@ -18,6 +18,7 @@
--with-zlib=$(STAGING_DIR) \
--with-libbeecrypt=$(STAGING_DIR) \
--with-popt=$(STAGING_DIR) \
+ --disable-mutexsupport \
$(DISABLE_NLS)
RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/rpm
@ 2008-04-27 9:51 nkukard at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: nkukard at uclibc.org @ 2008-04-27 9:51 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-27 02:51:32 -0700 (Sun, 27 Apr 2008)
New Revision: 21875
Log:
* Bump to 5.1.0
* Use fnctl for locking
Modified:
trunk/buildroot/package/rpm/rpm.mk
Changeset:
Modified: trunk/buildroot/package/rpm/rpm.mk
===================================================================
--- trunk/buildroot/package/rpm/rpm.mk 2008-04-27 03:33:29 UTC (rev 21874)
+++ trunk/buildroot/package/rpm/rpm.mk 2008-04-27 09:51:32 UTC (rev 21875)
@@ -3,7 +3,7 @@
# rpm
#
#############################################################
-RPM_VERSION = 5.0.3
+RPM_VERSION = 5.1.0
RPM_SITE = http://rpm5.org/files/rpm/rpm-5.0/
RPM_AUTORECONF = YES
@@ -18,7 +18,7 @@
--with-zlib=$(STAGING_DIR) \
--with-libbeecrypt=$(STAGING_DIR) \
--with-popt=$(STAGING_DIR) \
- --disable-mutexsupport \
+ --with-mutex=UNIX/fcntl \
$(DISABLE_NLS)
RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/rpm
@ 2008-04-29 5:04 nkukard at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: nkukard at uclibc.org @ 2008-04-29 5:04 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-28 22:04:14 -0700 (Mon, 28 Apr 2008)
New Revision: 21891
Log:
* 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
Modified:
trunk/buildroot/package/rpm/Config.in
trunk/buildroot/package/rpm/rpm.mk
Changeset:
Modified: trunk/buildroot/package/rpm/Config.in
===================================================================
--- trunk/buildroot/package/rpm/Config.in 2008-04-29 04:40:15 UTC (rev 21890)
+++ trunk/buildroot/package/rpm/Config.in 2008-04-29 05:04:14 UTC (rev 21891)
@@ -2,6 +2,7 @@
bool "rpm"
default n
select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_BEECRYPT
select BR2_PACKAGE_NEON
select BR2_PACKAGE_POPT
Modified: trunk/buildroot/package/rpm/rpm.mk
===================================================================
--- trunk/buildroot/package/rpm/rpm.mk 2008-04-29 04:40:15 UTC (rev 21890)
+++ trunk/buildroot/package/rpm/rpm.mk 2008-04-29 05:04:14 UTC (rev 21891)
@@ -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 @@
--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))
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/rpm
@ 2008-12-31 18:12 nkukard at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: nkukard at uclibc.org @ 2008-12-31 18:12 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-12-31 18:12:22 +0000 (Wed, 31 Dec 2008)
New Revision: 24628
Log:
* Bump rpm to 5.1.6
- Remove patches comitted upstream
- Exclude tools we don't need
- Fix bundled magic mime data
Added:
trunk/buildroot/package/rpm/rpm-5.1.6_exclude-some-tools.patch
trunk/buildroot/package/rpm/rpm-5.1.6_magic-file-fix.patch
Removed:
trunk/buildroot/package/rpm/rpm-dirty-ssl-hack.patch
trunk/buildroot/package/rpm/rpm-uclibc-ifdefs.patch
trunk/buildroot/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch
Modified:
trunk/buildroot/package/rpm/rpm.mk
Changeset:
Added: trunk/buildroot/package/rpm/rpm-5.1.6_exclude-some-tools.patch
===================================================================
--- trunk/buildroot/package/rpm/rpm-5.1.6_exclude-some-tools.patch (rev 0)
+++ trunk/buildroot/package/rpm/rpm-5.1.6_exclude-some-tools.patch 2008-12-31 18:12:22 UTC (rev 24628)
@@ -0,0 +1,12 @@
+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@
Property changes on: trunk/buildroot/package/rpm/rpm-5.1.6_exclude-some-tools.patch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/buildroot/package/rpm/rpm-5.1.6_magic-file-fix.patch
===================================================================
--- trunk/buildroot/package/rpm/rpm-5.1.6_magic-file-fix.patch (rev 0)
+++ trunk/buildroot/package/rpm/rpm-5.1.6_magic-file-fix.patch 2008-12-31 18:12:22 UTC (rev 24628)
@@ -0,0 +1,40 @@
+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,
Property changes on: trunk/buildroot/package/rpm/rpm-5.1.6_magic-file-fix.patch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/buildroot/package/rpm/rpm-dirty-ssl-hack.patch
===================================================================
--- trunk/buildroot/package/rpm/rpm-dirty-ssl-hack.patch 2008-12-31 18:09:13 UTC (rev 24627)
+++ trunk/buildroot/package/rpm/rpm-dirty-ssl-hack.patch 2008-12-31 18:12:22 UTC (rev 24628)
@@ -1,12 +0,0 @@
-diff -ru rpm-5.0.3_vanilla/rpmio/rpmdav.c rpm-5.0.3_dirty-ssl-hack/rpmio/rpmdav.c
---- rpm-5.0.3_vanilla/rpmio/rpmdav.c 2008-01-29 13:57:50.000000000 +0000
-+++ rpm-5.0.3_dirty-ssl-hack/rpmio/rpmdav.c 2008-04-09 17:06:39.000000000 +0000
-@@ -84,7 +84,7 @@
- /* =============================================================== */
- void davDestroy(void)
- {
--#ifdef NE_FEATURE_SSL
-+#if 0
- if (ne_has_support(NE_FEATURE_SSL)) {
- /* XXX http://www.nabble.com/Memory-Leaks-in-SSL_Library_init()-t3431875.html */
- ENGINE_cleanup();
Deleted: trunk/buildroot/package/rpm/rpm-uclibc-ifdefs.patch
===================================================================
--- trunk/buildroot/package/rpm/rpm-uclibc-ifdefs.patch 2008-12-31 18:09:13 UTC (rev 24627)
+++ trunk/buildroot/package/rpm/rpm-uclibc-ifdefs.patch 2008-12-31 18:12:22 UTC (rev 24628)
@@ -1,13 +0,0 @@
-diff -ur rpm-4.4.9_vanilla/rpmio/fts.c rpm-4.4.9_uclibc-ifdefs/rpmio/fts.c
---- rpm-4.4.9_vanilla/rpmio/fts.c 2007-01-21 15:18:00.000000000 +0000
-+++ rpm-4.4.9_uclibc-ifdefs/rpmio/fts.c 2008-03-22 13:26:40.000000000 +0000
-@@ -45,6 +47,9 @@
- #include <string.h>
- #include <unistd.h>
- #else
-+#if defined(__UCLIBC__)
-+# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
-+#endif
- #if defined(hpux) || defined(__hpux)
- # define _INCLUDE_POSIX_SOURCE
- # define __errno_location() (&errno)
Deleted: trunk/buildroot/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch
===================================================================
--- trunk/buildroot/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch 2008-12-31 18:09:13 UTC (rev 24627)
+++ trunk/buildroot/package/rpm/rpm-uclibc-vs-cookie-seek-pointer.patch 2008-12-31 18:12:22 UTC (rev 24628)
@@ -1,12 +0,0 @@
-diff -ru rpm-4.4.9_vanilla/rpmio/rpmio.h rpm-4.4.9_uclibc-vs-cookie-seek-pointer/rpmio/rpmio.h
---- rpm-4.4.9_vanilla/rpmio/rpmio.h 2007-04-28 15:55:33.000000000 +0000
-+++ rpm-4.4.9_uclibc-vs-cookie-seek-pointer/rpmio/rpmio.h 2008-03-22 07:28:07.000000000 +0000
-@@ -31,7 +31,7 @@
- * typedefs to isolate the lossage.
- */
- /*@{*/
--#if !defined(__LCLINT__) && defined(__GLIBC__) && \
-+#if !defined(__LCLINT__) && defined(__GLIBC__) && !defined(__UCLIBC__) && \
- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
- #define USE_COOKIE_SEEK_POINTER 1
- typedef _IO_off64_t _libio_off_t;
Modified: trunk/buildroot/package/rpm/rpm.mk
===================================================================
--- trunk/buildroot/package/rpm/rpm.mk 2008-12-31 18:09:13 UTC (rev 24627)
+++ trunk/buildroot/package/rpm/rpm.mk 2008-12-31 18:12:22 UTC (rev 24628)
@@ -3,9 +3,10 @@
# rpm
#
#############################################################
-RPM_VERSION = 5.1.1
+RPM_VERSION = 5.1.6
RPM_SITE = http://rpm5.org/files/rpm/rpm-5.1/
RPM_AUTORECONF = YES
+RPM_LIBTOOL_PATCH = NO
RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/rpm
@ 2008-12-31 18:27 nkukard at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: nkukard at uclibc.org @ 2008-12-31 18:27 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-12-31 18:27:31 +0000 (Wed, 31 Dec 2008)
New Revision: 24631
Log:
* Select zlib support in neon for rpm
Modified:
trunk/buildroot/package/rpm/Config.in
Changeset:
Modified: trunk/buildroot/package/rpm/Config.in
===================================================================
--- trunk/buildroot/package/rpm/Config.in 2008-12-31 18:25:23 UTC (rev 24630)
+++ trunk/buildroot/package/rpm/Config.in 2008-12-31 18:27:31 UTC (rev 24631)
@@ -3,8 +3,9 @@
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_BEECRYPT
+ select BR2_PACKAGE_POPT
select BR2_PACKAGE_NEON
- select BR2_PACKAGE_POPT
+ select BR2_PACKAGE_NEON_ZLIB
select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
help
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-12-31 18:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-15 8:25 [Buildroot] svn commit: trunk/buildroot/package/rpm nkukard at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-04-27 9:51 nkukard at uclibc.org
2008-04-29 5:04 nkukard at uclibc.org
2008-12-31 18:12 nkukard at uclibc.org
2008-12-31 18:27 nkukard at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox