summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/pseudo-exec-crash.patch20
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb3
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 8d98eef0f6..6de6fd8ac4 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"
150SRCREV_pn-prelink ??= "${PRELINKSRCREV}" 150SRCREV_pn-prelink ??= "${PRELINKSRCREV}"
151SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}" 151SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}"
152SRCREV_pn-psplash ??= "424" 152SRCREV_pn-psplash ??= "424"
153PSEUDOSRCREV ??= "a1b25a64d8dd012bc8adcac1e1e09b6291c877ad" 153PSEUDOSRCREV ??= "bcb42d80c0817da5479ab9c4f2cd8c4727e98ef8"
154SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}" 154SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}"
155SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}" 155SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}"
156SRCREV_pn-pseudo-nativesdk ??= "${PSEUDOSRCREV}" 156SRCREV_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 a73ed64804..0000000000
--- a/meta/recipes-devtools/pseudo/pseudo/pseudo-exec-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1The cached data values were being collected when an OP_EXEC call was made.
2This is incorrect as the values are only for logging purposes. It's believed
3this caused an occasional crash in certain instances.
4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6
7diff --git a/pseudo.c b/pseudo.c
8index efee436..62f28f3 100644
9--- a/pseudo.c
10+++ b/pseudo.c
11@@ -1021,7 +1021,8 @@ pseudo_op(pseudo_msg_t *msg, const char *program, const char *tag) {
12 if (msg->op != OP_MAY_UNLINK &&
13 msg->op != OP_DID_UNLINK &&
14 msg->op != OP_CANCEL_UNLINK &&
15- msg->op != OP_UNLINK) {
16+ msg->op != OP_UNLINK &&
17+ msg->op != OP_EXEC ) {
18 cache_msg = *msg;
19
20 if (path_by_ino) {
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 6645033c3e..4e94df7e8c 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -6,11 +6,10 @@ LICENSE = "LGPL2.1"
6DEPENDS = "sqlite3" 6DEPENDS = "sqlite3"
7 7
8PV = "0.0+git${SRCPV}" 8PV = "0.0+git${SRCPV}"
9PR = "r16" 9PR = "r17"
10 10
11SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ 11SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \
12 file://static_sqlite.patch \ 12 file://static_sqlite.patch \
13 file://pseudo-exec-crash.patch \
14 " 13 "
15 14
16FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo" 15FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo"