diff options
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.3.1.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.4.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_git.bb | 8 |
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 @@ # 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/" +HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/pseudo" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" SECTION = "base" LICENSE = "LGPL2.1" @@ -11,6 +11,8 @@ DEPENDS = "sqlite3" SRC_URI_append_virtclass-nativesdk = " file://symver.patch" +SRC_URI_append_virtclass-native = " file://symver.patch" + FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo" FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug" PROVIDES += "virtual/fakeroot" @@ -28,9 +30,9 @@ NO32LIBS ??= "1" # Compile for the local machine arch... do_compile () { 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} --enable-static-sqlite --without-rpath + ${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 else - ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath + ${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 fi oe_runmake ${MAKEOPTS} } @@ -41,6 +43,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... + # ... and we really, really, hope that the native host is + # x86, or else --bits may not work. ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath oe_runmake ${MAKEOPTS} libpseudo # prevent it from removing the lib, but remove everything else @@ -51,6 +55,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... + # ... and we really, really, hope that the native host is + # x86, or else --bits may not work. ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath oe_runmake ${MAKEOPTS} libpseudo # 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 @@ -require pseudo.inc - -PR = "r11" - -SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" - -SRC_URI[md5sum] = "aa7dbe925d065187833e1171746e9a94" -SRC_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 @@ +require pseudo.inc + +PR = "r12" + +SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "bc04c6c9d13cfdb789ffc2f3cca9ab08" +SRC_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 @@ require pseudo.inc -SRCREV = "2e0189ba5368b1e88d509d0ab82bccb15cfb3653" -PV = "1.3.1+git${SRCPV}" -PR = "r26" +SRCREV = "9b792e4cb91bc22374f47d0b0902dbc4ecd7d6dd" +PV = "1.4+git${SRCPV}" +PR = "r27" DEFAULT_PREFERENCE = "-1" -SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git" +SRC_URI = "git://git.yoctoproject.org/pseudo;protocol=git" S = "${WORKDIR}/git" |