Skip to content
This repository was archived by the owner on Sep 18, 2020. It is now read-only.

Bump Linux 4.14.77 to 4.14.78 and 4.19-rc8 to 4.19 #3453

Merged
merged 3 commits into from
Oct 22, 2018
Merged

Bump Linux 4.14.77 to 4.14.78 and 4.19-rc8 to 4.19 #3453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7405304
chore(metadata): Regenerate cache
dm0- Oct 21, 2018
dd5a6f8
sys-kernel/coreos-sources: Bump 4.14.77 to 4.14.78
dm0- Oct 21, 2018
2cd48a8
sys-kernel/coreos-sources: Bump 4.19-rc8 to 4.19
dm0- Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
DEPEND==sys-kernel/coreos-modules-4.19.0 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less 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.19.0
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.19.0
RESTRICT=binchecks strip
SLOT=0/4.19.0
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
_md5_=f01c9d4be3dffb725f2e4f183dc4ceff
13 changes: 0 additions & 13 deletions metadata/md5-cache/sys-kernel/coreos-kernel-4.19_rc8
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...-cache/sys-kernel/coreos-modules-4.19_rc8 → ...d5-cache/sys-kernel/coreos-modules-4.19.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
DEPEND==sys-kernel/coreos-sources-4.19_rc8
DEPEND==sys-kernel/coreos-sources-4.19.0
DESCRIPTION=CoreOS Linux kernel modules
EAPI=5
HOMEPAGE=http://www.kernel.org
Expand All @@ -8,6 +8,6 @@ KEYWORDS=amd64
LICENSE=GPL-2 freedist
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
RESTRICT=binchecks strip
SLOT=0/4.19_rc8
SLOT=0/4.19.0
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
6 changes: 3 additions & 3 deletions ...-cache/sys-kernel/coreos-sources-4.19_rc8 → ...d5-cache/sys-kernel/coreos-sources-4.19.0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ KEYWORDS=amd64
LICENSE=GPL-2 linux-firmware
RDEPEND=sys-devel/bison sys-devel/flex !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.19_rc8
SRC_URI=https://git.kernel.org/torvalds/p/v4.19-rc8/v4.18 -> patch-4.19-rc8.patch mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
SLOT=4.19.0
SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.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_=ff549c4949a58a654ecab704c499281c
_md5_=3f2accb2812a5204571c00e866018482
3 changes: 1 addition & 2 deletions ...reos-kernel/coreos-kernel-4.19_rc8.ebuild → ...coreos-kernel/coreos-kernel-4.19.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ pkg_setup() {
src_prepare() {
# KV_OUT_DIR points to the minimal build tree installed by coreos-modules
# Pull in the config and public module signing key
# FIXME(bgilbert): remove after final release
KV_OUT_DIR=/build/amd64-usr/usr/lib/modules/4.19.0-rc8-coreos/build
KV_OUT_DIR="${ROOT%/}/lib/modules/${COREOS_SOURCE_NAME#linux-}/build"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently, since that variable points at /usr/src by default instead of /lib/modules, so the .config doesn't exist there. I didn't dig into what changed with it yet; I just pushed that path so tests can run on the new version.

cp -v "${KV_OUT_DIR}/.config" build/ || die
local sig_key="$(getconfig MODULE_SIG_KEY)"
mkdir -p "build/${sig_key%/*}" || die
Expand Down
0 ...os-modules/coreos-modules-4.19_rc8.ebuild → ...reos-modules/coreos-modules-4.19.0.ebuild
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions sys-kernel/coreos-sources/Manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST patch-4.14.78.xz 1888728 BLAKE2B 37d2cf9594422748e493b7d7b000917a45fb5d231b088945f8a458d522b7c42754beb2bed138b562c823d5aaa31c2c9dcda276a9460e57fb857899037c4777d8 SHA512 bf0c0cbe9ee7ddfee0d8a70656e6db5979d1928c7aad917039c471ad6e2b049fe9d0f59161dab5ccfb9180263d2630cd6df735524b5886f0d05f709cb30b11bd
DIST patch-4.19-rc8.patch 39758717 BLAKE2B 56c7188f0a47b042fa92c3492feb3ff4f980508afbab17adada089ad6549c0b204b619555573221557d05b11a0b0d225a7d3f2929778e2ee66d7c73cd942a690 SHA512 b20a6aa57f6609d41a0687aad9b90bf1be04fbdc4c7312520bb3b28405142d684a7018071afd5bf8034130ce297f424c68fd93922faa0a27268c73e572213ed6
2 changes: 1 addition & 1 deletion ...os-sources/coreos-sources-4.19_rc8.ebuild → ...reos-sources/coreos-sources-4.19.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ETYPE="sources"
# Final releases should be versioned L.M.N, even for N == 0

# Only needed for RCs
K_BASE_VER="4.18"
K_BASE_VER="4.19"

inherit kernel-2
detect_version
Expand Down
4 changes: 2 additions & 2 deletions ...oreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 686a15aab518bc68ca9c4f1cfba88d8cf0aa6d20 Mon Sep 17 00:00:00 2001
From 032844ef57f314206644fc41cc215216c29ec336 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
Expand All @@ -12,7 +12,7 @@ by some undesirable path component.
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bf3786e4ffec..9693a791b1f6 100644
index 69fa5c0310d8..c81b2a21eff1 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
Expand Down
2 changes: 1 addition & 1 deletion ...oreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3f96d22119893b7c7a187d3fa255fcb21bc3bf11 Mon Sep 17 00:00:00 2001
From 175b5d6d56990d94e5f2e848923b1e358be3cd39 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
Expand Down