From 1dd0539d7e66dbcdbf2979c6304c7087a7e77d53 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 1 Dec 2012 09:38:37 +0000 Subject: [PATCH] fakeroot: update to upstream version 1.18.4 License is now GPLv3 (From meta-openembedded rev: faa67b1e9d3e713338321cdd2c4b5c10ce2599e9) Signed-off-by: Marko Lindqvist Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- ...-native_1.12.4.bb => fakeroot-native_1.18.4.bb} | 4 ---- .../fakeroot/fakeroot/configure-libtool.patch | 20 ---------------- .../fakeroot/fakeroot/fix-prefix.patch | 15 ------------ .../recipes-core/fakeroot/fakeroot_1.12.4.bb | 27 --------------------- .../recipes-core/fakeroot/fakeroot_1.18.4.bb | 28 ++++++++++++++++++++++ 5 files changed, 28 insertions(+), 66 deletions(-) rename meta-openembedded/meta-oe/recipes-core/fakeroot/{fakeroot-native_1.12.4.bb => fakeroot-native_1.18.4.bb} (67%) delete mode 100644 meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb diff --git a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb similarity index 67% rename from meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb rename to meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb index 1e9f15a..a27a60b 100644 --- a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb @@ -1,6 +1,5 @@ require fakeroot_${PV}.bb -SRC_URI += "file://fix-prefix.patch" S = "${WORKDIR}/fakeroot-${PV}" inherit native @@ -14,6 +13,3 @@ python () { } RDEPENDS_${PN} = "util-linux-native" - -SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70" -SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d" diff --git a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch deleted file mode 100644 index 46f7df7..0000000 --- a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: fakeroot-1.12.1/configure.ac -=================================================================== ---- fakeroot-1.12.1.orig/configure.ac -+++ fakeroot-1.12.1/configure.ac -@@ -2,14 +2,12 @@ - AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot]) - AC_PREREQ(2.61) - AC_CONFIG_MACRO_DIR([build-aux]) --LT_PREREQ(2.1a) - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE - AC_CONFIG_HEADERS([config.h]) - AC_PROG_MAKE_SET --LT_INIT --LT_LANG(C) -+AC_PROG_LIBTOOL - - AH_BOTTOM([#if ! HAVE_BUILTIN_EXPECT - #define __builtin_expect(x, expected_value) (x) diff --git a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch deleted file mode 100644 index 3c47bd7..0000000 --- a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: fakeroot-1.12.1/scripts/fakeroot.in -=================================================================== ---- fakeroot-1.12.1.orig/scripts/fakeroot.in -+++ fakeroot-1.12.1/scripts/fakeroot.in -@@ -30,8 +30,8 @@ - } - - # strip /bin/fakeroot to find install prefix --PREFIX=@prefix@ --BINDIR=@bindir@ -+BINDIR=`dirname $0` -+PREFIX=`dirname ${BINDIR}` - - USEABSLIBPATH=@LDPRELOADABS@ - LIB=lib@fakeroot_transformed@@DLSUFFIX@ diff --git a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb deleted file mode 100644 index 1cc5602..0000000 --- a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Gives a fake root environment" -HOMEPAGE = "http://fakeroot.alioth.debian.org" -SECTION = "base" -LICENSE = "GPL" -LIC_FILES_CHKSUM = "file://COPYING;md5=7686b00e9859a1a04043d33452bae823" -PR = "r2" - -SRC_URI = "\ - ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ - file://configure-libtool.patch \ -" - -inherit autotools - -do_install_append() { - install -d ${D}${includedir}/fakeroot - install -m 644 *.h ${D}${includedir}/fakeroot - install -d ${D}${libdir}/libfakeroot/ - oe_libinstall -so libfakeroot ${D}${libdir}/libfakeroot/ -} - -# fakeroot needs getopt which is provided by the util-linux package -RDEPENDS_${PN} = "util-linux" - - -SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70" -SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d" diff --git a/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb new file mode 100644 index 0000000..a277a69 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Gives a fake root environment" +HOMEPAGE = "http://fakeroot.alioth.debian.org" +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" +PR = "r0" + +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ +" + +inherit autotools + +do_configure_prepend() { + mkdir -p ${S}/build-aux +} + +do_install_append() { + install -d ${D}${includedir}/fakeroot + install -m 644 *.h ${D}${includedir}/fakeroot +} + +# fakeroot needs getopt which is provided by the util-linux package +RDEPENDS_${PN} = "util-linux" + + +SRC_URI[md5sum] = "706171d8d520b1ca1576ac73f2ceb4f3" +SRC_URI[sha256sum] = "0a359efa3e9496c33234b3e9c89306a09bb4da9d33de43c261f1d8447e6ebea2" -- 2.7.4