Skip to contentSkip to conversation

pseudo: Update pseudo to 1.1.1 version

PATCH In review Mark Hatle 3 participants 5 messages Jun 6, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover pseudo: Update pseudo to 1.1.1 version

Update pseudo to latest release version.

This has been tested with an core-minimal-image, as well as existing pseudo tests outside of oe-core.

The following changes since commit 925de3b3e74d15547840a2edaceff437e135bddd:

tzcode: Update to 2011g (2011-06-06 15:52:18 +0100)

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=WIP

Mark Hatle (1):
pseudo: Update pseudo to 1.1.1 version

 meta/recipes-devtools/pseudo/pseudo.inc            |   10 +++++-----
 .../pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb}      |    4 ++--
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb} (51%)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/1 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            |   10 +++++-----
 .../pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb}      |    4 ++--
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb} (51%)
meta/recipes-devtools/pseudo/pseudo.inc +5 -5
index a458dcc..df09b0d 100644
@@ -18,7 +18,7 @@ NO32LIBS ??= "0"
 
 # Compile for the local machine arch...
 do_compile () {
-	${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
+	${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} # --bits=${SITEINFO_BITS}
 	oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
 }
 

@@ -28,8 +28,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 'CFLAGS=-m32' libpseudo 'LIB=lib/pseudo/lib$(MARK64)'
 		# prevent it from removing the lib, but remove everything else
 		make 'LIB=foo' distclean 
 	fi

@@ -38,8 +38,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 'CFLAGS=-m32' libpseudo 'LIB=lib/pseudo/lib$(MARK64)'
 		# prevent it from removing the lib, but remove everything else
 		make 'LIB=foo' distclean 
 	fi
meta/recipes-devtools/pseudo/pseudo_1.1.1.bb renamed from meta/recipes-devtools/pseudo/pseudo_1.0.bb +2 -2
similarity index 51%
rename from meta/recipes-devtools/pseudo/pseudo_1.0.bb
rename to meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
index e750e8a..8bf6d07 100644
@@ -5,5 +5,5 @@ 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"
+SRC_URI[md5sum] = "dd59766c17e199fe6144fce8a2c67802"
+SRC_URI[sha256sum] = "c697f643577d661c3ce826504b9dcd11fa98e78a5d10e3c83931da8942f6bfad"
meta/recipes-devtools/pseudo/pseudo_git.bb +3 -3
index 2b9fe70..cf3b191 100644
@@ -1,8 +1,8 @@
 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"
Signature · 1 line
1.7.3.4
#2 lore raw
Quoted 22 lines · Mark Hatle

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            |   10 +++++----- .../pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb}      |    4 ++-- meta/recipes-devtools/pseudo/pseudo_git.bb         |    6 +++---

 3 files changed, 10 insertions(+), 10 deletions(-)

 rename meta/recipes-devtools/pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb} (51%)

meta/recipes-devtools/pseudo/pseudo.inc +0 -0
index a458dcc..df09b0d 100644

meta/recipes-devtools/pseudo/pseudo.inc NO32LIBS ??= "0" · line 21

Quoted 5 lines
meta/recipes-devtools/pseudo/pseudo.inc +1 -1
@@ -18,7 +18,7 @@ NO32LIBS ??= "0"
 
  # Compile for the local machine arch...
  do_compile () {
-       ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
+       ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} # --bits=${SITEINFO_BITS}

Just curious why is it a 32bit binary

Quoted 65 lines

       oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
 }

meta/recipes-devtools/pseudo/pseudo.inc +0 -0
@@ -28,8 +28,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 'CFLAGS=-m32' libpseudo 'LIB=lib/pseudo/lib$(MARK64)'

               # prevent it from removing the lib, but remove everything else
               make 'LIB=foo' distclean
       fi
meta/recipes-devtools/pseudo/pseudo.inc +0 -0
@@ -38,8 +38,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 'CFLAGS=-m32' libpseudo 'LIB=lib/pseudo/lib$(MARK64)'

               # prevent it from removing the lib, but remove everything else
               make 'LIB=foo' distclean
       fi
meta/recipes-devtools/pseudo/pseudo_1.1.1.bb renamed from meta/recipes-devtools/pseudo/pseudo_1.0.bb +0 -0
similarity index 51%
rename from meta/recipes-devtools/pseudo/pseudo_1.0.bb
rename to meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
index e750e8a..8bf6d07 100644
@@ -5,5 +5,5 @@ PR = "r0"
  SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \

           file://static_sqlite.patch"

meta/recipes-devtools/pseudo/pseudo_1.1.1.bb renamed from meta/recipes-devtools/pseudo/pseudo_1.0.bb +2 -2
-SRC_URI[md5sum] = "a329bd00ba78711bcacd48fc1982af6a"
-SRC_URI[sha256sum] = "cb41c97094044144ef4027ab9dbba009f3cb1c23e6bec9640f29d530524ad60f"
+SRC_URI[md5sum] = "dd59766c17e199fe6144fce8a2c67802"
+SRC_URI[sha256sum] = "c697f643577d661c3ce826504b9dcd11fa98e78a5d10e3c83931da8942f6bfad"
meta/recipes-devtools/pseudo/pseudo_git.bb +0 -0
index 2b9fe70..cf3b191 100644
@@ -1,8 +1,8 @@

 require pseudo.inc

meta/recipes-devtools/pseudo/pseudo_git.bb +3 -3
-SRCREV = "5434325fc887817ebb2bad36313d8277992cef1d"
-PV = "1.0+git${SRCPV}"
-PR = "r18"
+SRCREV = "1d3e67cb168c3459e67a0b29f071ca30ed17dadc"
+PV = "1.1.1+git${SRCPV}"
+PR = "r19"

 DEFAULT_PREFERENCE = "-1"

--
1.7.3.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#3 lore raw
Quoted 24 lines · Khem Raj
Quoted 23 lines · Mark Hatle

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            |   10 +++++-----
 .../pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb}      |    4 ++--
 meta/recipes-devtools/pseudo/pseudo_git.bb         |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb} (51%)
meta/recipes-devtools/pseudo/pseudo.inc +0 -0
index a458dcc..df09b0d 100644
@@ -18,7 +18,7 @@ NO32LIBS ??= "0"
Quoted 6 lines

meta/recipes-devtools/pseudo/pseudo.inc NO32LIBS ??= "0" · line 21

Quoted 4 lines
meta/recipes-devtools/pseudo/pseudo.inc +1 -1
 # Compile for the local machine arch...
 do_compile () {
-       ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
+       ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} # --bits=${SITEINFO_BITS}

Just curious why is it a 32bit binary

It's not.

The default is to build a "native" library and server (in do_compile). On many systems this will be 64-bit, or some 32-bit.

Then...

Quoted 4 lines
Quoted 4 lines
meta/recipes-devtools/pseudo/pseudo.inc +0 -0
       oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
 }
Quoted 11 lines

meta/recipes-devtools/pseudo/pseudo.inc do_compile () { · line 35

Quoted 11 lines
meta/recipes-devtools/pseudo/pseudo.inc +2 -2
@@ -28,8 +28,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 'CFLAGS=-m32' libpseudo 'LIB=lib/pseudo/lib$(MARK64)'
               # prevent it from removing the lib, but remove everything else
               make 'LIB=foo' distclean
       fi

On systems where we have both 32-bit and 64-bit libs, we assume the default is 64-bit -- and then we build the compatible 32-bit library.. (well since it's a prepend, we built it before the other.. but that just makes the build easier...)

If the host has both 32-bit and 64-bit libraries, we have to assume that any executable on the system may be 32-bit or 64-bit. So we need two intercept libraries, one for each.. The same back-end pseudo service is setup to work with either front-end library.

(One place where this is an issue, if you use certain Code Sourcery pre-compiled toolchains, they only ship in 32-bit form. So we need to wrap both 32-bit and 64-bit libraries, otherwise linking and a few other things done by the toolchain components will be done outside of pseudo, resulting in potentially bad file owners, permissions, etc..

Quoted 56 lines
Quoted 46 lines
meta/recipes-devtools/pseudo/pseudo.inc +2 -2
@@ -38,8 +38,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 'CFLAGS=-m32' libpseudo 'LIB=lib/pseudo/lib$(MARK64)'
               # prevent it from removing the lib, but remove everything else
               make 'LIB=foo' distclean
       fi
meta/recipes-devtools/pseudo/pseudo_1.1.1.bb renamed from meta/recipes-devtools/pseudo/pseudo_1.0.bb +2 -2
similarity index 51%
rename from meta/recipes-devtools/pseudo/pseudo_1.0.bb
rename to meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
index e750e8a..8bf6d07 100644
@@ -5,5 +5,5 @@ 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"
+SRC_URI[md5sum] = "dd59766c17e199fe6144fce8a2c67802"
+SRC_URI[sha256sum] = "c697f643577d661c3ce826504b9dcd11fa98e78a5d10e3c83931da8942f6bfad"
meta/recipes-devtools/pseudo/pseudo_git.bb +3 -4
index 2b9fe70..cf3b191 100644
@@ -1,8 +1,8 @@
 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"
 
--

1.7.3.4

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#4 lore raw
In reply to Mark Hatle
Quoted 13 lines · Mark Hatle

Update pseudo to latest release version.

This has been tested with an core-minimal-image, as well as existing pseudo tests outside of oe-core.

The following changes since commit 925de3b3e74d15547840a2edaceff437e135bddd:

   tzcode: Update to 2011g (2011-06-06 15:52:18 +0100)

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=WIP

Quoted 9 lines

Mark Hatle (1):
pseudo: Update pseudo to 1.1.1 version

  meta/recipes-devtools/pseudo/pseudo.inc            |   10 +++++-----
  .../pseudo/{pseudo_1.0.bb =>  pseudo_1.1.1.bb}      |    4 ++--
  meta/recipes-devtools/pseudo/pseudo_git.bb         |    6 +++---
  3 files changed, 10 insertions(+), 10 deletions(-)

rename meta/recipes-devtools/pseudo/{pseudo_1.0.bb => pseudo_1.1.1.bb} (51%)

Mark,

Could you create an entry in the distro_tracking_fields.inc for pseudo and mark yourself as owner, there might be part of one in there already.

Check the wiki for details on what's needed.

Thanks
Sau!