diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-01-15 21:36:23 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-28 17:52:55 +0000 |
commit | f6ddba2a9dc15560f639faaba8233c29c0c37e9d (patch) | |
tree | 568c80749bdfd9c005c769bbb49b18a6b1390cff /meta/recipes-devtools/rpm/rpm | |
parent | a606ad5022e7c0ca34a5bc086254ac8ec16bc8c7 (diff) | |
download | poky-f6ddba2a9dc15560f639faaba8233c29c0c37e9d.tar.gz |
rpm: Uprev to RPM 5.4.0
Update RPM to the latest release, RPM 5.4.0.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | 54 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 18 | ||||
-rwxr-xr-x | meta/recipes-devtools/rpm/rpm/rpm2cpio | 51 |
3 files changed, 123 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch new file mode 100644 index 0000000000..323bb7151e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Remove the sanity checking from the rpm autogen.sh. This is required because | ||
2 | we may have slightly different, but yet compatible versions. If we do end | ||
3 | up breaking things, we'll deal with it at that time. | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh | ||
8 | --- rpm-5.4.0.orig/autogen.sh 2010-11-02 11:55:53.000000000 -0500 | ||
9 | +++ rpm-5.4.0/autogen.sh 2011-01-06 00:15:05.158946295 -0600 | ||
10 | @@ -34,12 +34,6 @@ | ||
11 | eval $_libtoolize $_libtoolize_args | ||
12 | } | ||
13 | |||
14 | -# requirements sanity check | ||
15 | -[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 | ||
16 | -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 | ||
17 | -[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 | ||
18 | -[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 | ||
19 | - | ||
20 | for dir in bash beecrypt file neon pcre popt rc syck xar xz; do | ||
21 | |||
22 | if [ -d $dir ]; then | ||
23 | diff -ur rpm-5.4.0.orig/neon/autogen.sh rpm-5.4.0/neon/autogen.sh | ||
24 | --- rpm-5.4.0.orig/neon/autogen.sh 2010-10-30 19:11:33.000000000 -0500 | ||
25 | +++ rpm-5.4.0/neon/autogen.sh 2011-01-06 00:15:17.863962139 -0600 | ||
26 | @@ -34,12 +34,6 @@ | ||
27 | eval $_libtoolize $_libtoolize_args | ||
28 | } | ||
29 | |||
30 | -# requirements sanity check | ||
31 | -[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 | ||
32 | -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 | ||
33 | -[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 | ||
34 | -[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 | ||
35 | - | ||
36 | echo "---> generate files via GNU libtool (libtoolize)" | ||
37 | libtoolize --quiet --copy --force --install | ||
38 | echo "---> generate files via GNU autoconf (aclocal, autoheader)" | ||
39 | diff -ur rpm-5.4.0.orig/syck/autogen.sh rpm-5.4.0/syck/autogen.sh | ||
40 | --- rpm-5.4.0.orig/syck/autogen.sh 2010-11-02 11:55:56.000000000 -0500 | ||
41 | +++ rpm-5.4.0/syck/autogen.sh 2011-01-06 00:15:27.103949601 -0600 | ||
42 | @@ -34,12 +34,6 @@ | ||
43 | eval $_libtoolize $_libtoolize_args | ||
44 | } | ||
45 | |||
46 | -# requirements sanity check | ||
47 | -[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 | ||
48 | -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 | ||
49 | -[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 | ||
50 | -[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 | ||
51 | - | ||
52 | echo "---> generate files via GNU libtool (libtoolize)" | ||
53 | libtoolize --quiet --copy --force --install | ||
54 | echo "---> generate files via GNU autoconf (aclocal, autoheader)" | ||
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch new file mode 100644 index 0000000000..829399c95e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | During installation, the libtool relink attempts to link to -lrpm... | ||
2 | The problem is that it hasn't been installed yet! So small change causes | ||
3 | the libtool to instead use the build version. | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | --- rpm-5.4.0/lib/Makefile.am.orig | ||
8 | +++ rpm-5.4.0/lib/Makefile.am | ||
9 | @@ -90,6 +90,9 @@ | ||
10 | libsql_la_SOURCES = libsql.c | ||
11 | libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON) | ||
12 | |||
13 | +# pkglib libraries needs to have usrlib libraries already installed! | ||
14 | +install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES | ||
15 | + | ||
16 | install-data-hook: | ||
17 | if !ENABLE_BUILD_LAFILES | ||
18 | -for l in $(usrlib_LTLIBRARIES); do \ | ||
diff --git a/meta/recipes-devtools/rpm/rpm/rpm2cpio b/meta/recipes-devtools/rpm/rpm/rpm2cpio new file mode 100755 index 0000000000..00c4ec549e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm2cpio | |||
@@ -0,0 +1,51 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pkg=$1 | ||
4 | if [ "$pkg" = "" -o ! -e "$pkg" ]; then | ||
5 | echo "no package supplied" 1>&2 | ||
6 | exit 1 | ||
7 | fi | ||
8 | |||
9 | leadsize=96 | ||
10 | o=`expr $leadsize + 8` | ||
11 | set `od -j $o -N 8 -t u1 $pkg` | ||
12 | il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5` | ||
13 | dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9` | ||
14 | # echo "sig il: $il dl: $dl" | ||
15 | |||
16 | sigsize=`expr 8 + 16 \* $il + $dl` | ||
17 | o=`expr $o + $sigsize + \( 8 - \( $sigsize \% 8 \) \) \% 8 + 8` | ||
18 | set `od -j $o -N 8 -t u1 $pkg` | ||
19 | il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5` | ||
20 | dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9` | ||
21 | # echo "hdr il: $il dl: $dl" | ||
22 | |||
23 | hdrsize=`expr 8 + 16 \* $il + $dl` | ||
24 | o=`expr $o + $hdrsize` | ||
25 | EXTRACTOR="dd if=$pkg ibs=$o skip=1" | ||
26 | |||
27 | COMPRESSION=`($EXTRACTOR |file -) 2>/dev/null` | ||
28 | if echo $COMPRESSION |grep -q gzip; then | ||
29 | DECOMPRESSOR=gunzip | ||
30 | elif echo $COMPRESSION |grep -q bzip2; then | ||
31 | DECOMPRESSOR=bunzip2 | ||
32 | elif echo $COMPRESSION |grep -q xz; then | ||
33 | DECOMPRESSOR=unxz | ||
34 | elif echo $COMPRESSION |grep -q cpio; then | ||
35 | DECOMPRESSOR=cat | ||
36 | else | ||
37 | # Most versions of file don't support LZMA, therefore we assume | ||
38 | # anything not detected is LZMA | ||
39 | DECOMPRESSOR=`which unlzma 2>/dev/null` | ||
40 | case "$DECOMPRESSOR" in | ||
41 | /* ) ;; | ||
42 | * ) DECOMPRESSOR=`which lzmash 2>/dev/null` | ||
43 | case "$DECOMPRESSOR" in | ||
44 | /* ) DECOMPRESSOR="lzmash -d -c" ;; | ||
45 | * ) DECOMPRESSOR=cat ;; | ||
46 | esac | ||
47 | ;; | ||
48 | esac | ||
49 | fi | ||
50 | |||
51 | $EXTRACTOR 2>/dev/null | $DECOMPRESSOR | ||