summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-06-02 17:15:26 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-09 15:48:27 +0100
commitc647c7a54cf28c2fc76158095920ff6c7bf6adbc (patch)
tree11e2ee136911dd05180b407a5e6a847d50982c61
parenta91d4987faf2282c7383f630707ade7b9799def8 (diff)
downloadpoky-c647c7a54cf28c2fc76158095920ff6c7bf6adbc.tar.gz
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. (From OE-Core rev: 9eaa9ed38a197be76317cd3e42f54d1808c3e971) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc20
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/oe-config.patch58
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.0.bb9
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.1.1.bb10
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb7
5 files changed, 86 insertions, 18 deletions
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 @@
1# Note: Due to the bitbake wrapper script, making changes to pseudo can be
2# difficult. To work around the current version of the wrapper use:
3# BBFETCH2=True PSEUDO_BUILD=1 ../bitbake/bin/bitbake pseudo-native [-c CMD]
4
1DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" 5DESCRIPTION = "Pseudo gives fake root capabilities to a normal user"
2HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/" 6HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/"
3LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" 7LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
@@ -18,8 +22,12 @@ NO32LIBS ??= "0"
18 22
19# Compile for the local machine arch... 23# Compile for the local machine arch...
20do_compile () { 24do_compile () {
21 ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} 25 if [ "${SITEINFO_BITS}" == "64" ]; then
22 oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' 26 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
27 else
28 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
29 fi
30 oe_runmake
23} 31}
24 32
25# Two below are the same 33# Two below are the same
@@ -28,8 +36,8 @@ do_compile () {
28do_compile_prepend_virtclass-native () { 36do_compile_prepend_virtclass-native () {
29 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 37 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
30 # We need the 32-bit libpseudo on a 64-bit machine... 38 # We need the 32-bit libpseudo on a 64-bit machine...
31 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 39 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
32 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo 40 oe_runmake libpseudo
33 # prevent it from removing the lib, but remove everything else 41 # prevent it from removing the lib, but remove everything else
34 make 'LIB=foo' distclean 42 make 'LIB=foo' distclean
35 fi 43 fi
@@ -38,8 +46,8 @@ do_compile_prepend_virtclass-native () {
38do_compile_prepend_virtclass-nativesdk () { 46do_compile_prepend_virtclass-nativesdk () {
39 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 47 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
40 # We need the 32-bit libpseudo on a 64-bit machine... 48 # We need the 32-bit libpseudo on a 64-bit machine...
41 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 49 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
42 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo 50 oe_runmake libpseudo
43 # prevent it from removing the lib, but remove everything else 51 # prevent it from removing the lib, but remove everything else
44 make 'LIB=foo' distclean 52 make 'LIB=foo' distclean
45 fi 53 fi
diff --git a/meta/recipes-devtools/pseudo/pseudo/oe-config.patch b/meta/recipes-devtools/pseudo/pseudo/oe-config.patch
new file mode 100644
index 0000000000..d368281ce5
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo/oe-config.patch
@@ -0,0 +1,58 @@
1configure: Fix configuration to match OE-Core requirements
2
3In OE-Core we need to be able to configure for both 32-bit and 64-bit libpseudo
4libraries. In order to avoid some complex manipulations, we adjust the configure
5and Makefile to facilitate this.
6
7Upstream-Status: Submitted
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff --git a/Makefile.in b/Makefile.in
12index 6c57d43..342d066 100644
13--- a/Makefile.in
14+++ b/Makefile.in
15@@ -27,7 +27,7 @@ MARK64=@MARK64@
16 RPATH=@RPATH@
17 VERSION=1.1.1
18
19-LIB=$(shell basename $(LIBDIR))
20+LIB=@LIB@
21 BIN=bin
22 LOCALSTATE=var/pseudo
23 BINDIR=$(PREFIX)/$(BIN)
24diff --git a/configure b/configure
25index 9a480fb..eeb19f3 100755
26--- a/configure
27+++ b/configure
28@@ -80,14 +80,18 @@ if [ -z "$opt_prefix" ]; then
29 usage
30 fi
31
32-if [ -n "$opt_bits" ] && [ -n "$opt_libdir" ]; then
33- echo >&2 "Can not specify both --libdir and --bits"
34- exit 1
35-fi
36 if [ -z "$opt_libdir" ]; then
37 opt_libdir=$opt_prefix/lib$opt_mark64
38 fi
39
40+# We need to find the libdir relative to the prefix, this is required
41+# by the code in pseudo-utils.c that handles relocation.
42+opt_lib=${opt_libdir#$opt_prefix/}
43+if [ "$opt_lib" = "$opt_libdir" ]; then
44+ echo >&2 "libdir must be relative to prefix."
45+ exit 1
46+fi
47+
48 if [ ! -f "${opt_sqlite}/include/sqlite3.h" ]; then
49 echo >&2 "SQLite3 headers not found in at ${opt_sqlite}/include/sqlite3.h. Please check that SQLite3 and SQLite3 headers are installed."
50 exit 1
51@@ -107,6 +111,7 @@ fi
52 sed -e '
53 s,@PREFIX@,'"$opt_prefix"',g
54 s,@LIBDIR@,'"$opt_libdir"',g
55+ s,@LIB@,'"$opt_lib"',g
56 s,@SUFFIX@,'"$opt_suffix"',g
57 s,@SQLITE@,'"$opt_sqlite"',g
58 s!@RPATH@!'"$opt_rpath"'!g
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.0.bb b/meta/recipes-devtools/pseudo/pseudo_1.0.bb
deleted file mode 100644
index e750e8aebc..0000000000
--- a/meta/recipes-devtools/pseudo/pseudo_1.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require pseudo.inc
2
3PR = "r0"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
6 file://static_sqlite.patch"
7
8SRC_URI[md5sum] = "a329bd00ba78711bcacd48fc1982af6a"
9SRC_URI[sha256sum] = "cb41c97094044144ef4027ab9dbba009f3cb1c23e6bec9640f29d530524ad60f"
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
new file mode 100644
index 0000000000..e05fe41a6f
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
@@ -0,0 +1,10 @@
1require pseudo.inc
2
3PR = "r0"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
6 file://oe-config.patch \
7 file://static_sqlite.patch"
8
9SRC_URI[md5sum] = "dd59766c17e199fe6144fce8a2c67802"
10SRC_URI[sha256sum] = "c697f643577d661c3ce826504b9dcd11fa98e78a5d10e3c83931da8942f6bfad"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 2b9fe70a93..6505958c4a 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,12 +1,13 @@
1require pseudo.inc 1require pseudo.inc
2 2
3SRCREV = "5434325fc887817ebb2bad36313d8277992cef1d" 3SRCREV = "1d3e67cb168c3459e67a0b29f071ca30ed17dadc"
4PV = "1.0+git${SRCPV}" 4PV = "1.1.1+git${SRCPV}"
5PR = "r18" 5PR = "r19"
6 6
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
8 8
9SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ 9SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \
10 file://oe-config.patch \
10 file://static_sqlite.patch" 11 file://static_sqlite.patch"
11 12
12S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"