summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-11 18:18:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 10:10:35 (GMT)
commitb2381b63b94604fdc0e1a7591c854dc1df3ca8f4 (patch)
tree27dcac6f2750215e7395868fdd84aedadebc4e0b
parent99822cd4a01342565f803678baba49d74192b7d1 (diff)
downloadpoky-b2381b63b94604fdc0e1a7591c854dc1df3ca8f4.tar.gz
rpm: Upgrade RPM to 5.4.8 (db to 5.3.15)
RPM 5.4.8 requires db 5.3.x, so both are upgraded together. (From OE-Core rev: c5898ef3fc3820ff9c44bc5b1b16e5def64aa877) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_rpm.bbclass22
-rw-r--r--meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch54
-rw-r--r--meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch35
-rw-r--r--meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch443
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch22
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-autogen.patch41
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch16
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch12
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-macros.patch61
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch43
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch36
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.8.bb (renamed from meta/recipes-devtools/rpm/rpm_5.4.0.bb)45
-rw-r--r--meta/recipes-support/db/db_5.3.15.bb (renamed from meta/recipes-support/db/db_5.1.19.bb)8
13 files changed, 168 insertions, 670 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index fbc46c0..eafb34b 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -66,24 +66,26 @@ fakeroot rootfs_rpm_do_rootfs () {
66 touch ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log/log.0000000001 66 touch ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log/log.0000000001
67 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF 67 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF
68# ================ Environment 68# ================ Environment
69set_data_dir . 69set_data_dir .
70set_create_dir . 70set_create_dir .
71set_lg_dir ./log 71set_lg_dir ./log
72set_tmp_dir ./tmp 72set_tmp_dir ./tmp
73set_flags db_log_autoremove on
73 74
74# -- thread_count must be >= 8 75# -- thread_count must be >= 8
75set_thread_count 64 76set_thread_count 64
76 77
77# ================ Logging 78# ================ Logging
78 79
79# ================ Memory Pool 80# ================ Memory Pool
80set_mp_mmapsize 268435456 81set_cachesize 0 1048576 0
82set_mp_mmapsize 268435456
81 83
82# ================ Locking 84# ================ Locking
83set_lk_max_locks 16384 85set_lk_max_locks 16384
84set_lk_max_lockers 16384 86set_lk_max_lockers 16384
85set_lk_max_objects 16384 87set_lk_max_objects 16384
86mutex_set_max 163840 88mutex_set_max 163840
87 89
88# ================ Replication 90# ================ Replication
89EOF 91EOF
diff --git a/meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch b/meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch
deleted file mode 100644
index bb0f7eb..0000000
--- a/meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Upstream-Status: Pending
2
3automake version 1.11.2 has made use of dir variables more strict.
4the use of pkglibdir with SCRIPTS & DATA vars results in automake
5errors.
6 This commits uses pkgdatadir & pkgbindir vars instead of pkglibdir
7to avoid the strict check errors.
8
9 This change also works with automake-1.11.1
10
11Errors fixed:
12Makefile.am:103: error: `pkglibdir' is not a legitimate directory for `DATA'
13scripts/Makefile.am:47: error: `pkglibdir' is not a legitimate directory for `SCRIPTS'
14
15Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
162011/12/27
17
18Index: rpm-5.4.0/Makefile.am
19===================================================================
20--- rpm-5.4.0.orig/Makefile.am
21+++ rpm-5.4.0/Makefile.am
22@@ -103,13 +103,13 @@ if WITH_PATH_VERSIONED
23 done
24 endif
25
26-pkglibdir = @USRLIBRPM@
27-pkglib_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
28+pkgdatadir = @USRLIBRPM@
29+pkgdata_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
30
31-pkgbindir = $(pkglibdir)/bin
32+pkgbindir = $(pkgdatadir)/bin
33 pkgbin_SCRIPTS = install-sh mkinstalldirs
34
35-pkgcfgdir = $(pkglibdir)/macros.d
36+pkgcfgdir = $(pkgdatadir)/macros.d
37 pkgcfg_DATA = \
38 macros/cmake macros/java macros/libtool macros/mandriva macros/mono \
39 macros/perl macros/pkgconfig macros/php macros/python macros/ruby \
40Index: rpm-5.4.0/scripts/Makefile.am
41===================================================================
42--- rpm-5.4.0.orig/scripts/Makefile.am
43+++ rpm-5.4.0/scripts/Makefile.am
44@@ -45,8 +45,8 @@ all:
45
46 bin_SCRIPTS = gendiff
47
48-pkglibdir = @USRLIBRPM@
49-pkglib_SCRIPTS = \
50+pkgbindir = @USRLIBRPM@
51+pkgbin_SCRIPTS = \
52 brp-compress brp-python-bytecompile brp-java-gcjcompile \
53 brp-strip brp-strip-comment-note brp-nobuildrootpath \
54 brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
diff --git a/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch b/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
deleted file mode 100644
index 87a92eb..0000000
--- a/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Submitted
2
3From: Qing He <qing.he@intel.com>
4Subject: [PATCH] rpm 5.4.0: Fix pointer mishandling
5
6In fpLookupSubdir, data returned by hash should be of type
7"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
8segfault.
9
10Signed-off-by: Qing He <qing.he@intel.com>
11
12diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c
13index 0e76148..82b8f45 100644
14--- a/rpmdb/fprint.c
15+++ b/rpmdb/fprint.c
16@@ -333,7 +333,7 @@ restart:
17 *te = '\0';
18
19 while (te < se) {
20- struct rpmffi_s * recs;
21+ struct rpmffi_s ** recs;
22 int numRecs;
23 int i;
24
25@@ -346,8 +346,8 @@ restart:
26 const char * link;
27 int fx;
28
29- fx = recs[i].fileno;
30- fi = recs[i].p->fi;
31+ fx = recs[i]->fileno;
32+ fi = recs[i]->p->fi;
33 flink = fi->flinks[fx];
34 if (!(flink && *flink != '\0'))
35 continue;
diff --git a/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch b/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
deleted file mode 100644
index 3663692..0000000
--- a/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
+++ /dev/null
@@ -1,443 +0,0 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Index: rpm-5.1.9/configure.ac
5===================================================================
6--- rpm-5.1.9.orig/configure.ac 2009-04-18 17:47:02.000000000 +0100
7+++ rpm-5.1.9/configure.ac 2010-07-06 14:47:28.985462456 +0100
8@@ -643,38 +643,22 @@
9 dnl look for libc features
10 PROVIDES_ERRNO=no
11 AC_MSG_CHECKING(if <netdb.h> defines h_errno)
12-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[printf("%d",h_errno)]])],[PROVIDES_ERRNO=yes],[])
13-AC_MSG_RESULT($PROVIDES_ERRNO)
14-if test $PROVIDES_ERRNO = yes; then
15- AC_DEFINE(HAVE_HERRNO, 1, [ Define as 1 if <netdb.h> defines h_errno])
16-fi
17+AC_DEFINE(HAVE_HERRNO, 1, [ Define as 1 if <netdb.h> defines h_errno])
18
19 dnl If a system doesn't have S_IFSOCK, define it as 0 which will
20 dnl make S_ISSOCK always return false (nice, eh?)
21 AC_MSG_CHECKING(if <sys/stat.h> defines S_IFSOCK)
22-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[printf("%d", S_IFSOCK)]])],[HAS_S_IFSOCK=yes],[HAS_S_IFSOCK=no])
23-AC_MSG_RESULT($HAS_S_IFSOCK)
24-if test $HAS_S_IFSOCK = yes; then
25- AC_DEFINE(HAVE_S_IFSOCK, 1, [Define as 1 if <sys/stat.h> defines S_IFSOCK])
26-fi
27+AC_DEFINE(HAVE_S_IFSOCK, 1, [Define as 1 if <sys/stat.h> defines S_IFSOCK])
28
29 dnl Some Unix's are missing S_ISLNK, S_ISSOCK
30 AC_MSG_CHECKING(if <sys/stat.h> defines S_ISLNK)
31-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[printf("%d", S_ISLNK(0755))]])],[HAS_S_ISLNK=yes],[HAS_S_ISLNK=no])
32-AC_MSG_RESULT($HAS_S_ISLNK)
33-if test $HAS_S_ISLNK = yes; then
34- AC_DEFINE(HAVE_S_ISLNK, 1, [Define as 1 if <sys/stat.h> defines S_ISLNK])
35-fi
36+AC_DEFINE(HAVE_S_ISLNK, 1, [Define as 1 if <sys/stat.h> defines S_ISLNK])
37
38 AC_MSG_CHECKING(if <sys/stat.h> defines S_ISSOCK)
39-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[printf("%d", S_ISSOCK(0755))]])],[HAS_S_ISSOCK=yes],[HAS_S_ISSOCK=no])
40-AC_MSG_RESULT($HAS_S_ISSOCK)
41-if test $HAS_S_ISSOCK = yes; then
42- AC_DEFINE(HAVE_S_ISSOCK, 1, [Define as 1 if <sys/stat.h> defines S_ISSOCK])
43-fi
44+AC_DEFINE(HAVE_S_ISSOCK, 1, [Define as 1 if <sys/stat.h> defines S_ISSOCK])
45
46 AC_MSG_CHECKING(if timezone is defined)
47-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[printf("%ld", timezone)]])],[HAS_TIMEZONE=yes],[HAS_TIMEZONE=no])
48+$HAS_TIMEZONE=yes
49 AC_MSG_RESULT($HAS_TIMEZONE)
50
51 dnl check for missing typedefs
52@@ -726,53 +710,12 @@
53 AC_MSG_RESULT(yes)
54 AC_CHECK_HEADERS([libelf.h gelf.h])
55 if test ".$ac_cv_header_libelf_h" = .no; then
56- dnl # <libelf.h> on Solaris is incompatible with LFS. If we couldn't
57- dnl # include <libelf.h>, see if we can when _FILE_OFFSET_BITS is
58- dnl # set for non-LFS. Same applies for <gelf.h>, since it probably
59- dnl # includes <libelf.h>
60- AC_MSG_CHECKING([if libelf.h conflicts with _LARGEFILE_SOURCE])
61- AC_COMPILE_IFELSE([
62- AC_LANG_PROGRAM([[
63-#undef _LARGEFILE64_SOURCE
64-#undef _LARGEFILE_SOURCE
65-#if !defined(_LP64)
66-# undef _FILE_OFFSET_BITS
67-# define _FILE_OFFSET_BITS 32
68-#endif
69-#include <libelf.h>
70- ]], [[
71- Elf_Data foo;
72- ]])
73- ], [
74- AC_DEFINE(HAVE_LIBELF_H, 1, [Define to 1 if you have libelf.h])
75- ac_cv_header_libelf_h=yes
76- AC_DEFINE(LIBELF_H_LFS_CONFLICT, 1, [Define to 1 if libelf.h is incompatible with LFS API])
77- AC_MSG_RESULT(yes)
78- ], [
79- AC_MSG_RESULT(no)
80- ])
81+ AC_DEFINE(HAVE_LIBELF_H, 1, [Define to 1 if you have libelf.h])
82+ ac_cv_header_libelf_h=yes
83 fi
84 if test ".$ac_cv_header_gelf_h" = .no; then
85- AC_MSG_CHECKING([if gelf.h conflicts with _LARGEFILE_SOURCE])
86- AC_COMPILE_IFELSE([
87- AC_LANG_PROGRAM([[
88-#undef _LARGEFILE64_SOURCE
89-#undef _LARGEFILE_SOURCE
90-#if !defined(_LP64)
91-# undef _FILE_OFFSET_BITS
92-# define _FILE_OFFSET_BITS 32
93-#endif
94-#include <gelf.h>
95- ]], [[
96- Elf32_Verdef foo;
97- ]])
98- ], [
99- AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have gelf.h])
100- ac_cv_header_gelf_h=yes
101- AC_MSG_RESULT(yes)
102- ], [
103- AC_MSG_RESULT(no)
104- ])
105+ AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have gelf.h])
106+ ac_cv_header_gelf_h=yes
107 fi
108 if test ".$ac_cv_header_gelf_h" = .yes; then
109 AC_CHECK_LIB([elf], [elf_version], [
110@@ -854,78 +797,9 @@
111 python_version=""
112 ;;
113 esac
114- for python_ver in $python_version ; do
115- if test "$python_ver" != "2.x" ; then
116- AC_MSG_CHECKING([for Python ${python_ver} API])
117- save_CFLAGS="${CFLAGS}"
118- for i in "$prefix" "/usr/local" "/usr"; do
119- CFLAGS="${save_CFLAGS} -I$i/include/python${python_ver}"
120- AC_RUN_IFELSE([AC_LANG_SOURCE(
121- [[#include "Python.h"
122- main() { exit(strncmp("${python_ver}", PY_VERSION, 3)); } ]])
123- ], [
124- PYTHON_VERSION="${python_ver}"
125- AC_MSG_RESULT(yes)
126- PYTHON_PREFIX="${i}"
127- break
128- ], [
129- ], [
130- dnl if we're cross compiling, assume the user has a clue
131- if test "$withval" = "$python_ver"; then
132- PYTHON_VERSION="${python_ver}"
133- AC_MSG_RESULT(yes)
134- break
135- fi
136- ])
137- done
138- CFLAGS="${save_CFLAGS}"
139- if test ".$PYTHON_VERSION" == "."; then
140- dnl check Mac OS X framework
141- save_CFLAGS="${CFLAGS}"
142- for f in "~" "" "/System" "/Network"; do
143- CFLAGS="${save_CFLAGS} -I$f/Library/Frameworks/Python.framework/Versions/${python_ver}/include/python${python_ver}"
144- AC_RUN_IFELSE([AC_LANG_SOURCE(
145- [[#include "Python.h"
146- main() { exit(strncmp("${python_ver}", PY_VERSION, 3)); } ]])
147- ], [
148- PYTHON_VERSION="${python_ver}"
149- AC_MSG_RESULT([yes (using Python.framework)])
150- PYTHON_PREFIX="$f/Library/Frameworks/Python.framework/Versions/${python_ver}"
151- break
152- ], [
153- ])
154- done
155- CFLAGS="${save_CFLAGS}"
156- fi
157- if test ".$PYTHON_VERSION" == "."; then
158- AC_MSG_RESULT(no)
159- fi
160- else
161- AC_MSG_CHECKING([for Python 2.x API])
162- AC_RUN_IFELSE([AC_LANG_SOURCE(
163- [[#include <python/Python.h>
164- main() { exit(strncmp("2.", PY_VERSION, 2)); } ]])
165- ], [
166- PYTHON_VERSION=""
167- AC_MSG_RESULT(yes)
168- ], [
169- AC_MSG_RESULT(no)
170- ], [
171- dnl if we're cross compiling, assume the user has a clue
172- if test "$withval" = "$python_ver"; then
173- PYTHON_VERSION="${python_ver}"
174- AC_MSG_RESULT(yes)
175- else
176- AC_MSG_RESULT(no)
177- fi
178- ])
179- fi
180- if test ".$PYTHON_VERSION" != "."; then
181- WITH_PYTHON_SUBDIR=python
182- WITH_PYTHON_SUBPACKAGE=1
183- break
184- fi
185- done
186+ PYTHON_VERSION="${python_ver}"
187+ WITH_PYTHON_SUBDIR=python
188+ WITH_PYTHON_SUBPACKAGE=1
189 fi
190 AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
191 [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`(python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()') 2>/dev/null`"])
192@@ -1157,15 +1031,8 @@
193 AC_SUBST(WITH_PCRE_LIBS)
194 else
195 dnl # make sure PCRE POSIX API can be really _USED_ by RPM
196- LIBS_SAVED="$LIBS"
197 LIBS="-lpcreposix $LIBS"
198- AC_LINK_IFELSE([
199- AC_LANG_PROGRAM([#include <pcreposix.h>], [(void)regcomp(0, 0, 0)])
200- ], [
201- AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available])
202- ], [
203- LIBS="$LIBS_SAVED"
204- ])
205+ AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available])
206 fi
207 dnl # enable PCRE native API support for embedded Lua
208 if test ".$WITH_LUA" = .yes; then
209@@ -1234,30 +1101,7 @@
210
211 dnl # figure out what root's primary group is
212 AC_MSG_CHECKING([root's primary group])
213-AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
214-#include <sys/types.h>
215-#include <pwd.h>
216-#include <grp.h>
217-int main()
218-{
219- struct passwd *root = NULL;
220- struct group *roots_group = NULL;
221- FILE * tempfile = NULL;
222- root = getpwuid( (uid_t) 0 );
223- if (root != NULL) {
224- roots_group = getgrgid(root->pw_gid);
225- if (roots_group != NULL) {
226- tempfile = fopen("conftest_rootg", "w");
227- if (tempfile != NULL) {
228- fprintf(tempfile, "%s\n", roots_group->gr_name);
229- fclose(tempfile);
230- exit(0);
231- }
232- }
233- }
234- exit(1);
235-}]])],[ROOT_GROUP=`cat conftest_rootg`; rm -f conftest_rootg],[ROOT_GROUP="root"],[ROOT_GROUP="root"
236-])
237+$ROOT_GROUP="root"
238 AC_MSG_RESULT([$ROOT_GROUP])
239 AC_SUBST(ROOT_GROUP)
240
241Index: rpm-5.1.9/pcre/configure.ac
242===================================================================
243--- rpm-5.1.9.orig/pcre/configure.ac 2009-01-14 20:19:31.000000000 +0000
244+++ rpm-5.1.9/pcre/configure.ac 2010-07-06 14:51:50.769586089 +0100
245@@ -278,34 +278,6 @@
246 # The files below are C++ header files.
247 pcre_have_type_traits="0"
248 pcre_have_bits_type_traits="0"
249-if test "x$enable_cpp" = "xyes" -a -n "$CXX"
250-then
251-AC_LANG_PUSH(C++)
252-
253-# Older versions of pcre defined pcrecpp::no_arg, but in new versions
254-# it's called pcrecpp::RE::no_arg. For backwards ABI compatibility,
255-# we want to make one an alias for the other. Different systems do
256-# this in different ways. Some systems, for instance, can do it via
257-# a linker flag: -alias (for os x 10.5) or -i (for os x <=10.4).
258-OLD_LDFLAGS="$LDFLAGS"
259-for flag in "-alias,__ZN7pcrecpp2RE6no_argE,__ZN7pcrecpp6no_argE" \
260- "-i__ZN7pcrecpp6no_argE:__ZN7pcrecpp2RE6no_argE"; do
261- AC_MSG_CHECKING([for alias support in the linker])
262- LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
263- # We try to run the linker with this new ld flag. If the link fails,
264- # we give up and remove the new flag from LDFLAGS.
265- AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp {
266- class RE { static int no_arg; };
267- int RE::no_arg;
268- }],
269- []),
270- [AC_MSG_RESULT([yes]);
271- EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
272- break;],
273- AC_MSG_RESULT([no]))
274-done
275-LDFLAGS="$OLD_LDFLAGS"
276-
277 # We could be more clever here, given we're doing AC_SUBST with this
278 # (eg set a var to be the name of the include file we want). But we're not
279 # so it's easy to change back to 'regular' autoconf vars if we needed to.
280@@ -316,7 +288,6 @@
281 AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],
282 [pcre_have_type_traits="0"])
283
284-AC_LANG_POP
285 fi
286 # Using AC_SUBST eliminates the need to include config.h in a public .h file
287 AC_SUBST(pcre_have_type_traits)
288Index: rpm-5.1.9/db/dist/configure.ac
289===================================================================
290--- rpm-5.1.9.orig/db/dist/configure.ac 2008-06-15 08:16:21.000000000 +0100
291+++ rpm-5.1.9/db/dist/configure.ac 2010-07-06 15:36:39.262461127 +0100
292@@ -602,24 +602,6 @@
293 aux*) AC_LIBOBJ([getopt]);;
294 esac
295
296-# Linux has a broken O_DIRECT flag, but you can't detect it at configure time.
297-# Linux and SGI require buffer alignment we may not match, otherwise writes
298-# will fail. Default to not using the O_DIRECT flag.
299-if test "$db_cv_o_direct" = "yes"; then
300- AC_CACHE_CHECK([for open/O_DIRECT], db_cv_open_o_direct, [
301- AC_TRY_LINK([
302- #include <sys/types.h>
303- #include <fcntl.h>], [
304- open("a", O_RDONLY | O_DIRECT, 0);
305- ], [db_cv_open_o_direct=yes], [db_cv_open_o_direct=no])])
306- if test \
307- "$db_cv_o_direct" = "yes" -a "$db_cv_open_o_direct" = "yes"; then
308- AC_DEFINE(HAVE_O_DIRECT)
309- AH_TEMPLATE(HAVE_O_DIRECT,
310- [Define to 1 if you have the O_DIRECT flag.])
311- fi
312-fi
313-
314 # Check for largefile support.
315 AC_SYS_LARGEFILE
316
317Index: rpm-5.1.9/xz/configure.ac
318===================================================================
319--- rpm-5.1.9.orig/xz/configure.ac 2009-02-16 17:07:46.000000000 +0000
320+++ rpm-5.1.9/xz/configure.ac 2010-07-06 15:41:22.632467951 +0100
321@@ -457,26 +457,9 @@
322 #endif
323 ])
324
325-# Even if we have byteswap.h, we may lack the specific macros/functions.
326-if test x$ac_cv_header_byteswap_h = xyes ; then
327- m4_foreach([FUNC], [bswap_16,bswap_32,bswap_64], [
328- AC_MSG_CHECKING([if FUNC is available])
329- AC_LINK_IFELSE([AC_LANG_SOURCE([
330-#include <byteswap.h>
331-int
332-main(void)
333-{
334- FUNC[](42);
335- return 0;
336-}
337- ])], [
338- AC_DEFINE(HAVE_[]m4_toupper(FUNC), [1],
339- [Define to 1 if] FUNC [is available.])
340- AC_MSG_RESULT([yes])
341- ], [AC_MSG_RESULT([no])])
342-
343- ])dnl
344-fi
345+AC_DEFINE(HAVE_BSWAP_16, 1)
346+AC_DEFINE(HAVE_BSWAP_32, 1)
347+AC_DEFINE(HAVE_BSWAP_64, 1)
348
349
350 ###############################################################################
351@@ -527,90 +510,16 @@
352 # xz command line tool uses this to automatically limit its memory usage.
353 # - sysconf() gives all the needed info on GNU+Linux and Solaris.
354 # - BSDs use sysctl().
355-AC_MSG_CHECKING([how to detect the amount of physical memory])
356-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
357-#include <unistd.h>
358-int
359-main()
360-{
361- long i;
362- i = sysconf(_SC_PAGESIZE);
363- i = sysconf(_SC_PHYS_PAGES);
364- return 0;
365-}
366-]])], [
367- AC_DEFINE([HAVE_PHYSMEM_SYSCONF], [1],
368+AC_DEFINE([HAVE_PHYSMEM_SYSCONF], [1],
369 [Define to 1 if the amount of physical memory can be detected
370 with sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES).])
371- AC_MSG_RESULT([sysconf])
372-], [
373-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
374-#include <sys/types.h>
375-#ifdef HAVE_SYS_PARAM_H
376-# include <sys/param.h>
377-#endif
378-#include <sys/sysctl.h>
379-int
380-main()
381-{
382- int name[2] = { CTL_HW, HW_PHYSMEM };
383- unsigned long mem;
384- size_t mem_ptr_size = sizeof(mem);
385- sysctl(name, 2, &mem, &mem_ptr_size, NULL, NULL);
386- return 0;
387-}
388-]])], [
389- AC_DEFINE([HAVE_PHYSMEM_SYSCTL], [1],
390- [Define to 1 if the amount of physical memory can be detected
391- with sysctl().])
392- AC_MSG_RESULT([sysctl])
393-], [
394- AC_MSG_RESULT([unknown])
395-])])
396
397 # Check how to find out the number of available CPU cores in the system.
398 # sysconf(_SC_NPROCESSORS_ONLN) works on most systems, except that BSDs
399 # use sysctl().
400-AC_MSG_CHECKING([how to detect the number of available CPU cores])
401-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
402-#include <unistd.h>
403-int
404-main()
405-{
406- long i;
407- i = sysconf(_SC_NPROCESSORS_ONLN);
408- return 0;
409-}
410-]])], [
411- AC_DEFINE([HAVE_NCPU_SYSCONF], [1],
412+AC_DEFINE([HAVE_NCPU_SYSCONF], [1],
413 [Define to 1 if the number of available CPU cores can be
414 detected with sysconf(_SC_NPROCESSORS_ONLN).])
415- AC_MSG_RESULT([sysconf])
416-], [
417-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
418-#include <sys/types.h>
419-#ifdef HAVE_SYS_PARAM_H
420-# include <sys/param.h>
421-#endif
422-#include <sys/sysctl.h>
423-int
424-main()
425-{
426- int name[2] = { CTL_HW, HW_NCPU };
427- int cpus;
428- size_t cpus_size = sizeof(cpus);
429- sysctl(name, 2, &cpus, &cpus_size, NULL, NULL);
430- return 0;
431-}
432-]])], [
433- AC_DEFINE([HAVE_NCPU_SYSCTL], [1],
434- [Define to 1 if the number of available CPU cores can be
435- detected with sysctl().])
436- AC_MSG_RESULT([sysctl])
437-], [
438- AC_MSG_RESULT([unknown])
439-])])
440-
441
442 ###############################################################################
443 # If using GCC, set some additional CFLAGS:
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch b/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
deleted file mode 100644
index 5e93517..0000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Using the version of autoconf in poky results in:
2
3configure.ac:11: error: m4_divert_push: cannot change diversion to `GROW' inside m4_expand
4
5without this patch.
6
7Upstream-Status: Pending
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff -ur rpm-5.1.10.orig/configure.ac rpm-5.1.10/configure.ac
12--- rpm-5.1.10.orig/configure.ac 2010-08-20 17:12:16.000000000 -0500
13+++ rpm-5.1.10/configure.ac 2010-09-03 11:34:44.722097327 -0500
14@@ -8,7 +8,7 @@
15
16 AC_PREREQ(2.60)
17 AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
18-AC_INIT(rpm, [5.1.10], [PACKAGE_BUGREPORT_DEFAULT])
19+AC_INIT(rpm, [5.1.10])
20 PACKAGE_TIMESTAMP="2008" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
21 AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
22
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
index 5fe6ded..5129833 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
@@ -6,42 +6,11 @@ Upstream-Status: Pending
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
9diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh 9Index: rpm-5.4.8/syck/autogen.sh
10--- rpm-5.4.0.orig/autogen.sh 2010-11-02 11:55:53.000000000 -0500 10===================================================================
11+++ rpm-5.4.0/autogen.sh 2011-01-06 00:15:05.158946295 -0600 11--- rpm-5.4.8.orig/syck/autogen.sh
12@@ -34,12 +34,6 @@ 12+++ rpm-5.4.8/syck/autogen.sh
13 eval $_libtoolize $_libtoolize_args 13@@ -34,12 +34,6 @@ libtoolize () {
14 }
15
16-# requirements sanity check
17-[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1
18-[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
19-[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
20-[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
21-
22 for dir in bash beecrypt file neon pcre popt rc syck xar xz; do
23
24 if [ -d $dir ]; then
25diff -ur rpm-5.4.0.orig/neon/autogen.sh rpm-5.4.0/neon/autogen.sh
26--- rpm-5.4.0.orig/neon/autogen.sh 2010-10-30 19:11:33.000000000 -0500
27+++ rpm-5.4.0/neon/autogen.sh 2011-01-06 00:15:17.863962139 -0600
28@@ -34,12 +34,6 @@
29 eval $_libtoolize $_libtoolize_args
30 }
31
32-# requirements sanity check
33-[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1
34-[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
35-[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
36-[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
37-
38 echo "---> generate files via GNU libtool (libtoolize)"
39 libtoolize --quiet --copy --force --install
40 echo "---> generate files via GNU autoconf (aclocal, autoheader)"
41diff -ur rpm-5.4.0.orig/syck/autogen.sh rpm-5.4.0/syck/autogen.sh
42--- rpm-5.4.0.orig/syck/autogen.sh 2010-11-02 11:55:56.000000000 -0500
43+++ rpm-5.4.0/syck/autogen.sh 2011-01-06 00:15:27.103949601 -0600
44@@ -34,12 +34,6 @@
45 eval $_libtoolize $_libtoolize_args 14 eval $_libtoolize $_libtoolize_args
46 } 15 }
47 16
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch b/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
index e063e86..d9b4e33 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
@@ -4,16 +4,16 @@ Change cache size to reduce the usage of disk space from 62MB to 26MB.
4 4
5Signed-off-by: Mei Lei <lei.mei@intel.com> 5Signed-off-by: Mei Lei <lei.mei@intel.com>
6 6
7diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in 7Index: rpm-5.4.8/rpmdb/DB_CONFIG.in
8index e0b4689..b64e3a9 100644 8===================================================================
9--- a/rpmdb/DB_CONFIG.in 9--- rpm-5.4.8.orig/rpmdb/DB_CONFIG.in
10+++ b/rpmdb/DB_CONFIG.in 10+++ rpm-5.4.8/rpmdb/DB_CONFIG.in
11@@ -29,7 +29,7 @@ set_thread_count 64 11@@ -29,7 +29,7 @@ set_thread_count 64
12 12
13 # ================ Memory Pool 13 # ================ Memory Pool
14 #XXX initializing dbenv with set_cachesize has unimplemented prerequsites 14 #XXX initializing dbenv with set_cachesize has unimplemented prerequsites
15-#set_cachesize 0 1048576 0 15-#set_cachesize 0 1048576 0
16+set_cachesize 0 1048576 0 16+set_cachesize 0 1048576 0
17 set_mp_mmapsize 268435456 17 set_mp_mmapsize 268435456
18 18
19 # ================ Locking 19 # ================ Locking
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
index babafb3..4f484c4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
@@ -5,11 +5,11 @@ diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in
5index 8b94c94..e0b4689 100644 5index 8b94c94..e0b4689 100644
6--- a/rpmdb/DB_CONFIG.in 6--- a/rpmdb/DB_CONFIG.in
7+++ b/rpmdb/DB_CONFIG.in 7+++ b/rpmdb/DB_CONFIG.in
8@@ -4,6 +4,7 @@ set_data_dir . 8@@ -4,6 +4,7 @@
9 set_create_dir . 9 set_create_dir .
10 set_lg_dir ./log 10 set_lg_dir ./log
11 set_tmp_dir ./tmp 11 set_tmp_dir ./tmp
12+set_flags db_log_autoremove on 12+set_flags db_log_autoremove on
13 13
14 # -- thread_count must be >= 8 14 # -- thread_count must be >= 8
15 set_thread_count 64 15 set_thread_count 64
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
new file mode 100644
index 0000000..f25656a
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
@@ -0,0 +1,61 @@
1macros/macros.in: Revert settings to the same as RPM 5.4.0
2
3Enable a reasonable set of rpmdeps dependency helper macros. These sets
4were used by RPM 5.4.0.
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
9--- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500
10+++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500
11@@ -985,7 +985,7 @@
12
13 #==============================================================================
14 # ---- rpmbuild macros.
15-#%%{load:%{_usrlibrpm}/macros.rpmbuild}
16+%{load:%{_usrlibrpm}/macros.rpmbuild}
17
18 #------------------------------------------------------------------------
19 # cmake(...) configuration
20@@ -997,15 +997,15 @@
21
22 #------------------------------------------------------------------------
23 # perl(...) configuration
24-#%%{load:%{_usrlibrpm}/macros.d/perl}
25+%{load:%{_usrlibrpm}/macros.d/perl}
26
27 #------------------------------------------------------------------------
28 # python(...) configuration.
29-#%%{load:%{_usrlibrpm}/macros.d/python}
30+%{load:%{_usrlibrpm}/macros.d/python}
31
32 #------------------------------------------------------------------------
33 # php(...) configuration.
34-#%%{load:%{_usrlibrpm}/macros.d/php}
35+%{load:%{_usrlibrpm}/macros.d/php}
36
37 #------------------------------------------------------------------------
38 # java(...) configuration.
39@@ -1013,11 +1013,11 @@
40
41 #------------------------------------------------------------------------
42 # libtool(...) configuration.
43-#%%{load:%{_usrlibrpm}/macros.d/libtool}
44+%{load:%{_usrlibrpm}/macros.d/libtool}
45
46 #------------------------------------------------------------------------
47 # pkgconfig(...) configuration.
48-#%%{load:%{_usrlibrpm}/macros.d/pkgconfig}
49+%{load:%{_usrlibrpm}/macros.d/pkgconfig}
50
51 #------------------------------------------------------------------------
52 # mono(...) configuration.
53@@ -1029,7 +1029,7 @@
54
55 #------------------------------------------------------------------------
56 # tcl(...) configuration.
57-#%%{load:%{_usrlibrpm}/macros.d/tcl}
58+%{load:%{_usrlibrpm}/macros.d/tcl}
59
60 # \endverbatim
61 #*/
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
new file mode 100644
index 0000000..90fee35
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
@@ -0,0 +1,43 @@
1Disable perl-URPM support
2
3This causes a configure failure when perl-URPM is not used.
4
5| configure.ac:1159: required file `perl-URPM/Makefile.PL.in' not found
6| configure.ac:1159: required file `perl-URPM/Makefile.in' not found
7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9
10--- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500
11+++ rpm-5.4.8/configure.ac 2012-04-24 09:10:35.198731504 -0500
12@@ -1149,30 +1149,10 @@
13 AC_SUBST(WITH_PERL_SUBPACKAGE)
14 AC_SUBST(WITH_PERL_LIBS)
15
16-dnl # optional Perl-URPM language bindings
17+dnl # disable Perl-URPM language bindings
18 WITH_PERL_URPM_SUBDIR=""
19 WITH_PERL_URPM_SUBPACKAGE=0
20 WITH_PERL_URPM_LIBS=""
21-if test ".$WITH_PTHREADS" = .yes; then
22- WITH_PERL_URPM_LIBS="$LIBS"
23-fi
24-AC_ARG_WITH(perl-urpm, AS_HELP_STRING([--with-perl-urpm], [build with Perl URPM language bindings]), [
25- if test ".$withval" != .no; then
26- PERL_URPM_INSTALLDIRS=""
27- if test "$withval" == "vendor"; then
28- PERL_URPM_INSTALLDIRS="'INSTALLDIRS' => 'vendor',"
29- fi
30- if test "$withval" == "site"; then
31- PERL_URPM_INSTALLDIRS="'INSTALLDIRS' => 'site',"
32- fi
33- AC_DEFINE_UNQUOTED([PERL_URPM_INSTALLDIRS], [$PERL_URPM_INSTALLDIRS], [Perl install directory (vendor/site)])
34- AC_SUBST(PERL_URPM_INSTALLDIRS)
35- WITH_PERL_URPM_SUBDIR=perl-URPM
36- WITH_PERL_URPM_SUBPACKAGE=1
37- AC_CONFIG_FILES([perl-URPM/Makefile.PL])
38- AC_CONFIG_FILES([perl-URPM/Makefile])
39- fi
40-])
41 AC_SUBST(WITH_PERL_URPM_SUBDIR)
42 AC_SUBST(WITH_PERL_URPM_SUBPACKAGE)
43 AC_SUBST(WITH_PERL_URPM_LIBS)
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch b/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
deleted file mode 100644
index f6e5828..0000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Backport from RPM 5.4.1 CVS, disabled fsync.
2
3Upstream-Status: Backport
4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6
7diff -ur rpm-5.4.0.orig/CHANGES rpm-5.4.0/CHANGES
8--- rpm-5.4.0.orig/CHANGES 2010-12-29 07:51:38.000000000 -0600
9+++ rpm-5.4.0/CHANGES 2011-02-15 20:54:27.021926840 -0600
10@@ -1,4 +1,5 @@
11 5.4.0 -> 5.4.1:
12+ - jbj: remove fsync(2) after file install, its intolerably slow.
13
14 5.3.7 -> 5.4.0:
15 - jbj: remove markReplacedFiles.
16diff -ur rpm-5.4.0.orig/lib/fsm.c rpm-5.4.0/lib/fsm.c
17--- rpm-5.4.0.orig/lib/fsm.c 2009-12-10 12:52:18.000000000 -0600
18+++ rpm-5.4.0/lib/fsm.c 2011-02-15 20:55:04.372938221 -0600
19@@ -1017,7 +1017,17 @@
20 (void) fsmNext(fsm, IOSM_NOTIFY);
21 }
22
23+#ifdef DYING
24+/* Measurements from installing kernel-source package:
25+ * +fsync
26+ * total: 1 0.000000 MB 640.854524 secs
27+ * +fdatasync
28+ * total: 1 0.000000 MB 419.983200 secs
29+ * w/o fsync/fdsatasync:
30+ * total: 1 0.000000 MB 12.492918 secs
31+ */
32 xx = fsync(Fileno(fsm->wfd));
33+#endif
34
35 if (st->st_size > 0 && (fsm->fdigest || fsm->digest)) {
36 void * digest = NULL;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.8.bb
index 43999e5..ac86ff3 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.8.bb
@@ -42,14 +42,14 @@ HOMEPAGE = "http://rpm5.org/"
42LICENSE = "LGPLv2.1" 42LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" 45DEPENDS = "beecrypt bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
46extrarpmdeps = "python perl file" 46extrarpmdeps = "python perl file"
47extrarpmdeps_virtclass-native = "python-native file-native" 47extrarpmdeps_virtclass-native = "python-native file-native"
48PR = "r38" 48PR = "r39"
49 49
50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
51# in order to extract the distribution SRPM into a format we can extract... 51# in order to extract the distribution SRPM into a format we can extract...
52SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;extract=rpm-5.4.0.tar.gz \ 52SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.8-0.20120401.src.rpm;extract=rpm-5.4.8.tar.gz \
53 file://rpm-log-auto-rm.patch \ 53 file://rpm-log-auto-rm.patch \
54 file://rpm-db-reduce.patch \ 54 file://rpm-db-reduce.patch \
55 file://perfile_rpmdeps.sh \ 55 file://perfile_rpmdeps.sh \
@@ -58,28 +58,22 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
58 file://header-include-fix.patch \ 58 file://header-include-fix.patch \
59 file://rpm-platform.patch \ 59 file://rpm-platform.patch \
60 file://rpm-showrc.patch \ 60 file://rpm-showrc.patch \
61 file://rpm-nofsync.patch \
62 file://rpm-solvedb.patch \ 61 file://rpm-solvedb.patch \
63 file://rpm-tools-mtree-LDFLAGS.patch \ 62 file://rpm-tools-mtree-LDFLAGS.patch \
64 file://fprint-pointer-fix.patch \
65 file://rpm-fileclass.patch \ 63 file://rpm-fileclass.patch \
66 file://rpm-canonarch.patch \ 64 file://rpm-canonarch.patch \
67 file://rpm-no-loopmsg.patch \ 65 file://rpm-no-loopmsg.patch \
68 file://rpm-scriptletexechelper.patch \ 66 file://rpm-scriptletexechelper.patch \
69 file://fix_for_automake_1.11.2.patch \
70 file://pythondeps.sh \ 67 file://pythondeps.sh \
71 file://rpmdeps-oecore.patch \ 68 file://rpmdeps-oecore.patch \
72 file://rpm-resolvedep.patch \ 69 file://rpm-resolvedep.patch \
73 file://rpm-respect-arch.patch \ 70 file://rpm-respect-arch.patch \
74 file://rpm_fix_for_automake-1.12.patch \ 71 file://rpm-no-perl-urpm.patch \
72 file://rpm-macros.patch \
75 " 73 "
76 74
77# file://rpm-autoconf.patch \ 75SRC_URI[md5sum] = "424b60bf2e0a624a218440d943861644"
78# file://remove-compiled-tests.patch;apply=no \ 76SRC_URI[sha256sum] = "56eb5033d4de98c217475fb34d466d551f8912959389e7854a806e2bd9e13380"
79# "
80
81SRC_URI[md5sum] = "19c1a7f68d7765eeb7615c9c4e54e380"
82SRC_URI[sha256sum] = "887e76218308b570c33c8c2fb10b5298b3afd5d602860d281befc85357b3b923"
83 77
84inherit autotools gettext 78inherit autotools gettext
85 79
@@ -106,13 +100,13 @@ WITH_PYTHON = " --with-python=${PYTHON_BASEVERSION} \
106# the perl module creation and installation would need to be patched. 100# the perl module creation and installation would need to be patched.
107# (currently has host perl contamination issues) 101# (currently has host perl contamination issues)
108#WITH_PERL = " --with-perl --without-perlembed" 102#WITH_PERL = " --with-perl --without-perlembed"
109WITH_PERL = " --without-perl" 103WITH_PERL = " --without-perl --without-perl-urpm"
110 104
111WITH_PERL_virtclass-native = " --without-perl" 105WITH_PERL_virtclass-native = " --without-perl --without-perl-urpm"
112 106
113WITH_DB = "--with-db --with-dbsql --without-db-tools-integrated --without-sqlite" 107WITH_DB = "--with-db --with-dbsql --without-db-tools-integrated --without-sqlite"
114 108
115WITH_CRYPTO = "--with-beecrypt=internal --with-openssl --without-nss --without-gcrypt" 109WITH_CRYPTO = "--with-beecrypt --with-openssl --without-nss --without-gcrypt"
116 110
117WITH_KEYUTILS = "--without-keyutils" 111WITH_KEYUTILS = "--without-keyutils"
118WITH_LIBELF = "--with-libelf" 112WITH_LIBELF = "--with-libelf"
@@ -411,6 +405,25 @@ do_install_append() {
411 rm -f ${D}/${libdir}/rpm/dbconvert.sh 405 rm -f ${D}/${libdir}/rpm/dbconvert.sh
412 406
413 rm -f ${D}/${libdir}/rpm/libsqldb.* 407 rm -f ${D}/${libdir}/rpm/libsqldb.*
408
409 # We don't want, nor need the Mandriva multiarch items
410 rm -f ${D}/${bindir}/multiarch-dispatch
411 rm -f ${D}/${bindir}/multiarch-platform
412 rm -f ${D}/${libdir}/rpm/check-multiarch-files
413 rm -f ${D}/${libdir}/rpm/mkmultiarch
414 rm -f ${D}/${includedir}/multiarch-dispatch.h
415
416 rm -f ${D}/${libdir}/rpm/gstreamer.sh
417 rm -f ${D}/${libdir}/rpm/gem_helper.rb
418 rm -f ${D}/${libdir}/rpm/rubygems.rb
419 rm -f ${D}/${libdir}/rpm/kmod-deps.sh
420 rm -f ${D}/${libdir}/rpm/pythoneggs.py
421 rm -f ${D}/${libdir}/rpm/macros.d/kernel
422 rm -f ${D}/${libdir}/rpm/macros.d/gstreamer
423 rm -f ${D}/${libdir}/rpm/bin/mgo
424 rm -f ${D}/${libdir}/rpm/bin/dbconvert
425 rm -f ${D}/${libdir}/rpm/bin/pom2spec
426
414} 427}
415 428
416do_install_append_virtclass-native() { 429do_install_append_virtclass-native() {
diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.3.15.bb
index 7e84646..9d2bbe5 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.3.15.bb
@@ -14,15 +14,15 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
14LICENSE = "Sleepycat" 14LICENSE = "Sleepycat"
15VIRTUAL_NAME ?= "virtual/db" 15VIRTUAL_NAME ?= "virtual/db"
16CONFLICTS = "db3" 16CONFLICTS = "db3"
17PR = "r4" 17PR = "r5"
18 18
19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
20SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.." 20SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
21 21
22SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d" 22SRC_URI[md5sum] = "5493fb5f7cc3915887c836b096f18773"
23SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850" 23SRC_URI[sha256sum] = "4f4f7d548984dde3584fcda0e4f96901cb8bafb08033a7781aec64ef2ea1f579"
24 24
25LIC_FILES_CHKSUM = "file://../LICENSE;md5=86f9294f39f38ef9e89690bcd2320e7a" 25LIC_FILES_CHKSUM = "file://../LICENSE;md5=12cc3ff983ed4ecc6cc091370ee4dbc3"
26 26
27inherit autotools 27inherit autotools
28 28