diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:18:52 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:10:35 +0100 |
commit | b2381b63b94604fdc0e1a7591c854dc1df3ca8f4 (patch) | |
tree | 27dcac6f2750215e7395868fdd84aedadebc4e0b /meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | |
parent | 99822cd4a01342565f803678baba49d74192b7d1 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-autogen.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch index 5fe6ded811..5129833381 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 | ||
7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
8 | 8 | ||
9 | diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh | 9 | Index: 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 | ||
25 | diff -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)" | ||
41 | diff -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 | ||