diff options
3 files changed, 7 insertions, 11 deletions
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 <mingli.yu@windriver.com> | |||
| 17 | Makefile | 45 +++++++++++++++++++++++---------------------- | 17 | Makefile | 45 +++++++++++++++++++++++---------------------- |
| 18 | 1 file changed, 23 insertions(+), 22 deletions(-) | 18 | 1 file changed, 23 insertions(+), 22 deletions(-) |
| 19 | 19 | ||
| 20 | Index: git/Makefile | 20 | --- a/Makefile |
| 21 | =================================================================== | 21 | +++ b/Makefile |
| 22 | --- git.orig/Makefile | ||
| 23 | +++ git/Makefile | ||
| 24 | @@ -8,12 +8,6 @@ ifeq ($(strip $CC),) | 22 | @@ -8,12 +8,6 @@ ifeq ($(strip $CC),) |
| 25 | CC = gcc | 23 | CC = gcc |
| 26 | endif | 24 | endif |
| @@ -79,7 +77,7 @@ Index: git/Makefile | |||
| 79 | + -DRELEASE_DATE='"$(DATE)"' | 77 | + -DRELEASE_DATE='"$(DATE)"' |
| 80 | + | 78 | + |
| 81 | SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h | 79 | SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h |
| 82 | SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c | 80 | SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c |
| 83 | OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) | 81 | OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) |
| 84 | @@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) | 82 | @@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) |
| 85 | 83 | ||
| @@ -104,7 +102,7 @@ Index: git/Makefile | |||
| 104 | +CFLAGS_COMMON += -DUSESNAPPY | 102 | +CFLAGS_COMMON += -DUSESNAPPY |
| 105 | endif | 103 | endif |
| 106 | 104 | ||
| 107 | LIBS := -lpthread $(LIBS) | 105 | LIBS := $(LIBS) -lpthread |
| 108 | @@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ | 106 | @@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ |
| 109 | all: makedumpfile | 107 | all: makedumpfile |
| 110 | 108 | ||
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 <mingli.yu@windriver.com> | |||
| 28 | arch/ppc64.c | 38 ++------------------------------------ | 28 | arch/ppc64.c | 38 ++------------------------------------ |
| 29 | 1 file changed, 2 insertions(+), 36 deletions(-) | 29 | 1 file changed, 2 insertions(+), 36 deletions(-) |
| 30 | 30 | ||
| 31 | Index: git/arch/ppc64.c | 31 | --- a/arch/ppc64.c |
| 32 | =================================================================== | 32 | +++ b/arch/ppc64.c |
| 33 | --- git.orig/arch/ppc64.c | ||
| 34 | +++ git/arch/ppc64.c | ||
| 35 | @@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) | 33 | @@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) |
| 36 | return paddr; | 34 | return paddr; |
| 37 | } | 35 | } |
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" | |||
| 11 | LICENSE = "GPLv2.0" | 11 | LICENSE = "GPLv2.0" |
| 12 | 12 | ||
| 13 | SRCBRANCH ?= "master" | 13 | SRCBRANCH ?= "master" |
| 14 | SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062" | 14 | SRCREV = "a8250642a4ff50a2559446f4e915a1f59ac7adf7" |
| 15 | 15 | ||
| 16 | DEPENDS = "bzip2 zlib elfutils xz" | 16 | DEPENDS = "bzip2 zlib elfutils xz" |
| 17 | RDEPENDS_${PN}-tools = "perl ${PN}" | 17 | RDEPENDS_${PN}-tools = "perl ${PN}" |
