[PATCH 0/2] Update pseudo to version 1.3

[PATCH 0/2] Update pseudo to version 1.3

[Mark Hatle]

Update pseudo to version 1.3 in order to fix Yocto Project bug #2181.

From the pseudo author:

This patch updates pseudo to 1.3.  The biggest change is the creation of
a new popen() wrapper, which fixes some strange PSEUDO_PREFIX errors that
could occur running certain commands (those using os.popen()) outside of
the pseudo environment after pseudo had been used.  However, this also
uses the upstream versions of the opendir and renameat patches, merges in
a new option for static linking of sqlite (and adds that configuration
option to pseudo.inc), and merges in the oe-config patch.  So we're back
to zero patches in tree and a clean upstream pseudo.

In addition, a separate patch to the scripts/bitbake was created that should
help ensure that on an upgrade of pseudo-native, pseudo-native is built
prior to the main build.  Similarly to how things work when pseudodone
does not exist.

Testing notes...
This was tested by starting with existing master, building core-image-minimal,
then updating to the new version of pseudo recipes, and rerunning the
core-image-minimal build.  The test was performed with both NO32LIBS=1 and
NO32LIBS=0.  Testing was successful.

The following changes since commit 7b01671f54f70c28c98457058c51ffefcb07c0e8:

  nspr 4.8.9: failed to build on x86_64 board (2012-03-27 13:26:37 +0100)

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

Mark Hatle (1):
  scripts/bitbake: Update to help rebuild pseudo-native

Peter Seebach (1):
  Pseudo: Update to 1.3

 meta/recipes-devtools/pseudo/pseudo.inc            |    4 +-
 .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 -----
 meta/recipes-devtools/pseudo/pseudo/opendir.patch  |   94 --------
 meta/recipes-devtools/pseudo/pseudo/renameat.patch |  229 --------------------
 .../pseudo/pseudo/static_sqlite.patch              |   17 --
 meta/recipes-devtools/pseudo/pseudo_1.2.bb         |   12 -
 meta/recipes-devtools/pseudo/pseudo_1.3.bb         |    8 +
 meta/recipes-devtools/pseudo/pseudo_git.bb         |   10 +-
 scripts/bitbake                                    |   36 +++-
 9 files changed, 45 insertions(+), 423 deletions(-)
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/opendir.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/renameat.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.2.bb
 create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.3.bb

-- 
1.7.3.4

[PATCH 1/2] Pseudo: Update to 1.3

[Mark Hatle]

From: Peter Seebach <peter.seebach@windriver.com>

The various local patches have made it into upstream, so we update
the build files and jump to pseudo 1.3.  This also includes a popen()
fix which fixes some edge cases that caused failures trying to check
git branches and the like.

[Yocto bug #2181]

Signed-off-by: Seebs <peter.seebach@windriver.com>

Updated the pseudo_git.bb to match.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-devtools/pseudo/pseudo.inc            |    4 +-
 .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 -----
 meta/recipes-devtools/pseudo/pseudo/opendir.patch  |   94 --------
 meta/recipes-devtools/pseudo/pseudo/renameat.patch |  229 --------------------
 .../pseudo/pseudo/static_sqlite.patch              |   17 --
 meta/recipes-devtools/pseudo/pseudo_1.2.bb         |   12 -
 meta/recipes-devtools/pseudo/pseudo_1.3.bb         |    8 +
 meta/recipes-devtools/pseudo/pseudo_git.bb         |   10 +-
 8 files changed, 14 insertions(+), 418 deletions(-)
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/opendir.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/renameat.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
 delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.2.bb
 create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.3.bb

diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 4a3ef6f..664a9b5 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -29,9 +29,9 @@ NO32LIBS ??= "0"
 # 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}
+	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite
 	else
-	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
+	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite
 	fi
 	oe_runmake ${MAKEOPTS}
 }
diff --git a/meta/recipes-devtools/pseudo/pseudo/oe-config.patch b/meta/recipes-devtools/pseudo/pseudo/oe-config.patch
deleted file mode 100644
index d368281..0000000
--- a/meta/recipes-devtools/pseudo/pseudo/oe-config.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-configure: Fix configuration to match OE-Core requirements
-
-In OE-Core we need to be able to configure for both 32-bit and 64-bit libpseudo
-libraries.  In order to avoid some complex manipulations, we adjust the configure
-and Makefile to facilitate this.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff --git a/Makefile.in b/Makefile.in
-index 6c57d43..342d066 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -27,7 +27,7 @@ MARK64=@MARK64@
- RPATH=@RPATH@
- VERSION=1.1.1
- 
--LIB=$(shell basename $(LIBDIR))
-+LIB=@LIB@
- BIN=bin
- LOCALSTATE=var/pseudo
- BINDIR=$(PREFIX)/$(BIN)
-diff --git a/configure b/configure
-index 9a480fb..eeb19f3 100755
---- a/configure
-+++ b/configure
-@@ -80,14 +80,18 @@ if [ -z "$opt_prefix" ]; then
-   usage
- fi
- 
--if [ -n "$opt_bits" ] && [ -n "$opt_libdir" ]; then
--    echo >&2 "Can not specify both --libdir and --bits"
--    exit 1
--fi
- if [ -z "$opt_libdir" ]; then
-     opt_libdir=$opt_prefix/lib$opt_mark64
- fi
- 
-+# We need to find the libdir relative to the prefix, this is required
-+# by the code in pseudo-utils.c that handles relocation.
-+opt_lib=${opt_libdir#$opt_prefix/}
-+if [ "$opt_lib" = "$opt_libdir" ]; then
-+    echo >&2 "libdir must be relative to prefix."
-+    exit 1
-+fi
-+
- if [ ! -f "${opt_sqlite}/include/sqlite3.h" ]; then
-     echo >&2 "SQLite3 headers not found in at ${opt_sqlite}/include/sqlite3.h. Please check that SQLite3 and SQLite3 headers are installed."
-     exit 1
-@@ -107,6 +111,7 @@ fi
- sed -e '
-   s,@PREFIX@,'"$opt_prefix"',g
-   s,@LIBDIR@,'"$opt_libdir"',g
-+  s,@LIB@,'"$opt_lib"',g
-   s,@SUFFIX@,'"$opt_suffix"',g
-   s,@SQLITE@,'"$opt_sqlite"',g
-   s!@RPATH@!'"$opt_rpath"'!g
diff --git a/meta/recipes-devtools/pseudo/pseudo/opendir.patch b/meta/recipes-devtools/pseudo/pseudo/opendir.patch
deleted file mode 100644
index bc6cec8..0000000
--- a/meta/recipes-devtools/pseudo/pseudo/opendir.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-commit 162f2692c399b93311652201a940fdaf9c9e6924
-Author: Peter Seebach <peter.seebach@windriver.com>
-Date:   Thu Feb 2 11:45:42 2012 -0600
-
-    Make opendir/closedir stash and forget directory names.
-    
-    The dirfd(DIR *) interface allows you to get the fd for a DIR *,
-    meaning you can use it with openat(), meaning you can need its
-    path.  This causes a segfault.  Also gonna fix the base_path
-    code not to segfault in that case, but first fix the underlying
-    problem.
-
-Upstream-Status: Backport
-
-diff --git a/ChangeLog.txt b/ChangeLog.txt
-index 4de488c..9625b38 100644
---- a/ChangeLog.txt
-+++ b/ChangeLog.txt
-@@ -1,3 +1,7 @@
-+2012-02-02:
-+	* (seebs) stash dir name for DIR * from opendir using dirfd.
-+	* (seebs) add closedir.
-+
- 2011-11-02:
- 	* (seebs) Call this 1.2 because the UNLOAD change is moderately
- 	  significant, and so's the clone change.
-diff --git a/ports/unix/guts/closedir.c b/ports/unix/guts/closedir.c
-new file mode 100644
-index 0000000..1085361
---- /dev/null
-+++ b/ports/unix/guts/closedir.c
-@@ -0,0 +1,20 @@
-+/*
-+ * Copyright (c) 2012 Wind River Systems; see
-+ * guts/COPYRIGHT for information.
-+ *
-+ * static int
-+ * wrap_closedir(DIR *dirp) {
-+ *	int rc = -1;
-+ */
-+	if (!dirp) {
-+		errno = EFAULT;
-+		return -1;
-+	}
-+
-+	int fd = dirfd(dirp);
-+	pseudo_client_op(OP_CLOSE, 0, fd, -1, 0, 0);
-+	rc = real_closedir(dirp);
-+
-+/*	return rc;
-+ * }
-+ */
-diff --git a/ports/unix/guts/opendir.c b/ports/unix/guts/opendir.c
-index 8eaa71f..e69717e 100644
---- a/ports/unix/guts/opendir.c
-+++ b/ports/unix/guts/opendir.c
-@@ -6,8 +6,25 @@
-  * wrap_opendir(const char *path) {
-  *	DIR * rc = NULL;
-  */
-+ 	struct stat buf;
-+	int save_errno;
- 
- 	rc = real_opendir(path);
-+	if (rc) {
-+		int fd;
-+		save_errno = errno;
-+		fd = dirfd(rc);
-+		if (real_fstat(fd, &buf) == -1) {
-+			pseudo_debug(1, "diropen (fd %d) succeeded, but fstat failed (%s).\n",
-+				fd, strerror(errno));
-+			pseudo_client_op_plain(OP_OPEN, PSA_READ, fd, -1, path, 0);
-+		} else {
-+			pseudo_client_op_plain(OP_OPEN, PSA_READ, fd, -1, path, &buf);
-+		}
-+
-+
-+		errno = save_errno;
-+	}
- 
- /*	return rc;
-  * }
-diff --git a/ports/unix/wrapfuncs.in b/ports/unix/wrapfuncs.in
-index e06e404..32250c4 100644
---- a/ports/unix/wrapfuncs.in
-+++ b/ports/unix/wrapfuncs.in
-@@ -21,6 +21,7 @@ long pathconf(const char *path, int name);
- char *realpath(const char *name, char *resolved_name); /* version="GLIBC_2.3" */
- int remove(const char *path); /* flags=AT_SYMLINK_NOFOLLOW */
- DIR *opendir(const char *path);
-+int closedir(DIR *dirp);
- char *tempnam(const char *template, const char *pfx);
- char *tmpnam(char *s);
- int truncate(const char *path, off_t length);
diff --git a/meta/recipes-devtools/pseudo/pseudo/renameat.patch b/meta/recipes-devtools/pseudo/pseudo/renameat.patch
deleted file mode 100644
index a2b2cbc..0000000
--- a/meta/recipes-devtools/pseudo/pseudo/renameat.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-commit 795f2b44b7f692151556782f142a4a6e7d45d892
-Author: Peter Seebach <peter.seebach@windriver.com>
-Date:   Thu Feb 2 15:49:21 2012 -0600
-
-    Implement renameat()
-    
-    After three long years, someone tried to use this.  This was impossibly
-    hard back when pseudo was written, because there was only one dirfd
-    provided for.  Thing is, now, the canonicalization happens in wrapfuncs,
-    so a small tweak to makewrappers to recognize that oldpath should use
-    olddirfd if it exists is enough to get us fully canonicalized paths
-    when needed.
-    
-    Also fix the crash if base_path gets called with an fd for which we have
-    no path.
-
-Upstream-Status: Backport
-
-diff --git a/ChangeLog.txt b/ChangeLog.txt
-index 9625b38..25bd463 100644
---- a/ChangeLog.txt
-+++ b/ChangeLog.txt
-@@ -1,6 +1,9 @@
- 2012-02-02:
- 	* (seebs) stash dir name for DIR * from opendir using dirfd.
- 	* (seebs) add closedir.
-+	* (seebs) add initial pass at renameat()
-+	* (seebs) in base_path, don't try to strlen the result if
-+	  fd_path() returns NULL.
- 
- 2011-11-02:
- 	* (seebs) Call this 1.2 because the UNLOAD change is moderately
-diff --git a/makewrappers b/makewrappers
-index 20bbf2b..bf344d6 100755
---- a/makewrappers
-+++ b/makewrappers
-@@ -211,12 +211,13 @@ class Function:
-         self.flags = '0'
-         self.port = port
-         self.directory = ''
--	self.version = 'NULL'
-+        self.version = 'NULL'
-         # On Darwin, some functions are SECRETLY converted to foo$INODE64
-         # when called.  So we have to look those up for real_*
-         self.inode64 = None
-         self.real_func = None
-         self.paths_to_munge = []
-+        self.dirfds = {}
-         self.hand_wrapped = None
-         # used for the copyright date when creating stub functions
-         self.date = datetime.date.today().year
-@@ -239,6 +240,7 @@ class Function:
-         # * If the arg has a name ending in 'path', we will canonicalize it.
-         # * If the arg is named 'dirfd' or 'flags', it becomes the default
-         #   values for the dirfd and flags arguments when canonicalizing.
-+        # * If the name ends in dirfd, we do the same fancy stuff.
-         # * Note that the "comments" field (/* ... */ after the decl) can
-         #   override the dirfd/flags values.
-         self.args = ArgumentList(bits.group(2))
-@@ -246,7 +248,9 @@ class Function:
-             # ignore varargs, they never get these special treatments
-             if arg.vararg:
-                 pass
--            elif arg.name == 'dirfd':
-+            elif arg.name[-5:] == 'dirfd':
-+                if len(arg.name) > 5:
-+                    self.dirfds[arg.name[:-5]] = True
-                 self.dirfd = 'dirfd'
-             elif arg.name == 'flags':
-                 self.flags = 'flags'
-@@ -325,9 +329,13 @@ class Function:
-         """create/allocate canonical paths"""
-         alloc_paths = []
-         for path in self.paths_to_munge:
-+            prefix = path[:-4]
-+	    if not prefix in self.dirfds:
-+                prefix = ''
-+            print "for path %s: prefix <%s>" % ( path, prefix )
-             alloc_paths.append(
--                "%s = pseudo_root_path(__func__, __LINE__, %s, %s, %s);" %
--                (path, self.dirfd, path, self.flags))
-+                "%s = pseudo_root_path(__func__, __LINE__, %s%s, %s, %s);" %
-+                (path, prefix, self.dirfd, path, self.flags))
-         return "\n\t\t\t".join(alloc_paths)
- 
-     def free_paths(self):
-diff --git a/ports/unix/guts/renameat.c b/ports/unix/guts/renameat.c
-index c8203b7..f13cd1e 100644
---- a/ports/unix/guts/renameat.c
-+++ b/ports/unix/guts/renameat.c
-@@ -1,15 +1,111 @@
- /* 
-- * Copyright (c) 2008-2010 Wind River Systems; see
-+ * Copyright (c) 2008-2012 Wind River Systems; see
-  * guts/COPYRIGHT for information.
-  *
-  * static int
-  * wrap_renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) {
-  *	int rc = -1;
-  */
-+ 	pseudo_msg_t *msg;
-+ 	struct stat oldbuf, newbuf;
-+	int oldrc, newrc;
-+	int save_errno;
-+	int old_db_entry = 0;
- 
--	pseudo_diag("help! unimplemented renameat [%s -> %s].\n", oldpath, newpath);
-+	pseudo_debug(2, "renameat: %d,%s->%d,%s\n",
-+		olddirfd, oldpath ? oldpath : "<nil>",
-+		newdirfd, newpath ? newpath : "<nil>");
-+
-+#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS
-+	if (olddirfd != AT_FDCWD || newdirfd != AT_FDCWD) {
-+		errno = ENOSYS;
-+		return -1;
-+	}
-+#endif
-+
-+	if (!oldpath || !newpath) {
-+		errno = EFAULT;
-+		return -1;
-+	}
-+
-+	save_errno = errno;
-+
-+#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS
-+	newrc = real_lstat(newpath, &newbuf);
-+	oldrc = real_lstat(oldpath, &oldbuf);
-+#else
-+	oldrc = real___fxstatat(_STAT_VER, olddirfd, oldpath, &oldbuf, AT_SYMLINK_NOFOLLOW);
-+	newrc = real___fxstatat(_STAT_VER, newdirfd, newpath, &newbuf, AT_SYMLINK_NOFOLLOW);
-+#endif
-+
-+	errno = save_errno;
-+
-+	/* newpath must be removed. */
-+	/* as with unlink, we have to mark that the file may get deleted */
-+	msg = pseudo_client_op_plain(OP_MAY_UNLINK, 0, -1, newdirfd, newpath, newrc ? NULL : &newbuf);
-+	if (msg && msg->result == RESULT_SUCCEED)
-+		old_db_entry = 1;
- 	rc = real_renameat(olddirfd, oldpath, newdirfd, newpath);
-+	save_errno = errno;
-+	if (old_db_entry) {
-+		if (rc == -1) {
-+			/* since we failed, that wasn't really unlinked -- put
-+			 * it back.
-+			 */
-+			pseudo_client_op_plain(OP_CANCEL_UNLINK, 0, -1, newdirfd, newpath, &newbuf);
-+		} else {
-+			/* confirm that the file was removed */
-+			pseudo_client_op_plain(OP_DID_UNLINK, 0, -1, newdirfd, newpath, &newbuf);
-+		}
-+	}
-+	if (rc == -1) {
-+		/* and we're done. */
-+		errno = save_errno;
-+		return rc;
-+	}
-+	save_errno = errno;
-+	/* nothing to do for a "rename" of a link to itself */
-+	if (newrc != -1 && oldrc != -1 &&
-+	    newbuf.st_dev == oldbuf.st_dev &&
-+	    newbuf.st_ino == oldbuf.st_ino) {
-+		return rc;
-+        }
-+
-+	/* rename(3) is not mv(1).  rename(file, dir) fails; you must provide
-+	 * the corrected path yourself.  You can rename over a directory only
-+	 * if the source is a directory.  Symlinks are simply removed.
-+	 *
-+	 * If we got here, the real rename call succeeded.  That means newpath
-+	 * has been unlinked and oldpath has been linked to it.
-+	 *
-+	 * There are a ton of special cases to error check.  I don't check
-+	 * for any of them, because in every such case, the underlying rename
-+	 * failed, and there is nothing to do.
-+	 * The only tricky part is that, because we used to ignore symlinks,
-+	 * we may have to rename or remove directory trees even though in
-+	 * theory rename can never destroy a directory tree.
-+	 */
-+	if (!old_db_entry) {
-+		/* create an entry under the old name, which will then be
-+		 * renamed; this way, children would get renamed too, if there
-+		 * were any.
-+		 */
-+		if (newrc == 0) {
-+			if (newbuf.st_dev != oldbuf.st_dev) {
-+				oldbuf.st_dev = newbuf.st_dev;
-+				oldbuf.st_ino = newbuf.st_ino;
-+			}
-+		}
-+		pseudo_debug(1, "creating new '%s' [%llu] to rename\n",
-+			oldpath, (unsigned long long) oldbuf.st_ino);
-+		pseudo_client_op_plain(OP_LINK, 0, -1, olddirfd, oldpath, &oldbuf);
-+	}
-+	/* special case: use 'fd' for olddirfd, because
-+	 * we know it has no other meaning for RENAME
-+	 */
-+	pseudo_client_op_plain(OP_RENAME, 0, olddirfd, newdirfd, newpath, &oldbuf, oldpath);
- 
-+	errno = save_errno;
- /*	return rc;
-  * }
-  */
-diff --git a/pseudo_client.c b/pseudo_client.c
-index 48607c2..4a30420 100644
---- a/pseudo_client.c
-+++ b/pseudo_client.c
-@@ -988,6 +988,8 @@ base_path(int dirfd, const char *path, int leave_last) {
- 		if (dirfd != -1 && dirfd != AT_FDCWD) {
- 			if (dirfd >= 0) {
- 				basepath = fd_path(dirfd);
-+			}
-+			if (basepath) {
- 				baselen = strlen(basepath);
- 			} else {
- 				pseudo_diag("got *at() syscall for unknown directory, fd %d\n", dirfd);
-@@ -1128,7 +1130,10 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path
- 	if (path) {
- 		pseudo_debug(2, " %s", path);
- 	}
--	if (fd != -1) {
-+	/* for OP_RENAME in renameat, "fd" is also used for the
-+	 * second dirfd.
-+	 */
-+	if (fd != -1 && op != OP_RENAME) {
- 		pseudo_debug(2, " [fd %d]", fd);
- 	}
- 	if (buf) {
diff --git a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
deleted file mode 100644
index f9223a8..0000000
--- a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Due to disabling the LD_LIBRARY_PATH handling, we need to use a static
-libsqlite.
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -ur git.orig/Makefile.in git/Makefile.in
---- git.orig/Makefile.in
-+++ git/Makefile.in
-@@ -55,7 +55,7 @@
- 
- # needed for anything that links with pseduo_client.o, pretty much
- CLIENT_LDFLAGS=-ldl -lpthread
--DB_LDFLAGS=-lsqlite3 -lpthread
-+DB_LDFLAGS=$(SQLITE)/lib/libsqlite3.a -lpthread
- 
- PSEUDO=$(BIN)/pseudo
- PSEUDODB=$(BIN)/pseudodb
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.2.bb b/meta/recipes-devtools/pseudo/pseudo_1.2.bb
deleted file mode 100644
index 9f95bd7..0000000
--- a/meta/recipes-devtools/pseudo/pseudo_1.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require pseudo.inc
-
-PR = "r6"
-
-SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://oe-config.patch \
-           file://static_sqlite.patch \
-           file://opendir.patch \
-           file://renameat.patch"
-
-SRC_URI[md5sum] = "a2819084bab7e991f06626d02cf55048"
-SRC_URI[sha256sum] = "4749a22df687f44d24c26e97170d4781a1bd52d5ee092364a40877e4d96ff058"
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.3.bb b/meta/recipes-devtools/pseudo/pseudo_1.3.bb
new file mode 100644
index 0000000..e7a329c
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo_1.3.bb
@@ -0,0 +1,8 @@
+require pseudo.inc
+
+PR = "r7"
+
+SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "5832bb70e6dce1a17b9b33a9c5c4b923"
+SRC_URI[sha256sum] = "2f30e2e9ec966cec3a321fc2ed80408ee77ad6c0cd73aaf36f88b98e008f8508"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 4f8c9d6..9414c79 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,14 +1,12 @@
 require pseudo.inc
 
-SRCREV = "17c2233f93692f79684792750001ee6d13e03925"
-PV = "1.2+git${SRCPV}"
-PR = "r21"
+SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c"
+PV = "1.3+git${SRCPV}"
+PR = "r22"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \
-           file://oe-config.patch \
-           file://static_sqlite.patch"
+SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.3.4

[PATCH 2/2] scripts/bitbake: Update to help rebuild pseudo-native

[Mark Hatle]

Attempt to detect when pseudo-native has been updated.  If it has been updated,
or if the user is attempting an operation with pseudo-native in the name, force
a build of pseudo-native, prior to running the main build.

Note: This causes a build, then clean in the case of
   bitbake -c cleansstate pseudo-native

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 scripts/bitbake |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/scripts/bitbake b/scripts/bitbake
index 45c8697..eb9e14f 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -55,21 +55,47 @@ fi
 buildpseudo="1"
 if [ $needpseudo = "1" ] && [ -e "$BUILDDIR/pseudodone" ]; then
     PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
-    if [ -e "$PSEUDOBINDIR/pseudo" -a -e "$PSEUDOBINDIR/tar" -a "$needtar" = "1" ]; then
+    if [ -e "$PSEUDOBINDIR/pseudo" ]; then
         buildpseudo="0"
     fi
-    if [ -e "$PSEUDOBINDIR/pseudo" -a $needtar = "0" ]; then
-        buildpseudo="0"
+
+    # Verify that the pseudo recipes are older then the pseudodone file
+    PSEUDO_RECIPE="`dirname $0`/../meta/recipes-devtools/pseudo"
+    if [ $buildpseudo -eq 0 ] && [ ! -d "$PSEUDO_RECIPE" ]; then
+        echo "Unable to verify if pseudo-native is up to date..." >&2
+    elif [ $buildpseudo -eq 0 ]; then
+	PSEUDO_NEWER=`find $PSEUDO_RECIPE -type f -newer $BUILDDIR/pseudodone`
+	if [ -n "$PSEUDO_NEWER" ]; then
+            buildpseudo="2"
+	fi
     fi
 fi
+
+# If tar is already built, we don't want to do it again...
+if [ -e "$PSEUDOBINDIR/tar" -a "$needtar" = "1" ]; then
+    needtar="0"
+fi
+
 if [ $needpseudo = "0" ]; then
     buildpseudo="0"
 fi
 
+# If pseudo-native is an argument, assume the user wants to build pseudo-native!
+if [ $needpseudo != "0" -a $buildpseudo -eq 0 ]; then
+    for opt in $@; do
+        if [ "$opt" = "pseudo-native" ]; then
+            buildpseudo="3"
+            break
+        fi
+    done
+fi
+
 OLDPATH=$PATH
 export PATH=`echo $PATH | sed s#[^:]*/scripts:##`
-if [ $buildpseudo = "1" ]; then
-    echo "Pseudo is not present but is required, building this first before the main build"
+if [ $buildpseudo -gt 0 ]; then
+    [ $buildpseudo -eq 1 ] && echo "Pseudo is not present but is required, building this first before the main build"
+    [ $buildpseudo -eq 2 ] && echo "Pseudo may be out of date, rebuilding pseudo before the main build"
+    [ $buildpseudo -eq 3 ] && echo "Building pseudo-native before main build"
     export PSEUDO_BUILD=1
     TARTARGET="tar-replacement-native"
     if [ $needtar = "0" ]; then
-- 
1.7.3.4

Re: [PATCH 0/2] Update pseudo to version 1.3

[Saul Wold]

On 03/27/2012 02:57 PM, Mark Hatle wrote:
> Update pseudo to version 1.3 in order to fix Yocto Project bug #2181.
>
>> From the pseudo author:
>
> This patch updates pseudo to 1.3.  The biggest change is the creation of
> a new popen() wrapper, which fixes some strange PSEUDO_PREFIX errors that
> could occur running certain commands (those using os.popen()) outside of
> the pseudo environment after pseudo had been used.  However, this also
> uses the upstream versions of the opendir and renameat patches, merges in
> a new option for static linking of sqlite (and adds that configuration
> option to pseudo.inc), and merges in the oe-config patch.  So we're back
> to zero patches in tree and a clean upstream pseudo.
>
> In addition, a separate patch to the scripts/bitbake was created that should
> help ensure that on an upgrade of pseudo-native, pseudo-native is built
> prior to the main build.  Similarly to how things work when pseudodone
> does not exist.
>
> Testing notes...
> This was tested by starting with existing master, building core-image-minimal,
> then updating to the new version of pseudo recipes, and rerunning the
> core-image-minimal build.  The test was performed with both NO32LIBS=1 and
> NO32LIBS=0.  Testing was successful.
>
> The following changes since commit 7b01671f54f70c28c98457058c51ffefcb07c0e8:
>
>    nspr 4.8.9: failed to build on x86_64 board (2012-03-27 13:26:37 +0100)
>
> are available in the git repository at:
>    git://git.yoctoproject.org/poky-contrib mhatle/pseudo
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
>
> Mark Hatle (1):
>    scripts/bitbake: Update to help rebuild pseudo-native
>
> Peter Seebach (1):
>    Pseudo: Update to 1.3
>
>   meta/recipes-devtools/pseudo/pseudo.inc            |    4 +-
>   .../recipes-devtools/pseudo/pseudo/oe-config.patch |   58 -----
>   meta/recipes-devtools/pseudo/pseudo/opendir.patch  |   94 --------
>   meta/recipes-devtools/pseudo/pseudo/renameat.patch |  229 --------------------
>   .../pseudo/pseudo/static_sqlite.patch              |   17 --
>   meta/recipes-devtools/pseudo/pseudo_1.2.bb         |   12 -
>   meta/recipes-devtools/pseudo/pseudo_1.3.bb         |    8 +
>   meta/recipes-devtools/pseudo/pseudo_git.bb         |   10 +-
>   scripts/bitbake                                    |   36 +++-
>   9 files changed, 45 insertions(+), 423 deletions(-)
>   delete mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch
>   delete mode 100644 meta/recipes-devtools/pseudo/pseudo/opendir.patch
>   delete mode 100644 meta/recipes-devtools/pseudo/pseudo/renameat.patch
>   delete mode 100644 meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
>   delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.2.bb
>   create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.3.bb
>

Merged into OE-Core

Thanks
	Sau!