mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 05:51:18 +02:00
Merge pull request #3440 from dm0-/linux
Bump Linux 4.14.75 to 4.14.76 and 4.19-rc7 to 4.19-rc8
This commit is contained in:
David Michael
GitHub
commit
47df7880b8
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.75 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.14.75
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.76 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.14.76
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.75
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.76
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.14.75
|
||||
SLOT=0/4.14.76
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=8d9003850e9a0961c3daa40b252ccb37
|
||||
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.19_rc7 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_rc7
|
||||
DEPEND==sys-kernel/coreos-modules-4.19_rc8 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_rc8
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
KEYWORDS=amd64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.19_rc7
|
||||
RDEPEND==sys-kernel/coreos-modules-4.19_rc8
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.19_rc7
|
||||
SLOT=0/4.19_rc8
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=598a67041718469b0eea518a2e82baf4
|
||||
_md5_=c250ee4998251f4e58906f39ea11e5fa
|
||||
@ -1,5 +1,5 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.75
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.76
|
||||
DESCRIPTION=CoreOS Linux kernel modules
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
@ -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.14.75
|
||||
SLOT=0/4.14.76
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
||||
@ -1,5 +1,5 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.19_rc7
|
||||
DEPEND==sys-kernel/coreos-sources-4.19_rc8
|
||||
DESCRIPTION=CoreOS Linux kernel modules
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
@ -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_rc7
|
||||
SLOT=0/4.19_rc8
|
||||
_eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=9bfb20f0c6dec0fbb70b49ec01ba693f
|
||||
@ -8,7 +8,7 @@ KEYWORDS=amd64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.14.75
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.75.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
SLOT=4.14.76
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.76.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=785aff8bdcf31c6a6d8916b86044f14f
|
||||
@ -8,7 +8,7 @@ KEYWORDS=amd64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.19_rc7
|
||||
SRC_URI=https://git.kernel.org/torvalds/p/v4.19-rc7/v4.18 -> patch-4.19-rc7.patch mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz
|
||||
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
|
||||
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=ff549c4949a58a654ecab704c499281c
|
||||
@ -54,7 +54,7 @@ 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-rc7-coreos/build
|
||||
KV_OUT_DIR=/build/amd64-usr/usr/lib/modules/4.19.0-rc8-coreos/build
|
||||
cp -v "${KV_OUT_DIR}/.config" build/ || die
|
||||
local sig_key="$(getconfig MODULE_SIG_KEY)"
|
||||
mkdir -p "build/${sig_key%/*}" || die
|
||||
@ -1,4 +1,4 @@
|
||||
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
|
||||
DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
|
||||
DIST patch-4.14.75.xz 1837764 BLAKE2B 7e1b26f1ccaa3cee9129603939a7cada5f33fc7169754fb0fd050fd4c44cd7d538bc3f587ad6850a8f49658ec650738080057785f0970bbb13887d07474533f3 SHA512 479eeaa8fc35dfc865b2c6abbbc8c28be7c181d4fd74e36d830d29c3dd24a0f9ac5ac3f510f7571686763d35c6049cc971bf1f272a75e63b529bc106ef611f43
|
||||
DIST patch-4.19-rc7.patch 39634304 BLAKE2B 98bf6c83118e7ce7f90ecd7c70412b8854a83c4ed6843021e7fc6b4340dc9bf89e29b30404c2e4ba16a3ba7c85d7d48bb00b16531de7b625a5ddf731b43c526c SHA512 cb0bc2ab8b3efe7332fb498bef706c556071e6623d76092dbbcc14d6741051bb1fe97d7c52baa0a950803c7cc186868b87b842e9fb9f61fce95befaa5be40cd0
|
||||
DIST patch-4.14.76.xz 1849056 BLAKE2B 47da6788e2046c4316f48106b7adfae14951eb1873d44f264bd7bcd4436e941039004274301b6b45d71d145079900cd4901a375b3adc43bb2aed8caf4bc92a7a SHA512 320a12bba6f98707183a98c7e8a14a2f5e3a4a09a6567fd2315ac4618722d652d15b0cee0f82e4650c66a5bf366467815343d52b5c51dfc92fd2f5900c47659a
|
||||
DIST patch-4.19-rc8.patch 39758717 BLAKE2B 56c7188f0a47b042fa92c3492feb3ff4f980508afbab17adada089ad6549c0b204b619555573221557d05b11a0b0d225a7d3f2929778e2ee66d7c73cd942a690 SHA512 b20a6aa57f6609d41a0687aad9b90bf1be04fbdc4c7312520bb3b28405142d684a7018071afd5bf8034130ce297f424c68fd93922faa0a27268c73e572213ed6
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 615484be29cd197c9b5a864d587605edee813efb Mon Sep 17 00:00:00 2001
|
||||
From f1e51d6fc22cf6f5adcaf67c28d79bc5400d0bb1 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/4] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||
@ -12,7 +12,7 @@ by some undesirable path component.
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7fc373c011c0..b5d620585759 100644
|
||||
index 332dd011b3b9..978505ea677e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
@ -26,5 +26,5 @@ index 7fc373c011c0..b5d620585759 100644
|
||||
|
||||
# Leave processing to above invocation of make
|
||||
--
|
||||
2.17.1
|
||||
2.17.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4eb25d830df42cdb2ed5769941d3c38826965416 Mon Sep 17 00:00:00 2001
|
||||
From aa2c12d85eeb847bcc9e4c331a8cc279be11509d 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/4] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||
@ -23,5 +23,5 @@ index 95563b8e1ad7..307652c42a7b 100644
|
||||
|
||||
CFLAGS += -I$(srctree)/tools/include/
|
||||
--
|
||||
2.17.1
|
||||
2.17.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 052def508c4034ae68965126fd706e5cf10f1bb7 Mon Sep 17 00:00:00 2001
|
||||
From c1a65335b7397222fc229de1dd34b25a519066ed Mon Sep 17 00:00:00 2001
|
||||
From: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||||
Date: Thu, 21 Jun 2018 14:00:20 +0100
|
||||
Subject: [PATCH 3/4] xen-netfront: Fix mismatched rtnl_unlock
|
||||
@ -34,5 +34,5 @@ index 1a40fc3517a8..3cb39e089cd0 100644
|
||||
return err;
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.17.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6883c792a04705f8f265f7ed4950e22e43dbe040 Mon Sep 17 00:00:00 2001
|
||||
From ce25751e77949cc7c12ee94b1653bbbe6413e59d Mon Sep 17 00:00:00 2001
|
||||
From: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||||
Date: Thu, 21 Jun 2018 14:00:21 +0100
|
||||
Subject: [PATCH 4/4] xen-netfront: Update features after registering netdev
|
||||
@ -45,5 +45,5 @@ index 3cb39e089cd0..6ea95b316256 100644
|
||||
* All public and private state should now be sane. Get
|
||||
* ready to start sending and receiving packets and give the driver
|
||||
--
|
||||
2.17.1
|
||||
2.17.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From cebc8dbefdc9d944165fa217a4739b440629c498 Mon Sep 17 00:00:00 2001
|
||||
From 686a15aab518bc68ca9c4f1cfba88d8cf0aa6d20 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
|
||||
@ -12,7 +12,7 @@ by some undesirable path component.
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9b2df076885a..49895ad7bfe0 100644
|
||||
index bf3786e4ffec..9693a791b1f6 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
@ -26,5 +26,5 @@ index 9b2df076885a..49895ad7bfe0 100644
|
||||
|
||||
# Leave processing to above invocation of make
|
||||
--
|
||||
2.17.1
|
||||
2.17.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From fb8f7c2a38fc4cac0e8a2866bdd2637a33187d04 Mon Sep 17 00:00:00 2001
|
||||
From 3f96d22119893b7c7a187d3fa255fcb21bc3bf11 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
|
||||
@ -23,5 +23,5 @@ index 95563b8e1ad7..307652c42a7b 100644
|
||||
|
||||
CFLAGS += -I$(srctree)/tools/include/
|
||||
--
|
||||
2.17.1
|
||||
2.17.2
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user