summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-18 16:12:36 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-18 16:12:36 +0100
commitc012f487664640a65cf03b8442b6a7213161ead5 (patch)
tree940c6ef9b63387d38135de819df17df7033e75af
parent7f43a8279028f843b636146e525b9ccc1a5168a6 (diff)
hudson says again: missing patch
-rw-r--r--package/kexec-tools/Makefile2
-rw-r--r--package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c41
2 files changed, 42 insertions, 1 deletions
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 4cd6a9697..3ebdc2f6b 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= kexec-tools
PKG_VERSION:= 2.0.5
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257
PKG_DESCR:= kexec tools
PKG_SECTION:= misc
diff --git a/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c
new file mode 100644
index 000000000..5f6484789
--- /dev/null
+++ b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c
@@ -0,0 +1,41 @@
+--- kexec-tools-2.0.5.orig/vmcore-dmesg/vmcore-dmesg.c 2014-01-15 00:51:14.000000000 +0100
++++ kexec-tools-2.0.5/vmcore-dmesg/vmcore-dmesg.c 2014-03-18 15:00:45.000000000 +0100
+@@ -26,14 +26,14 @@ static Elf64_Ehdr ehdr;
+ static Elf64_Phdr *phdr;
+
+ static char osrelease[4096];
+-static loff_t log_buf_vaddr;
+-static loff_t log_end_vaddr;
+-static loff_t log_buf_len_vaddr;
+-static loff_t logged_chars_vaddr;
++static off_t log_buf_vaddr;
++static off_t log_end_vaddr;
++static off_t log_buf_len_vaddr;
++static off_t logged_chars_vaddr;
+
+ /* record format logs */
+-static loff_t log_first_idx_vaddr;
+-static loff_t log_next_idx_vaddr;
++static off_t log_first_idx_vaddr;
++static off_t log_next_idx_vaddr;
+
+ /* struct log size */
+ static uint64_t log_sz;
+@@ -266,7 +266,7 @@ static void scan_vmcoreinfo(char *start,
+ const char *str;
+ const char *name;
+ size_t len;
+- loff_t *vaddr;
++ off_t *vaddr;
+ } symbol[] = {
+ SYMBOL(log_buf),
+ SYMBOL(log_end),
+@@ -344,7 +344,7 @@ static void scan_vmcoreinfo(char *start,
+ }
+ }
+
+-static void scan_notes(int fd, loff_t start, loff_t lsize)
++static void scan_notes(int fd, off_t start, off_t lsize)
+ {
+ char *buf, *last, *note, *next;
+ size_t size;