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:01:51 +0100 |
commit | c5898ef3fc3820ff9c44bc5b1b16e5def64aa877 (patch) | |
tree | a0e0d531604b29fc6932f4fe57c1002ff61f1f37 /meta/recipes-devtools/rpm/rpm/rpm-autogen.patch | |
parent | 0eddc176e73e74d4b1a7d3163d65f619fcd4baf0 (diff) | |
download | openembedded-core-c5898ef3fc3820ff9c44bc5b1b16e5def64aa877.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.
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 Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh ---- rpm-5.4.0.orig/autogen.sh 2010-11-02 11:55:53.000000000 -0500 -+++ rpm-5.4.0/autogen.sh 2011-01-06 00:15:05.158946295 -0600 -@@ -34,12 +34,6 @@ - eval $_libtoolize $_libtoolize_args - } - --# requirements sanity check --[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 --[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 --[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 --[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 -- - for dir in bash beecrypt file neon pcre popt rc syck xar xz; do - - if [ -d $dir ]; then -diff -ur rpm-5.4.0.orig/neon/autogen.sh rpm-5.4.0/neon/autogen.sh ---- rpm-5.4.0.orig/neon/autogen.sh 2010-10-30 19:11:33.000000000 -0500 -+++ rpm-5.4.0/neon/autogen.sh 2011-01-06 00:15:17.863962139 -0600 -@@ -34,12 +34,6 @@ - eval $_libtoolize $_libtoolize_args - } - --# requirements sanity check --[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 --[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 --[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 --[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 -- - echo "---> generate files via GNU libtool (libtoolize)" - libtoolize --quiet --copy --force --install - echo "---> generate files via GNU autoconf (aclocal, autoheader)" -diff -ur rpm-5.4.0.orig/syck/autogen.sh rpm-5.4.0/syck/autogen.sh ---- rpm-5.4.0.orig/syck/autogen.sh 2010-11-02 11:55:56.000000000 -0500 -+++ rpm-5.4.0/syck/autogen.sh 2011-01-06 00:15:27.103949601 -0600 -@@ -34,12 +34,6 @@ +Index: rpm-5.4.8/syck/autogen.sh +=================================================================== +--- rpm-5.4.8.orig/syck/autogen.sh ++++ rpm-5.4.8/syck/autogen.sh +@@ -34,12 +34,6 @@ libtoolize () { eval $_libtoolize $_libtoolize_args } |