From 085dc5e99abf98772bfb44f3f25320418d500740 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 May 2011 11:28:09 +0200 Subject: fakeroot: Move from not fetchable 1.14.5 to 1.15.1 Fakeroot 1.14.5 was not fetchable any more. Updating to 1.15.1. Test environment: BB_VERSION = "1.10.2" METADATA_BRANCH = "org.openembedded.dev" TARGET_ARCH = "arm" TARGET_OS = "linux-gnueabi" MACHINE = "mainstone" DISTRO = "minimal" DISTRO_VERSION = "dev-snapshot-20110504" TARGET_FPU = "soft" Signed-off-by: Florian Boor --- recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch | 15 --------------- recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch | 12 ------------ recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch | 15 +++++++++++++++ recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch | 12 ++++++++++++ recipes/fakeroot/fakeroot_1.14.5.bb | 10 ---------- recipes/fakeroot/fakeroot_1.15.1.bb | 10 ++++++++++ 6 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch delete mode 100644 recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch create mode 100644 recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch create mode 100644 recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch delete mode 100644 recipes/fakeroot/fakeroot_1.14.5.bb create mode 100644 recipes/fakeroot/fakeroot_1.15.1.bb diff --git a/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch b/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch deleted file mode 100644 index 72e7528b0e..0000000000 --- a/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -This is not needed, kept just for reference. - ---- fakeroot-1.14.5.orig/scripts/fakeroot.in 2009-11-15 04:09:21.000000000 +0100 -+++ fakeroot-1.14.5/scripts/fakeroot.in 2011-01-12 20:10:02.897300394 +0100 -@@ -30,8 +30,8 @@ fatal () - } - - # strip /bin/fakeroot to find install prefix --FAKEROOT_PREFIX=@prefix@ --FAKEROOT_BINDIR=@bindir@ -+FAKEROOT_BINDIR=`dirname $0` -+FAKEROOT_PREFIX=`dirname ${FAKEROOT_BINDIR}` - - USEABSLIBPATH=@LDPRELOADABS@ - LIB=lib@fakeroot_transformed@@DLSUFFIX@ diff --git a/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch b/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch deleted file mode 100644 index bcb9083998..0000000000 --- a/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -busybox provided getopt prints the help-text on stderr. ---- fakeroot-1.14.5.orig/scripts/fakeroot.in 2009-11-15 04:09:21.000000000 +0100 -+++ fakeroot-1.14.5/scripts/fakeroot.in 2011-01-12 20:11:50.059891996 +0100 -@@ -43,7 +43,7 @@ export FAKED_MODE - - libfound=no - --GETOPTEST=`getopt --version` -+GETOPTEST=`getopt --version 2> /dev/null` - case $GETOPTEST in - getopt*) # GNU getopt - FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"` diff --git a/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch b/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch new file mode 100644 index 0000000000..72e7528b0e --- /dev/null +++ b/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch @@ -0,0 +1,15 @@ +This is not needed, kept just for reference. + +--- fakeroot-1.14.5.orig/scripts/fakeroot.in 2009-11-15 04:09:21.000000000 +0100 ++++ fakeroot-1.14.5/scripts/fakeroot.in 2011-01-12 20:10:02.897300394 +0100 +@@ -30,8 +30,8 @@ fatal () + } + + # strip /bin/fakeroot to find install prefix +-FAKEROOT_PREFIX=@prefix@ +-FAKEROOT_BINDIR=@bindir@ ++FAKEROOT_BINDIR=`dirname $0` ++FAKEROOT_PREFIX=`dirname ${FAKEROOT_BINDIR}` + + USEABSLIBPATH=@LDPRELOADABS@ + LIB=lib@fakeroot_transformed@@DLSUFFIX@ diff --git a/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch b/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch new file mode 100644 index 0000000000..bcb9083998 --- /dev/null +++ b/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch @@ -0,0 +1,12 @@ +busybox provided getopt prints the help-text on stderr. +--- fakeroot-1.14.5.orig/scripts/fakeroot.in 2009-11-15 04:09:21.000000000 +0100 ++++ fakeroot-1.14.5/scripts/fakeroot.in 2011-01-12 20:11:50.059891996 +0100 +@@ -43,7 +43,7 @@ export FAKED_MODE + + libfound=no + +-GETOPTEST=`getopt --version` ++GETOPTEST=`getopt --version 2> /dev/null` + case $GETOPTEST in + getopt*) # GNU getopt + FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"` diff --git a/recipes/fakeroot/fakeroot_1.14.5.bb b/recipes/fakeroot/fakeroot_1.14.5.bb deleted file mode 100644 index ff6844df6b..0000000000 --- a/recipes/fakeroot/fakeroot_1.14.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require fakeroot.inc -PR = "${INC_PR}.0" - -SRC_URI =+ "\ - ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ - file://quiet-getopt-check.patch \ -" - -SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604" -SRC_URI[sha256] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68" diff --git a/recipes/fakeroot/fakeroot_1.15.1.bb b/recipes/fakeroot/fakeroot_1.15.1.bb new file mode 100644 index 0000000000..4c625caeb6 --- /dev/null +++ b/recipes/fakeroot/fakeroot_1.15.1.bb @@ -0,0 +1,10 @@ +require fakeroot.inc +PR = "${INC_PR}.0" + +SRC_URI =+ "\ + ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ + file://quiet-getopt-check.patch \ +" + +SRC_URI[md5sum] = "248c408b1e06e776c5739871b49bd968" +SRC_URI[sha256sum] = "45fbb9ad611f33224cc09954963dde563cc80fe58c76feb25b6e98550b81729a" -- cgit 1.2.3-korg