From 7a873e61d55dcea56dc5b45adfbc4ab18a58e976 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 8 Sep 2017 15:08:37 -0700 Subject: minicoredumper: Switch src_uri to upstream lf git COPYING file changed since copyright is now assined to linutronix from Erricson Fix build on arm Fixes error like corestripper.c:1245:4: error: format specifies type 'unsigned long' but the arg ument has type 'long long' [-Werror,-Wformat] Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../files/0001-fix-compile-error-on-arch-x32.patch | 32 ++++++++++++++++++++++ .../minicoredumper/minicoredumper_2.0.0.bb | 7 +++-- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch (limited to 'meta-oe/recipes-kernel') 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 new file mode 100644 index 0000000000..6ba6ad4814 --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch @@ -0,0 +1,32 @@ +From 883f53ee33eaef8aca1288a110857402ad362966 Mon Sep 17 00:00:00 2001 +From: John Ogness +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 +--- +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 3bf9f66b98..1858e102d8 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -1,7 +1,7 @@ SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ to allow minimal and customized crash dumps" LICENSE = " LGPLv2.1 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=709087c2ed0acda54a4d91497a889e42 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=aa846ae365f71b69e9fa0d21a56391ec \ file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ " @@ -9,14 +9,15 @@ DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRCREV = "248019446ccf6079926efb54f8b6dd7be769bbae" +SRCREV = "cdc1faf1212a51e89b477468876e229223fceb9a" PR .= "+git${SRCPV}" -SRC_URI = "git://github.com/Linutronix/minicoredumper-debian;branch=unstable \ +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" -- cgit 1.2.3-korg