Skip to contentSkip to conversation

pseudo: Update pseudo to 1.1.1 version V3

PATCH Applied Mark Hatle 3 participants 5 messages Jun 8, 2011 – Jun 11, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover pseudo: Update pseudo to 1.1.1 version V3

Hopefully third and final version. The patch that is part of this has been contribed to and reviewed upstream. (Not yet accepted upstream)

V3 fixes an issue with building on a 32-bit host.

The following changes since commit 30101d4153aa8e116892063933b868d325bdd79c:

distro tracking: Manual Updates (2011-06-06 23:51:26 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/pseudo
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo

Mark Hatle (2):
pseudo: Update pseudo to 1.1.1 version
distro_tracking_fields.inc: add pseudo

 .../conf/distro/include/distro_tracking_fields.inc |    6 ++
 meta/recipes-devtools/pseudo/pseudo.inc            |   20 +++++--
 .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 ++++++++++++++++++++
 meta/recipes-devtools/pseudo/pseudo_1.0.bb         |    9 ---
 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb       |   10 ++++
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    7 ++-
 6 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.0.bb
 create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/2 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 <[email protected]>
---
 meta/recipes-devtools/pseudo/pseudo.inc            |   20 +++++--
 .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 ++++++++++++++++++++
 meta/recipes-devtools/pseudo/pseudo_1.0.bb         |    9 ---
 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb       |   10 ++++
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    7 ++-
 5 files changed, 86 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.0.bb
 create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
meta/recipes-devtools/pseudo/pseudo.inc +14 -6
index a458dcc..0416a53 100644
@@ -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
meta/recipes-devtools/pseudo/pseudo/oe-config.patch new file +58 -0

58 lines not on this page · raw message

meta/recipes-devtools/pseudo/pseudo_1.0.bb deleted +0 -9
deleted file mode 100644
index e750e8a..0000000
@@ -1,9 +0,0 @@
-require pseudo.inc
-
-PR = "r0"
-
-SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://static_sqlite.patch"
-
-SRC_URI[md5sum] = "a329bd00ba78711bcacd48fc1982af6a"
-SRC_URI[sha256sum] = "cb41c97094044144ef4027ab9dbba009f3cb1c23e6bec9640f29d530524ad60f"
meta/recipes-devtools/pseudo/pseudo_1.1.1.bb new file +10 -0
new file mode 100644
index 0000000..e05fe41
@@ -0,0 +1,10 @@
+require pseudo.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
+           file://oe-config.patch \
+           file://static_sqlite.patch"
+
+SRC_URI[md5sum] = "dd59766c17e199fe6144fce8a2c67802"
+SRC_URI[sha256sum] = "c697f643577d661c3ce826504b9dcd11fa98e78a5d10e3c83931da8942f6bfad"
meta/recipes-devtools/pseudo/pseudo_git.bb +4 -3
index 2b9fe70..6505958 100644
@@ -1,12 +1,13 @@
 require pseudo.inc
 
-SRCREV = "5434325fc887817ebb2bad36313d8277992cef1d"
-PV = "1.0+git${SRCPV}"
-PR = "r18"
+SRCREV = "1d3e67cb168c3459e67a0b29f071ca30ed17dadc"
+PV = "1.1.1+git${SRCPV}"
+PR = "r19"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \
+           file://oe-config.patch \
            file://static_sqlite.patch"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH 2/2 distro_tracking_fields.inc: add pseudo

In reply to Mark Hatle

Add pseudo to tracking, with me as the maintainer.

Signed-off-by Mark Hatle <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +6 -0
index 38e0c4d..53dad27 100644
@@ -5754,3 +5754,9 @@ RECIPE_STATUS_pn-gettext = "red"
 RECIPE_LATEST_VERSION_pn-gettext = "0.18.1.1"
 RECIPE_LAST_UPDATE_pn-gettext = "Jun 6, 2010"
 RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Jun 7, 2011" 
+
+RECIPE_STATUS_pn-pseudo = "green"
+RECIPE_LATEST_VERSION_pn-pseudo = "1.1.1"
+RECIPE_LAST_UPDATE_pn-pseudo = "June 06, 2011"
+RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <[email protected]>"
+RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
Signature · 1 line
1.7.3.4
Applied
#3 lore raw
In reply to Mark Hatle
Quoted 24 lines · Mark Hatle

Hopefully third and final version. The patch that is part of this has been contribed to and reviewed upstream. (Not yet accepted upstream)

V3 fixes an issue with building on a 32-bit host.

The following changes since commit 30101d4153aa8e116892063933b868d325bdd79c:

   distro tracking: Manual Updates (2011-06-06 23:51:26 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/pseudo
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo

Mark Hatle (2):
pseudo: Update pseudo to 1.1.1 version
distro_tracking_fields.inc: add pseudo

  .../conf/distro/include/distro_tracking_fields.inc |    6 ++
  meta/recipes-devtools/pseudo/pseudo.inc            |   20 +++++--
  .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 ++++++++++++++++++++
  meta/recipes-devtools/pseudo/pseudo_1.0.bb         |    9 ---
  meta/recipes-devtools/pseudo/pseudo_1.1.1.bb       |   10 ++++
  meta/recipes-devtools/pseudo/pseudo_git.bb         |    7 ++-
  6 files changed, 92 insertions(+), 18 deletions(-)
Quoted 4 lines

create mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.0.bb create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb

Merged into OE-Core

Thanks
Sau!

#4 lore raw

Op 9 jun 2011, om 20:41 heeft Saul Wold het volgende geschreven:

Quoted 31 lines · Mark Hatle
Quoted 17 lines

Hopefully third and final version. The patch that is part of this has been contribed to and reviewed upstream. (Not yet accepted upstream)

V3 fixes an issue with building on a 32-bit host.

The following changes since commit 30101d4153aa8e116892063933b868d325bdd79c:

distro tracking: Manual Updates (2011-06-06 23:51:26 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/pseudo
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo

Mark Hatle (2):
pseudo: Update pseudo to 1.1.1 version
distro_tracking_fields.inc: add pseudo

Quoted 11 lines
 .../conf/distro/include/distro_tracking_fields.inc |    6 ++
 meta/recipes-devtools/pseudo/pseudo.inc            |   20 +++++--
 .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 ++++++++++++++++++++
 meta/recipes-devtools/pseudo/pseudo_1.0.bb         |    9 ---
 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb       |   10 ++++
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    7 ++-
 6 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.0.bb
 create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
Quoted 1 line

Merged into OE-Core

This also seems to fix the bugs that all my ipks had the +x bit set, 'ls --color' looks far more pleasing now!

regards,

Koen