summaryrefslogtreecommitdiffstats
path: root/meta-initramfs
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2018-09-04 23:21:37 +0200
committerKhem Raj <raj.khem@gmail.com>2018-09-05 13:59:15 -0700
commit40ccddb62ca36d89927febf2387564f396c0d4b0 (patch)
tree640604d5117df854207cf405c60573ad030cef21 /meta-initramfs
parent2e07aa7804c7162bc8acd06f01c4c6e1e83451c9 (diff)
downloadmeta-openembedded-40ccddb62ca36d89927febf2387564f396c0d4b0.tar.gz
kexec-tools-klibc: rebase x86_kexec_test.patch
After last upgrade this patch does not apply anymore. Replace the previous hack just commenting out the two lines (package vmcore-dmesg as well). Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs')
-rw-r--r--meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch
index b7d7c1039..1c471f559 100644
--- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch
+++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch
@@ -14,17 +14,17 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
14 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/Makefile.in b/Makefile.in 16diff --git a/Makefile.in b/Makefile.in
17index 79188d8..953c141 100644 17index fb01134..440730d 100644
18--- a/Makefile.in 18--- a/Makefile.in
19+++ b/Makefile.in 19+++ b/Makefile.in
20@@ -178,8 +178,8 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) 20@@ -173,8 +173,8 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
21 PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) 21 PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
22 22
23 MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE) 23 MAN_PAGES:=$(KEXEC_MANPAGE) $(VMCORE_DMESG_MANPAGE)
24-BINARIES_i386:=$(KEXEC_TEST) 24-BINARIES_i386:=$(KEXEC_TEST)
25-BINARIES_x86_64:=$(KEXEC_TEST) 25-BINARIES_x86_64:=$(KEXEC_TEST)
26+BINARIES_i386:=$(SBINDIR)/kexec 26+#BINARIES_i386:=$(KEXEC_TEST)
27+BINARIES_x86_64:=$(SBINDIR)/kexec 27+#BINARIES_x86_64:=$(KEXEC_TEST)
28 BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH)) 28 BINARIES:=$(KEXEC) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
29 29
30 TARGETS:=$(BINARIES) $(MAN_PAGES) 30 UNINSTALL_KDUMP = $(sbindir)/kdump