From 69d4f160583e764448f359d2aced62345be3e387 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 17 Jun 2010 12:02:13 +0200 Subject: fakeroot(-native): convert to new style staging Staging looks really weird, but it matches the way it was. --- recipes/fakeroot/fakeroot-native_1.12.4.bb | 4 +--- recipes/fakeroot/fakeroot_1.12.4.bb | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes/fakeroot/fakeroot-native_1.12.4.bb b/recipes/fakeroot/fakeroot-native_1.12.4.bb index 2279094224..e6add2bb26 100644 --- a/recipes/fakeroot/fakeroot-native_1.12.4.bb +++ b/recipes/fakeroot/fakeroot-native_1.12.4.bb @@ -13,9 +13,7 @@ python () { bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) } -do_stage_append () { - oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ -} +NATIVE_INSTALL_WORKS = "1" RDEPENDS_${PN} = "util-linux-native" diff --git a/recipes/fakeroot/fakeroot_1.12.4.bb b/recipes/fakeroot/fakeroot_1.12.4.bb index 19a493cc2c..c265749f64 100644 --- a/recipes/fakeroot/fakeroot_1.12.4.bb +++ b/recipes/fakeroot/fakeroot_1.12.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Gives a fake root environment" HOMEPAGE = "http://fakeroot.alioth.debian.org" SECTION = "base" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "\ ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ @@ -11,10 +11,11 @@ SRC_URI = "\ inherit autotools -do_stage() { - install -d ${STAGING_INCDIR}/fakeroot - install -m 644 *.h ${STAGING_INCDIR}/fakeroot - autotools_stage_all +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 -- cgit v1.2.3