diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-kernel')
10 files changed, 32 insertions, 264 deletions
diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch deleted file mode 100644 index 8355fe44ea..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 52fc1a7c17768fd52c3577d21dad84e8babb94b5 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Thu, 6 Apr 2017 23:01:14 -0400 -Subject: [PATCH 2/3] crash: fix build error unknown type name 'gdb_fpregset_t' - -Upstream-Status: Pending - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - gdb-7.6/gdb/gdb_proc_service.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gdb-7.6/gdb/gdb_proc_service.h b/gdb-7.6/gdb/gdb_proc_service.h -index 8bc6088..99c6496 100644 ---- a/gdb-7.6/gdb/gdb_proc_service.h -+++ b/gdb-7.6/gdb/gdb_proc_service.h -@@ -20,6 +20,7 @@ - #define GDB_PROC_SERVICE_H - - #include <sys/types.h> -+#include "gregset.h" - - #ifdef HAVE_PROC_SERVICE_H - #include <proc_service.h> -@@ -53,8 +54,6 @@ - #include <sys/procfs.h> - #endif - --#include "gregset.h" -- - /* Functions in this interface return one of these status codes. */ - typedef enum - { --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch deleted file mode 100644 index 1f4bd01da4..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c7950ef5228adc52a500b4fc67d7e48c3c09c1df Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Thu, 6 Apr 2017 23:02:44 -0400 -Subject: [PATCH 3/3] crash: detect the sysroot's glibc header file - -This is cross compile, so let the Makefile detect the sysroot's glibc -header file, not the host's glibc header file. - -Upstream-Status: Pending - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index b6b7e80..94f21a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -264,8 +264,8 @@ gdb_patch: - if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f ${GDB}-ppc64le-support.patch ]; then \ - patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ - fi -- if [ -f /usr/include/proc_service.h ]; then \ -- grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \ -+ if [ -f ${RECIPE_SYSROOT}/usr/include/proc_service.h ]; then \ -+ grep 'extern ps_err_e ps_get_thread_area (struct' ${RECIPE_SYSROOT}/usr/include/proc_service.h; \ - if [ $$? -eq 0 ]; then \ - patch -p0 < ${GDB}-proc_service.h.patch; \ - fi; \ --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch deleted file mode 100644 index 37d43b8887..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Pending - -It fails to build crash for mips with error: - -| mips-wrs-linux-gcc: error: unrecognized command line option '-m32' -| Makefile:291: recipe for target 'make_build_data' failed - -So remove the unrecognized option '-m32' for mips. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/configure.c b/configure.c -index cf1973b..71e97b3 100644 ---- a/configure.c -+++ b/configure.c -@@ -155,7 +155,7 @@ void add_extra_lib(char *); - #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" - #define TARGET_CFLAGS_MIPS "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" - #define TARGET_CFLAGS_MIPS_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" --#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" -+#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" - #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" - #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" - -@@ -167,7 +167,7 @@ void add_extra_lib(char *); - #define GDB_TARGET_ARM64_ON_X86_64 "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ - #define GDB_TARGET_PPC64_ON_X86_64 "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" - #define GDB_TARGET_MIPS_ON_X86 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" --#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux CFLAGS=-m32" -+#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" - - /* - * The original plan was to allow the use of a particular version diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch deleted file mode 100644 index 0185b57045..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch +++ /dev/null @@ -1,79 +0,0 @@ -Upstream-Status: Backport - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=92fc615 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> --- -From 92fc6153a6fdf2a027d9780f5945712aafad4a9e Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 29 Mar 2015 15:59:01 -0400 -Subject: [PATCH] sim: common: sim-arange: fix extern inline handling - -With newer versions of gcc (5.x), the extern inline we're using with the -sim-arange module no longer works. Since this code really wants the gnu -inline semantics, use that attribute explicitly. - -Reported-by: DJ Delorie <dj@redhat.com> -Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com> ---- - gdb-7.6/sim/common/sim-arange.h | 20 ++++++++++++-------- - gdb-7.6/sim/common/sim-inline.h | 4 +++- - 2 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/gdb-7.6/sim/common/sim-arange.h b/gdb-7.6/sim/common/sim-arange.h -index 73117f3..de842c9 100644 ---- a/gdb-7.6/sim/common/sim-arange.h -+++ b/gdb-7.6/sim/common/sim-arange.h -@@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/, - address_word /*start*/, - address_word /*end*/); - -+/* TODO: This should get moved into sim-inline.h. */ -+#ifdef HAVE_INLINE -+#ifdef SIM_ARANGE_C -+#define SIM_ARANGE_INLINE INLINE -+#else -+#define SIM_ARANGE_INLINE EXTERN_INLINE -+#endif -+#else -+#define SIM_ARANGE_INLINE EXTERN -+#endif -+ - /* Return non-zero if ADDR is in range AR, traversing the entire tree. - If no range is specified, that is defined to mean "everything". */ --extern INLINE int -+SIM_ARANGE_INLINE int - sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); - #define ADDR_RANGE_HIT_P(ar, addr) \ - ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) - - #ifdef HAVE_INLINE --#ifdef SIM_ARANGE_C --#define SIM_ARANGE_INLINE INLINE --#else --#define SIM_ARANGE_INLINE EXTERN_INLINE --#endif - #include "sim-arange.c" --#else --#define SIM_ARANGE_INLINE - #endif - #define SIM_ARANGE_C_INCLUDED - -diff --git a/gdb-7.6/sim/common/sim-inline.h b/gdb-7.6/sim/common/sim-inline.h -index af75562..8a9c286 100644 ---- a/gdb-7.6/sim/common/sim-inline.h -+++ b/gdb-7.6/sim/common/sim-inline.h -@@ -303,7 +303,9 @@ - /* ??? Temporary, pending decision to always use extern inline and do a vast - cleanup of inline support. */ - #ifndef INLINE2 --#if defined (__GNUC__) -+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__) -+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__)) -+#elif defined (__GNUC__) - #define INLINE2 __inline__ - #else - #define INLINE2 /*inline*/ --- -2.6.1 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch deleted file mode 100644 index 77a287f146..0000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Backport - -https://sourceware.org/git/?p=binutils-gdb.git;h=0d8a6ab - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 0d8a6ab7d39d28fb1557e2a62e9e4b336341ab34 Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen <aaro.koskinen@iki.fi> -Date: Mon, 17 Feb 2014 17:12:59 -0500 -Subject: [PATCH] sim: ppc: drop $(LIBS) from psim dependency - -When cross-compiling GDB for PPC, there's a prerequisite "-lz" for psim -that results in a build failure. With such prerequisite, GNU Make will -try to search the library from build machine's /usr/lib which is wrong. -On 64-bit Linux build machines the compilation will fail because of this. - -URL: https://sourceware.org/bugzilla/show_bug.cgi?id=12202 ---- - sim/ppc/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gdb-7.6/sim/ppc/Makefile.in b/gdb-7.6/sim/ppc/Makefile.in -index b811f6f..740bdb0 100644 ---- a/gdb-7.6/sim/ppc/Makefile.in -+++ b/gdb-7.6/sim/ppc/Makefile.in -@@ -552,7 +552,7 @@ PACKAGE_SRC = @sim_pk_src@ - PACKAGE_OBJ = @sim_pk_obj@ - - --psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP) -+psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) - - run: psim --- -1.9.4 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.0.bb index d4aa0d52b0..55de6a604b 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.0.bb @@ -14,22 +14,16 @@ DEPENDS = "zlib readline coreutils-native ncurses-native" S = "${WORKDIR}/git" SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ - ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ + ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \ file://7001force_define_architecture.patch \ file://7003cross_ranlib.patch \ file://0001-cross_add_configure_option.patch \ - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ - file://sim-common-sim-arange-fix-extern-inline-handling.patch \ file://donnot-extract-gdb-during-do-compile.patch \ file://gdb_build_jobs_and_not_write_crash_target.patch \ - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ - file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ - file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" +SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" -SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" +SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" @@ -78,6 +72,7 @@ do_compile:prepend() { sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c + sed -i -e 's/#define TARGET_CFLAGS_MIPS_ON_X86_64.*/#define TARGET_CFLAGS_MIPS_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c sed -i 's/>/>/g' ${S}/Makefile } diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb index 067f58b79d..461e6b05ed 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 DEPENDS = "zlib elfutils" SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" -SRCREV = "5579664205e42194e1921d69d0839f660c801a4d" +SRCREV = "2cd2d03f63242c048a896179398c68d2dbefe3d6" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb index e476370e05..d2d2512b2c 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedba UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" -EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\"" +EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\" DBG='-g -Wall -Wextra -Wno-unused-parameter'" EXTRA_OEMAKE:append:powerpc = " ARCH=\"powerpc\"" EXTRA_OEMAKE:append:powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" EXTRA_OEMAKE:append:powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index 1dd87c8b11..f3dc8a466a 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -1,6 +1,6 @@ -From af97e2ad643334b4c7c3d66f971ce9ebb2b596af Mon Sep 17 00:00:00 2001 +From 71b5a3905d5cd0feca88a0d61d7657ba5296a052 Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 21 Jul 2016 18:06:21 +0800 +Date: Sun, 24 Apr 2022 17:25:33 +0800 Subject: [PATCH] makedumpfile: replace hardcode CFLAGS * Create alias for target such as powerpc as powerpc32 @@ -16,9 +16,12 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> [2021-11-18] Patch updated to use CFLAGS_COMMON for zstd Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> + +Rebase to 1.7.1 +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- - Makefile | 47 ++++++++++++++++++++++++----------------------- - 1 file changed, 24 insertions(+), 23 deletions(-) + Makefile | 42 ++++++++++++++++++++++-------------------- + 1 file changed, 22 insertions(+), 20 deletions(-) --- a/Makefile +++ b/Makefile @@ -35,19 +38,13 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> HOST_ARCH := $(shell uname -m) # Use TARGET as the target architecture if specified. # Defaults to uname -m -@@ -21,29 +15,36 @@ ifeq ($(strip($TARGET)),) - TARGET := $(HOST_ARCH) - endif - --ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -- -e s/arm.*/arm/ -e s/sa110/arm/ \ -- -e s/s390x/s390/ -e s/parisc64/parisc/ \ +@@ -24,26 +18,34 @@ endif + ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/) -+ARCH := $(shell echo __${TARGET}__ | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -+ -e s/arm.*/arm/ -e s/sa110/arm/ \ -+ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -+ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \ -+ -e s/_powerpc_/_powerpc32_/) ++ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \ ++ -e s/_powerpc_/_powerpc32_/) CROSS := ifneq ($(TARGET), $(HOST_ARCH)) @@ -55,8 +52,7 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> endif -CFLAGS += -D__$(ARCH)__ $(CROSS) --CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS) -+CFLAGS_ARCH += -D$(ARCH) $(CROSS) + CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS) -ifeq ($(ARCH), powerpc64) -CFLAGS += -m64 @@ -79,10 +75,11 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> + -DVERSION='"$(VERSION)"' \ + -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 printk.c + SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) @@ -97,7 +94,7 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> endif ifeq ($(USESNAPPY), on) -@@ -65,12 +66,12 @@ LIBS := -lsnappy $(LIBS) +@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS) ifneq ($(LINKTYPE), dynamic) LIBS := $(LIBS) -lstdc++ endif @@ -112,7 +109,7 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> endif ifeq ($(DEBUG), on) -@@ -104,14 +105,14 @@ LIBS := $(LIBS) $(call try-run,\ +@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -126,15 +123,15 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) + $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) - echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 - grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 - mv temp.8 makedumpfile.8 -@@ -122,7 +123,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( - gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz + @sed -e "s/@DATE@/$(DATE)/" \ + -e "s/@VERSION@/$(VERSION)/" \ + $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8 +@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( + $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5 eppic_makedumpfile.so: extension_eppic.c - $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo + $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo clean: - rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz + rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5 diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb index d4da031866..c3f965b041 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPL-2.0-only" SRCBRANCH ?= "master" -SRCREV = "06ef8e2b814feb08a668b7a3783c86674e49a7b1" +SRCREV = "74bbdd14ec861552ace1ca63953eb2ef73e1f965" DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS:${PN}-tools = "perl ${PN}" @@ -52,12 +52,6 @@ do_install () { install -m 755 ${S}/makedumpfile ${D}/usr/bin install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin - mkdir -p ${D}/usr/share/man/man8 - install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8 - - mkdir -p ${D}/usr/share/man/man5 - install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5 - mkdir -p ${D}/etc/ install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample } |