From 0fb111b7eaf8e32940ab65f67bb821904af2da36 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Dec 2010 20:35:00 +0000 Subject: fakeroot/fakechroot: These have been replaced by pseudo, move to meta-extras Signed-off-by: Richard Purdie --- .../fakechroot/fakechroot_2.13.1.bb | 17 -------- .../fakeroot/fakeroot-1.14.5/absolutepaths.patch | 47 ---------------------- meta/recipes-devtools/fakeroot/fakeroot_1.14.5.bb | 38 ----------------- 3 files changed, 102 deletions(-) delete mode 100644 meta/recipes-devtools/fakechroot/fakechroot_2.13.1.bb delete mode 100644 meta/recipes-devtools/fakeroot/fakeroot-1.14.5/absolutepaths.patch delete mode 100644 meta/recipes-devtools/fakeroot/fakeroot_1.14.5.bb diff --git a/meta/recipes-devtools/fakechroot/fakechroot_2.13.1.bb b/meta/recipes-devtools/fakechroot/fakechroot_2.13.1.bb deleted file mode 100644 index 428bd4f..0000000 --- a/meta/recipes-devtools/fakechroot/fakechroot_2.13.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Gives a fake root environment which can support chroot" -SECTION = "base" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \ - " - -SRC_URI[md5sum] = "280a828869a15059f0681a5d11a5e255" -SRC_URI[md5sum] = "15489437d8602cc393d886f74004ee75af049b1fab42b27331f355650e4e57c8" - -inherit autotools - -PR = "r0" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/fakeroot/fakeroot-1.14.5/absolutepaths.patch b/meta/recipes-devtools/fakeroot/fakeroot-1.14.5/absolutepaths.patch deleted file mode 100644 index ae18e8a..0000000 --- a/meta/recipes-devtools/fakeroot/fakeroot-1.14.5/absolutepaths.patch +++ /dev/null @@ -1,47 +0,0 @@ -Image creation runs under a fakeroot context and calls a script which refers -to the build systems's python. This loads but can find a libpython from staging -if these are incompatible, anything can break. These scripts should *not* be -changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The -dyanmic linker can figure out anything else with rpaths. - -RP - 23/1/10 - -Index: fakeroot-1.9.4/configure.ac -=================================================================== ---- fakeroot-1.9.4.orig/configure.ac 2010-01-23 22:34:39.000000000 +0000 -+++ fakeroot-1.9.4/configure.ac 2010-01-23 22:35:14.000000000 +0000 -@@ -414,6 +414,8 @@ - ;; - esac - -+LDPRELOADABS=1 -+ - AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object]) - AC_SUBST(DLSUFFIX) - AC_SUBST(LDLIBPATHVAR) -Index: fakeroot-1.9.4/scripts/fakeroot.in -=================================================================== ---- fakeroot-1.9.4.orig/scripts/fakeroot.in 2010-01-23 22:34:53.000000000 +0000 -+++ fakeroot-1.9.4/scripts/fakeroot.in 2010-01-23 22:37:17.000000000 +0000 -@@ -135,7 +135,7 @@ - if [ "$WAITINTRAP" -eq 0 ]; then - trap "kill -s @signal@ $PID" EXIT INT - else -- trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT -+ trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT - fi - - if test -z "$FAKEROOTKEY" || test -z "$PID"; then -@@ -158,10 +158,10 @@ - export FAKEROOT_FD_BASE - - if test -z "$*"; then -- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} -+ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} - RESULT=$? - else -- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" -+ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" - RESULT=$? - fi - diff --git a/meta/recipes-devtools/fakeroot/fakeroot_1.14.5.bb b/meta/recipes-devtools/fakeroot/fakeroot_1.14.5.bb deleted file mode 100644 index 2d2604f..0000000 --- a/meta/recipes-devtools/fakeroot/fakeroot_1.14.5.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Provides a fake \"root environment\" by means of LD_PRELOAD and SYSV IPC or TCP trickery" -HOMEPAGE = "http://fakeroot.alioth.debian.org/" -SECTION = "base" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -# fakeroot needs getopt which is provided by the util-linux package -RDEPENDS = "util-linux" -RDEPENDS_virtclass-native = "util-linux-native" -PR = "r0" -PROVIDES += "virtual/fakeroot" - -SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ - file://absolutepaths.patch" - -inherit autotools - -do_configure_prepend() { - # fakeroot's own bootstrap includes other autoreconf stuff we don't need here - # so manually create the aux directory - mkdir -p ${S}/build-aux -} - -do_install_append() { - install -d ${D}${includedir}/fakeroot/ - install -m 644 *.h ${D}${includedir}/fakeroot -} - -# Compatability for the rare systems not using or having SYSV -python () { - if bb.data.inherits_class("native", d) and bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': - bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp ', d) -} - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604" -SRC_URI[sha256sum] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68" -- cgit v1.1