From 9eaa9ed38a197be76317cd3e42f54d1808c3e971 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 2 Jun 2011 17:15:26 -0500 Subject: pseudo: Update pseudo to 1.1.1 version Update both the core and pseudo_git packages to the latest 1.1.1 verison. This fixes an issues where the call system() was not wrapped. This could lead to issues where certain spawned commands broke out of a pseudo-chroot and created files in the wrong place. Also the update the 1.0 -> 1.1.1 adds additional capabilities such as beginning support for MacOS X. Signed-off-by: Mark Hatle --- meta/recipes-devtools/pseudo/pseudo.inc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/pseudo/pseudo.inc') diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index a458dcce69..0416a53d7d 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc @@ -1,3 +1,7 @@ +# Note: Due to the bitbake wrapper script, making changes to pseudo can be +# difficult. To work around the current version of the wrapper use: +# BBFETCH2=True PSEUDO_BUILD=1 ../bitbake/bin/bitbake pseudo-native [-c CMD] + DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" @@ -18,8 +22,12 @@ NO32LIBS ??= "0" # Compile for the local machine arch... do_compile () { - ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} - oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' + if [ "${SITEINFO_BITS}" == "64" ]; then + ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} + else + ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} + fi + oe_runmake } # Two below are the same @@ -28,8 +36,8 @@ do_compile () { do_compile_prepend_virtclass-native () { if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then # We need the 32-bit libpseudo on a 64-bit machine... - ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 - oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo + ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 + oe_runmake libpseudo # prevent it from removing the lib, but remove everything else make 'LIB=foo' distclean fi @@ -38,8 +46,8 @@ do_compile_prepend_virtclass-native () { do_compile_prepend_virtclass-nativesdk () { if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then # We need the 32-bit libpseudo on a 64-bit machine... - ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 - oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo + ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 + oe_runmake libpseudo # prevent it from removing the lib, but remove everything else make 'LIB=foo' distclean fi -- cgit v1.2.3