summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2017-12-17 08:34:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:38 +0000
commit141a535df3a30116c0eddd064498274108b9c664 (patch)
treed34d14163f2e820d3eee356efc7fbc541e756654 /meta/recipes-kernel
parent7056393dd26de6a62b96b82e182595b5af6f4a9f (diff)
downloadpoky-141a535df3a30116c0eddd064498274108b9c664.tar.gz
kexec-tools: update to 2.0.16 and simplify
combine .inc with bb file (From OE-Core rev: 491f6d523b72b91dc7b186a6f273756435804581) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools.inc38
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb52
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb86
3 files changed, 86 insertions, 90 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
deleted file mode 100644
index c689bec1f9..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ /dev/null
@@ -1,38 +0,0 @@
1SUMMARY = "Kexec fast reboot tools"
2DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel"
3AUTHOR = "Eric Biederman"
4HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
5SECTION = "kernel/userland"
6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
8 file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
9DEPENDS = "zlib xz"
10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
12 file://kdump \
13 file://kdump.conf \
14 file://kdump.service \
15"
16
17PR = "r1"
18
19inherit autotools
20
21COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
22
23INSANE_SKIP_${PN} = "arch"
24
25do_compile_prepend() {
26 # Remove the prepackaged config.h from the source tree as it overrides
27 # the same file generated by configure and placed in the build tree
28 rm -f ${S}/include/config.h
29
30 # Remove the '*.d' file to make sure the recompile is OK
31 for dep in `find ${B} -type f -name '*.d'`; do
32 dep_no_d="`echo $dep | sed 's#.d$##'`"
33 # Remove file.d when there is a file.o
34 if [ -f "$dep_no_d.o" ]; then
35 rm -f $dep
36 fi
37 done
38}
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb
deleted file mode 100644
index 6bd9025e6f..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.15.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1require kexec-tools.inc
2export LDFLAGS = "-L${STAGING_LIBDIR}"
3EXTRA_OECONF = " --with-zlib=yes"
4
5SRC_URI += "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
6 file://0002-powerpc-change-the-memory-size-limit.patch \
7 file://0001-purgatory-Pass-r-directly-to-linker.patch \
8 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
9 file://kexec-x32.patch \
10 file://0001-Disable-PIE-during-link.patch \
11 "
12
13SRC_URI[md5sum] = "78906fdc255656fa2b9996c8acb3ef62"
14SRC_URI[sha256sum] = "42dbd0dab9964cd1ed89fa4571c8d13191eb7132b361ade5ac44517c91ecb97e"
15
16SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"
17
18PACKAGES =+ "kexec kdump vmcore-dmesg"
19
20ALLOW_EMPTY_${PN} = "1"
21RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg"
22
23FILES_kexec = "${sbindir}/kexec"
24FILES_kdump = "${sbindir}/kdump \
25 ${sysconfdir}/sysconfig/kdump.conf \
26 ${sysconfdir}/init.d/kdump \
27 ${libexecdir}/kdump-helper \
28 ${systemd_unitdir}/system/kdump.service \
29"
30
31FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg"
32
33inherit update-rc.d systemd
34
35INITSCRIPT_PACKAGES = "kdump"
36INITSCRIPT_NAME_kdump = "kdump"
37INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ."
38
39do_install_append () {
40 install -d ${D}${sysconfdir}/sysconfig
41 install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
42
43 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
44 install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
45 fi
46
47 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
48 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper
49 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service
50 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service
51 fi
52}
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
new file mode 100644
index 0000000000..ebb4832684
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
@@ -0,0 +1,86 @@
1
2SUMMARY = "Kexec fast reboot tools"
3DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel"
4AUTHOR = "Eric Biederman"
5HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
6SECTION = "kernel/userland"
7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
9 file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
10DEPENDS = "zlib xz"
11
12PR = "r1"
13
14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
15 file://kdump \
16 file://kdump.conf \
17 file://kdump.service \
18 file://0002-powerpc-change-the-memory-size-limit.patch \
19 file://0001-purgatory-Pass-r-directly-to-linker.patch \
20 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
21 file://kexec-x32.patch \
22 file://0001-Disable-PIE-during-link.patch \
23 "
24
25SRC_URI[md5sum] = "5198968de79b5ded96f97f3c2ea9637b"
26SRC_URI[sha256sum] = "cf17fc99bf77c9b39f06ee88ac0e86d0349c4a0c3f8214a3cc78eece872f6f3a"
27
28inherit autotools update-rc.d systemd
29
30export LDFLAGS = "-L${STAGING_LIBDIR}"
31EXTRA_OECONF = " --with-zlib=yes"
32
33do_compile_prepend() {
34 # Remove the prepackaged config.h from the source tree as it overrides
35 # the same file generated by configure and placed in the build tree
36 rm -f ${S}/include/config.h
37
38 # Remove the '*.d' file to make sure the recompile is OK
39 for dep in `find ${B} -type f -name '*.d'`; do
40 dep_no_d="`echo $dep | sed 's#.d$##'`"
41 # Remove file.d when there is a file.o
42 if [ -f "$dep_no_d.o" ]; then
43 rm -f $dep
44 fi
45 done
46}
47
48do_install_append () {
49 install -d ${D}${sysconfdir}/sysconfig
50 install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
51
52 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
53 install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
54 fi
55
56 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
57 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper
58 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service
59 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service
60 fi
61}
62
63PACKAGES =+ "kexec kdump vmcore-dmesg"
64
65ALLOW_EMPTY_${PN} = "1"
66RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg"
67
68FILES_kexec = "${sbindir}/kexec"
69FILES_kdump = "${sbindir}/kdump \
70 ${sysconfdir}/sysconfig/kdump.conf \
71 ${sysconfdir}/init.d/kdump \
72 ${libexecdir}/kdump-helper \
73 ${systemd_unitdir}/system/kdump.service \
74"
75
76FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg"
77
78INITSCRIPT_PACKAGES = "kdump"
79INITSCRIPT_NAME_kdump = "kdump"
80INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ."
81
82SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"
83
84COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
85
86INSANE_SKIP_${PN} = "arch"