From 5f3f16214532f489e46f1cb4f506727a26c0a359 Mon Sep 17 00:00:00 2001 From: Bruce Mitchell Date: Thu, 6 May 2021 10:20:52 -0500 Subject: makedumpfile: Bump srcrev supports for kernel 5.10, prior to 1.6.9 release Signed-off-by: Khem Raj --- .../0001-makedumpfile-replace-hardcode-CFLAGS.patch | 10 ++++------ ...-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch | 6 ++---- meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index 270cc35625..2b108ab6c9 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -17,10 +17,8 @@ Signed-off-by: Mingli Yu Makefile | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile +--- a/Makefile ++++ b/Makefile @@ -8,12 +8,6 @@ ifeq ($(strip $CC),) CC = gcc endif @@ -79,7 +77,7 @@ Index: git/Makefile + -DRELEASE_DATE='"$(DATE)"' + SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h - SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c + SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) @@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) @@ -104,7 +102,7 @@ Index: git/Makefile +CFLAGS_COMMON += -DUSESNAPPY endif - LIBS := -lpthread $(LIBS) + LIBS := $(LIBS) -lpthread @@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index 85d8833657..f46fb3117a 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch @@ -28,10 +28,8 @@ Signed-off-by: Mingli Yu arch/ppc64.c | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) -Index: git/arch/ppc64.c -=================================================================== ---- git.orig/arch/ppc64.c -+++ git/arch/ppc64.c +--- a/arch/ppc64.c ++++ b/arch/ppc64.c @@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) return paddr; } diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb index 4754651247..50227ea0f2 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPLv2.0" SRCBRANCH ?= "master" -SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062" +SRCREV = "a8250642a4ff50a2559446f4e915a1f59ac7adf7" DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS_${PN}-tools = "perl ${PN}" -- cgit 1.2.3-korg