From 364bdfb6058e001024617c6e335e5f3cd41538bf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 11 Sep 2019 15:59:29 +0200 Subject: kexec: update Signed-off-by: Waldemar Brodkorb --- package/kexec-tools/Makefile | 4 +-- .../patches/patch-vmcore-dmesg_vmcore-dmesg_c | 41 ---------------------- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 1600522b7..55737c7cc 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.17 +PKG_VERSION:= 2.0.20 PKG_RELEASE:= 1 -PKG_HASH:= 504c816b769da573167b63f3b6d4fce3740f231c98d8db0c4fda47a4b90482a9 +PKG_HASH:= dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib diff --git a/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c deleted file mode 100644 index 5f6484789..000000000 --- a/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c +++ /dev/null @@ -1,41 +0,0 @@ ---- 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; -- cgit v1.2.3