mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-19 21:41:05 +02:00
sys-kernel/coreos-kernel: Drop the 4.14 LTS kernel
Since 4.19 is the new LTS version and it has had a few stable releases, we'll drop 4.14 in master to let 4.19 promote through the channels normally. With the current schedule, this will allow for 4.14 to remain in the stable channel for another 3-4 months while 4.19 will get testing time in alpha and beta.
This commit is contained in:
David Michael
parent
32e72ea0d8
commit
62c4a53c4d
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.81 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.81
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
IUSE=kernel_linux
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.81
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.14.81
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
|
||||
_md5_=42753b8cebb468da769ebfda0bcf0620
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.81
|
||||
DESCRIPTION=CoreOS Linux kernel modules
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
IUSE=kernel_linux savedconfig
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.14.81
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861
|
||||
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
|
||||
DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
|
||||
DESCRIPTION=Full sources for the CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
IUSE=symlink build
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.14.81
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.81.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 kernel-2 bc2f2b5caeb6f89c673a8a4dced6511e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
|
||||
_md5_=3e863356505b5ff924eed92178facb0b
|
||||
@ -1,97 +0,0 @@
|
||||
# Copyright 2014-2016 CoreOS, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
COREOS_SOURCE_REVISION=""
|
||||
inherit coreos-kernel
|
||||
|
||||
DESCRIPTION="CoreOS Linux kernel"
|
||||
KEYWORDS="amd64"
|
||||
|
||||
RDEPEND="=sys-kernel/coreos-modules-${PVR}"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/gzip
|
||||
app-shells/bash
|
||||
sys-apps/coreutils
|
||||
sys-apps/findutils
|
||||
sys-apps/grep
|
||||
sys-apps/ignition:=
|
||||
sys-apps/less
|
||||
sys-apps/nvme-cli
|
||||
sys-apps/sed
|
||||
sys-apps/shadow
|
||||
sys-apps/systemd[cryptsetup]
|
||||
sys-apps/seismograph
|
||||
sys-apps/util-linux
|
||||
sys-fs/btrfs-progs
|
||||
sys-fs/e2fsprogs
|
||||
sys-fs/mdadm
|
||||
sys-fs/xfsprogs
|
||||
>=sys-kernel/coreos-firmware-20180103-r1:=
|
||||
>=sys-kernel/bootengine-0.0.4:=
|
||||
sys-kernel/dracut
|
||||
virtual/udev
|
||||
amd64? ( sys-firmware/intel-microcode:= )"
|
||||
|
||||
# We are bad, we want to get around the sandbox. So do the creation of the
|
||||
# cpio image in pkg_setup() where we are free to mount filesystems, chroot,
|
||||
# and other fun stuff.
|
||||
pkg_setup() {
|
||||
coreos-kernel_pkg_setup
|
||||
|
||||
[[ "${MERGE_TYPE}" == binary ]] && return
|
||||
|
||||
# Fail early if we didn't detect the build installed by coreos-modules
|
||||
[[ -n "${KV_OUT_DIR}" ]] || die "Failed to detect modules build tree"
|
||||
|
||||
if [[ "${ROOT:-/}" != / ]]; then
|
||||
${ROOT}/usr/sbin/update-bootengine -m -c ${ROOT} -k "${KV_FULL}" || die
|
||||
else
|
||||
update-bootengine -k "${KV_FULL}" || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# KV_OUT_DIR points to the minimal build tree installed by coreos-modules
|
||||
# Pull in the config and public module signing key
|
||||
KV_OUT_DIR="${ROOT%/}/lib/modules/${COREOS_SOURCE_NAME#linux-}/build"
|
||||
cp -v "${KV_OUT_DIR}/.config" build/ || die
|
||||
local sig_key="$(getconfig MODULE_SIG_KEY)"
|
||||
mkdir -p "build/${sig_key%/*}" || die
|
||||
cp -v "${KV_OUT_DIR}/${sig_key}" "build/${sig_key}" || die
|
||||
|
||||
# Symlink to bootengine.cpio so we can stick with relative paths in .config
|
||||
ln -sv "${ROOT}"/usr/share/bootengine/bootengine.cpio build/ || die
|
||||
config_update 'CONFIG_INITRAMFS_SOURCE="bootengine.cpio"'
|
||||
|
||||
# include all intel and amd microcode files, avoiding the signatures
|
||||
local fw_dir="${ROOT}lib/firmware"
|
||||
use amd64 && config_update "CONFIG_EXTRA_FIRMWARE=\"$(find ${fw_dir} -type f \
|
||||
\( -path ${fw_dir}'/intel-ucode/*' -o -path ${fw_dir}'/amd-ucode/*' \) -printf '%P ')\""
|
||||
use amd64 && config_update "CONFIG_EXTRA_FIRMWARE_DIR=\"${fw_dir}\""
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
kmake "$(kernel_target)"
|
||||
|
||||
# sanity check :)
|
||||
[[ -e build/certs/signing_key.pem ]] && die "created a new key!"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# coreos-postinst expects to find the kernel in /usr/boot
|
||||
insinto "/usr/boot"
|
||||
newins "$(kernel_path)" "vmlinuz-${KV_FULL}"
|
||||
dosym "vmlinuz-${KV_FULL}" "/usr/boot/vmlinuz"
|
||||
|
||||
insinto "/usr/lib/modules/${KV_FULL}/build"
|
||||
doins build/System.map
|
||||
|
||||
insinto "/usr/lib/debug/usr/boot"
|
||||
newins build/vmlinux "vmlinux-${KV_FULL}"
|
||||
dosym "../../../boot/vmlinux-${KV_FULL}" "/usr/lib/debug/usr/lib/modules/${KV_FULL}/vmlinux"
|
||||
|
||||
# For easy access to vdso debug symbols in gdb:
|
||||
# set debug-file-directory /usr/lib/debug/usr/lib/modules/${KV_FULL}/vdso/
|
||||
kmake INSTALL_MOD_PATH="${D}/usr/lib/debug/usr" vdso_install
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 2014-2016 CoreOS, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
COREOS_SOURCE_REVISION=""
|
||||
inherit coreos-kernel savedconfig
|
||||
|
||||
DESCRIPTION="CoreOS Linux kernel modules"
|
||||
KEYWORDS="amd64"
|
||||
RDEPEND="!<sys-kernel/coreos-kernel-4.6.3-r1"
|
||||
|
||||
src_prepare() {
|
||||
restore_config build/.config
|
||||
if [[ ! -f build/.config ]]; then
|
||||
local archconfig="$(find_archconfig)"
|
||||
elog "Building using config ${archconfig}"
|
||||
cat "${archconfig}" >> build/.config || die
|
||||
fi
|
||||
|
||||
# Check that an old pre-ebuild-split config didn't leak in.
|
||||
grep -q "^CONFIG_INITRAMFS_SOURCE=" build/.config && \
|
||||
die "CONFIG_INITRAMFS_SOURCE must be removed from kernel config"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Generate module signing key
|
||||
setup_keys
|
||||
|
||||
# Build both vmlinux and modules (moddep checks symbols in vmlinux)
|
||||
kmake vmlinux modules
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Install modules to /usr, assuming USE=symlink-usr
|
||||
# Install firmware to a temporary (bogus) location.
|
||||
# The linux-firmware package will be used instead.
|
||||
# Stripping must be done here, not portage, to preserve sigs.
|
||||
kmake INSTALL_MOD_PATH="${D}/usr" \
|
||||
INSTALL_MOD_STRIP="--strip-unneeded" \
|
||||
INSTALL_FW_PATH="${T}/fw" \
|
||||
modules_install
|
||||
|
||||
# Install to /usr/lib/debug with debug symbols intact
|
||||
kmake INSTALL_MOD_PATH="${D}/usr/lib/debug/usr" \
|
||||
INSTALL_FW_PATH="${T}/fw" \
|
||||
modules_install
|
||||
rm "${D}/usr/lib/debug/usr/lib/modules/${KV_FULL}/"modules.* || die
|
||||
rm "${D}/usr/lib/debug/usr/lib/modules/${KV_FULL}/"{source,build} || die
|
||||
|
||||
# Clean up the build tree
|
||||
shred_keys
|
||||
kmake clean
|
||||
find "build/" -type d -empty -delete || die
|
||||
rm "build/.config.old" || die
|
||||
|
||||
# Install /lib/modules/${KV_FULL}/{build,source}
|
||||
install_build_source
|
||||
|
||||
# Not strictly required but this is where we used to install the config.
|
||||
dodir "/usr/boot"
|
||||
local build="lib/modules/${KV_FULL}/build"
|
||||
dosym "../${build}/.config" "/usr/boot/config-${KV_FULL}"
|
||||
dosym "../${build}/.config" "/usr/boot/config"
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,2 @@
|
||||
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
|
||||
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
|
||||
DIST patch-4.14.81.xz 1958572 BLAKE2B b00e542dddc563c9e929b5e4f2d3fc7adc6a868e2785b8cdd28bf4496df760d4f94d4498a093bfbc9d35caa9895094daa43c424c4413bf31814eed537736a873 SHA512 9e3482223e44af13238011733a9ec1796dcf258d5d8f594cb3388da01a230a476c789c3b12379d71837f74236094f905dfddbe6cf36811cb9e8cd8bec04481a6
|
||||
DIST patch-4.19.2.xz 129696 BLAKE2B 4811d96563e5f69f9d90acd5309573865c5d9a2e5c974174a9d6bc9c4aee0f1ff94c537a6237a9629df4e85344e0c5d270aff316f0cae5c5b36097a930bc4a96 SHA512 d2e5fccf6fa63f903290cc976716d13c545f18aa3a18196ceaca1bd83b80307951fd6692437ea99cb5d91a10b0f395b343061c248544665e6a8767c895d68e29
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 2014 CoreOS, Inc.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
ETYPE="sources"
|
||||
|
||||
# -rc releases should be versioned L.M_rcN
|
||||
# Final releases should be versioned L.M.N, even for N == 0
|
||||
|
||||
# Only needed for RCs
|
||||
K_BASE_VER="4.14"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
|
||||
DESCRIPTION="Full sources for the CoreOS Linux kernel"
|
||||
HOMEPAGE="http://www.kernel.org"
|
||||
if [[ "${PV%%_rc*}" != "${PV}" ]]; then
|
||||
SRC_URI="https://git.kernel.org/torvalds/p/v${KV%-coreos}/v${OKV} -> patch-${KV%-coreos}.patch ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
|
||||
PATCH_DIR="${FILESDIR}/${KV_MAJOR}.${KV_PATCH}"
|
||||
else
|
||||
SRC_URI="${KERNEL_URI}"
|
||||
PATCH_DIR="${FILESDIR}/${KV_MAJOR}.${KV_MINOR}"
|
||||
fi
|
||||
|
||||
KEYWORDS="amd64"
|
||||
IUSE=""
|
||||
|
||||
# XXX: Note we must prefix the patch filenames with "z" to ensure they are
|
||||
# applied _after_ a potential patch-${KV}.patch file, present when building a
|
||||
# patchlevel revision. We mustn't apply our patches first, it fails when the
|
||||
# local patches overlap with the upstream patch.
|
||||
UNIPATCH_LIST="
|
||||
${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \
|
||||
${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
|
||||
"
|
||||
@ -1,30 +0,0 @@
|
||||
From 91edf0181ff9947403c825c4f1b035ef1225c655 Mon Sep 17 00:00:00 2001
|
||||
From: Vito Caputo <vito.caputo@coreos.com>
|
||||
Date: Wed, 25 Nov 2015 02:59:45 -0800
|
||||
Subject: [PATCH 1/2] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||
|
||||
This enables relocating source and build trees to different roots,
|
||||
provided they stay reachable relative to one another. Useful for
|
||||
builds done within a sandbox where the eventual root is prefixed
|
||||
by some undesirable path component.
|
||||
---
|
||||
Makefile | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 2fe1424d61d2..daea4ff98374 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
|
||||
# Invoke a second make in the output directory, passing relevant variables
|
||||
sub-make:
|
||||
- $(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \
|
||||
+ $(Q)$(MAKE) -C $(KBUILD_OUTPUT) \
|
||||
+ KBUILD_SRC=$(shell realpath --relative-to=$(KBUILD_OUTPUT) $(CURDIR)) \
|
||||
-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))
|
||||
|
||||
# Leave processing to above invocation of make
|
||||
--
|
||||
2.17.2
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 40b2bec9b7801dd17cfc7b0b6e4c5964f00a7f4e Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <david.michael@coreos.com>
|
||||
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
||||
Subject: [PATCH 2/2] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||
new GCCs
|
||||
|
||||
---
|
||||
tools/lib/subcmd/Makefile | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile
|
||||
index 95563b8e1ad7..307652c42a7b 100644
|
||||
--- a/tools/lib/subcmd/Makefile
|
||||
+++ b/tools/lib/subcmd/Makefile
|
||||
@@ -33,6 +33,9 @@ ifneq ($(WERROR),0)
|
||||
CFLAGS += -Werror
|
||||
endif
|
||||
|
||||
+# Don't fail on fallthrough with newer GCCs.
|
||||
+CFLAGS += -Wno-error=implicit-fallthrough
|
||||
+
|
||||
CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
||||
|
||||
CFLAGS += -I$(srctree)/tools/include/
|
||||
--
|
||||
2.17.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user