diff options
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/pseudo-exec-crash.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_git.bb | 3 |
3 files changed, 2 insertions, 23 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 8d98eef0f..6de6fd8ac 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -150,7 +150,7 @@ PRELINKSRCREV ??= "909470ee441237563d6236c505cb2d02ddc48704" SRCREV_pn-prelink ??= "${PRELINKSRCREV}" SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}" SRCREV_pn-psplash ??= "424" -PSEUDOSRCREV ??= "a1b25a64d8dd012bc8adcac1e1e09b6291c877ad" +PSEUDOSRCREV ??= "bcb42d80c0817da5479ab9c4f2cd8c4727e98ef8" SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}" SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}" SRCREV_pn-pseudo-nativesdk ??= "${PSEUDOSRCREV}" diff --git a/meta/recipes-devtools/pseudo/pseudo/pseudo-exec-crash.patch b/meta/recipes-devtools/pseudo/pseudo/pseudo-exec-crash.patch deleted file mode 100644 index a73ed6480..000000000 --- a/meta/recipes-devtools/pseudo/pseudo/pseudo-exec-crash.patch +++ /dev/null @@ -1,20 +0,0 @@ -The cached data values were being collected when an OP_EXEC call was made. -This is incorrect as the values are only for logging purposes. It's believed -this caused an occasional crash in certain instances. - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -diff --git a/pseudo.c b/pseudo.c -index efee436..62f28f3 100644 ---- a/pseudo.c -+++ b/pseudo.c -@@ -1021,7 +1021,8 @@ pseudo_op(pseudo_msg_t *msg, const char *program, const char *tag) { - if (msg->op != OP_MAY_UNLINK && - msg->op != OP_DID_UNLINK && - msg->op != OP_CANCEL_UNLINK && -- msg->op != OP_UNLINK) { -+ msg->op != OP_UNLINK && -+ msg->op != OP_EXEC ) { - cache_msg = *msg; - - if (path_by_ino) { diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 6645033c3..4e94df7e8 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -6,11 +6,10 @@ LICENSE = "LGPL2.1" DEPENDS = "sqlite3" PV = "0.0+git${SRCPV}" -PR = "r16" +PR = "r17" SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ file://static_sqlite.patch \ - file://pseudo-exec-crash.patch \ " FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo" |