Drop upstreamed patch Signed-off-by: Khem Raj <[email protected]> --- .../0001-fix-compile-error-on-arch-x32.patch | 32 ------------------- .../minicoredumper/minicoredumper_2.0.0.bb | 3 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch
diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch deleted file mode 100644 index 6ba6ad4814..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 883f53ee33eaef8aca1288a110857402ad362966 Mon Sep 17 00:00:00 2001 -From: John Ogness <[email protected]> -Date: Fri, 8 Sep 2017 15:03:03 -0700 -Subject: [PATCH] fix compile error on arch=x32 - -On the x32 architecture time_t is a "long long int". By - typecasting time_t to "long long", this should work correctly - for all architectures. - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - - src/minicoredumper/corestripper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c -index fd39bfb..07dc318 100644 ---- a/src/minicoredumper/corestripper.c -+++ b/src/minicoredumper/corestripper.c -@@ -1241,7 +1241,7 @@ static int dump_compressed_tar(struct dump_info *di) - snprintf(hdr.mode, sizeof(hdr.mode), "%07o", 0644); - snprintf(hdr.uid, sizeof(hdr.uid), "%07o", 0); - snprintf(hdr.gid, sizeof(hdr.gid), "%07o", 0); -- snprintf(hdr.mtime, sizeof(hdr.mtime), "%011lo", -+ snprintf(hdr.mtime, sizeof(hdr.mtime), "%011llo", - (long long)time(NULL)); - memset(hdr.checksum, ' ', sizeof(hdr.checksum)); - hdr.type = 'S'; --- -2.14.1 - diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index 0d3c66b07a..27348f750c 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -9,7 +9,7 @@ DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRCREV = "cdc1faf1212a51e89b477468876e229223fceb9a" +SRCREV = "1c0d5960b0bb4bac7566e6afe8bc9705399cc76b" PR .= "+git${SRCPV}" @@ -17,7 +17,6 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/minicoredumper.git;protocol=http file://minicoredumper.service \ file://minicoredumper.init \ file://0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch \ - file://0001-fix-compile-error-on-arch-x32.patch \ " S = "${WORKDIR}/git" -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
