pseudo: Update pseudo to 1.1.1 version V2

PATCH New Mark Hatle 1 participant 3 messages Jun 8, 2011

lore

Share & tools

lore

Mark Hatle

author

2011-06-08 16:32 UTC #0 lore raw

cover pseudo: Update pseudo to 1.1.1 version V2

Update pseudo to latest release version. -- second version of the patches

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

Version 2 corrects a problem w/ 32-bit hosts.

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            |   12 ++--
 .../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, 84 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

Mark Hatle

author

2011-06-08 16:32 UTC #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            |   12 ++--
 .../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, 78 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 +6 -6

index a458dcc..78191bb 100644
@@ -18,8 +18,8 @@ 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)'
+	${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
+	oe_runmake
 }
 
 # Two below are the same

@@ -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 libpseudo
 		# 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 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

Mark Hatle

author

2011-06-08 16:32 UTC #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