summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2012-07-27 16:54:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-29 10:16:16 +0100
commit3d164f74fdb994c08c7e3f6d93cd4e1959b4eb7e (patch)
treeddfacf53d687f9b9df776e09ebade0970311d1c6 /meta/recipes-devtools
parenta18b397a3ea101083ff8249f7f0ac16e1b2e9a2c (diff)
downloadpoky-3d164f74fdb994c08c7e3f6d93cd4e1959b4eb7e.tar.gz
pseudo.inc/pseudo_1.4.bb: update pseudo to 1.4
This update replaces the half-baked --arch logic with the use of $CFLAGS to pick compiler flags, on the grounds that it makes a lot more sense for the build system to pick flags than for pseudo to try to guess what they should be; this should allow pseudo to at least compile for targets, and possibly run on them. This doesn't solve the problem of guessing how to forcibly build the 32-bit variant on hosts, because we really don't have a general solution for that. There's no idiom for "given this set of compiler flags and this architecture, what flags would you use to request a 32-bit compile instead?" So we basically ignore that for now. If someone comes along trying to use the build system to build pseudo-native on a 64-bit host that also supports 32-bit binaries and isn't x86, we will revisit this. (From OE-Core rev: 711fcb4f10e2cefd7ff6e1921d87d1cad840d0c8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc12
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.3.1.bb8
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.4.bb8
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb8
4 files changed, 21 insertions, 15 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 8798018a4b..ac898d2dd7 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -3,7 +3,7 @@
3# BBFETCH2=True PSEUDO_BUILD=1 ../bitbake/bin/bitbake pseudo-native [-c CMD] 3# BBFETCH2=True PSEUDO_BUILD=1 ../bitbake/bin/bitbake pseudo-native [-c CMD]
4 4
5DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" 5DESCRIPTION = "Pseudo gives fake root capabilities to a normal user"
6HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/" 6HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/pseudo"
7LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" 7LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
8SECTION = "base" 8SECTION = "base"
9LICENSE = "LGPL2.1" 9LICENSE = "LGPL2.1"
@@ -11,6 +11,8 @@ DEPENDS = "sqlite3"
11 11
12SRC_URI_append_virtclass-nativesdk = " file://symver.patch" 12SRC_URI_append_virtclass-nativesdk = " file://symver.patch"
13 13
14SRC_URI_append_virtclass-native = " file://symver.patch"
15
14FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo" 16FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
15FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug" 17FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
16PROVIDES += "virtual/fakeroot" 18PROVIDES += "virtual/fakeroot"
@@ -28,9 +30,9 @@ NO32LIBS ??= "1"
28# Compile for the local machine arch... 30# Compile for the local machine arch...
29do_compile () { 31do_compile () {
30 if [ "${SITEINFO_BITS}" = "64" ]; then 32 if [ "${SITEINFO_BITS}" = "64" ]; then
31 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath 33 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
32 else 34 else
33 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath 35 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
34 fi 36 fi
35 oe_runmake ${MAKEOPTS} 37 oe_runmake ${MAKEOPTS}
36} 38}
@@ -41,6 +43,8 @@ do_compile () {
41do_compile_prepend_virtclass-native () { 43do_compile_prepend_virtclass-native () {
42 if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 44 if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
43 # We need the 32-bit libpseudo on a 64-bit machine... 45 # We need the 32-bit libpseudo on a 64-bit machine...
46 # ... and we really, really, hope that the native host is
47 # x86, or else --bits may not work.
44 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath 48 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
45 oe_runmake ${MAKEOPTS} libpseudo 49 oe_runmake ${MAKEOPTS} libpseudo
46 # prevent it from removing the lib, but remove everything else 50 # prevent it from removing the lib, but remove everything else
@@ -51,6 +55,8 @@ do_compile_prepend_virtclass-native () {
51do_compile_prepend_virtclass-nativesdk () { 55do_compile_prepend_virtclass-nativesdk () {
52 if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 56 if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
53 # We need the 32-bit libpseudo on a 64-bit machine... 57 # We need the 32-bit libpseudo on a 64-bit machine...
58 # ... and we really, really, hope that the native host is
59 # x86, or else --bits may not work.
54 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath 60 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
55 oe_runmake ${MAKEOPTS} libpseudo 61 oe_runmake ${MAKEOPTS} libpseudo
56 # prevent it from removing the lib, but remove everything else 62 # prevent it from removing the lib, but remove everything else
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.3.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.3.1.bb
deleted file mode 100644
index d64e0e5b04..0000000000
--- a/meta/recipes-devtools/pseudo/pseudo_1.3.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require pseudo.inc
2
3PR = "r11"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
6
7SRC_URI[md5sum] = "aa7dbe925d065187833e1171746e9a94"
8SRC_URI[sha256sum] = "dc896c06b0f5bc253faaeb21ed78157db7ef7553e3ecae15a1eb6faf64942110"
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.4.bb b/meta/recipes-devtools/pseudo/pseudo_1.4.bb
new file mode 100644
index 0000000000..e1e1f6f520
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo_1.4.bb
@@ -0,0 +1,8 @@
1require pseudo.inc
2
3PR = "r12"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
6
7SRC_URI[md5sum] = "bc04c6c9d13cfdb789ffc2f3cca9ab08"
8SRC_URI[sha256sum] = "147fa7b177061a145d330b9e159529a185be94550f123c6acb0d3b75d480c5b4"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 2f58072f36..27ae4b2e27 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,12 +1,12 @@
1require pseudo.inc 1require pseudo.inc
2 2
3SRCREV = "2e0189ba5368b1e88d509d0ab82bccb15cfb3653" 3SRCREV = "9b792e4cb91bc22374f47d0b0902dbc4ecd7d6dd"
4PV = "1.3.1+git${SRCPV}" 4PV = "1.4+git${SRCPV}"
5PR = "r26" 5PR = "r27"
6 6
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
8 8
9SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git" 9SRC_URI = "git://git.yoctoproject.org/pseudo;protocol=git"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12