From 8f327e4f71920ba19f595ba755989d19c5472b1c Mon Sep 17 00:00:00 2001 From: Jenkins OS Date: Sun, 22 Sep 2019 17:02:46 +0000 Subject: [PATCH 1/2] chore(metadata): Regenerate cache --- .../md5-cache/sys-apps/{dbus-1.10.18 => dbus-1.10.18-r1} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{dbus-1.10.18 => dbus-1.10.18-r1} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.10.18 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.10.18-r1 similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.10.18 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.10.18-r1 index 5c959a4703..52660b83c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.10.18 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.10.18-r1 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.18.tar.gz _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 -_md5_=d4bb980317490d7bee5f325bfb162312 +_md5_=0a8d0370d7e8c1b57ecd3651772850ea From fb29b559152120943a53e1f4d3b72ca1ff8ae540 Mon Sep 17 00:00:00 2001 From: Jenkins OS Date: Sun, 22 Sep 2019 17:02:57 +0000 Subject: [PATCH 2/2] sys-kernel/coreos-sources: Bump 4.19.71 to 4.19.75 --- ...s-kernel-4.19.71 => coreos-kernel-4.19.75} | 6 ++-- ...modules-4.19.71 => coreos-modules-4.19.75} | 4 +-- ...sources-4.19.71 => coreos-sources-4.19.75} | 6 ++-- ...71.ebuild => coreos-kernel-4.19.75.ebuild} | 0 ...1.ebuild => coreos-modules-4.19.75.ebuild} | 0 .../sys-kernel/coreos-sources/Manifest | 2 +- ...1.ebuild => coreos-sources-4.19.75.ebuild} | 1 - ...lative-path-for-KBUILD_SRC-from-CURD.patch | 6 ++-- ...kefile-Don-t-fail-on-fallthrough-wit.patch | 4 +-- ...d-nf_conntrack_ipv4-compat-module-fo.patch | 4 +-- ...p-test-for-upperdir-used-as-lowerdir.patch | 35 ------------------- 11 files changed, 16 insertions(+), 52 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.19.71 => coreos-kernel-4.19.75} (85%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.19.71 => coreos-modules-4.19.75} (92%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.19.71 => coreos-sources-4.19.75} (90%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.19.71.ebuild => coreos-kernel-4.19.75.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.19.71.ebuild => coreos-modules-4.19.75.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.19.71.ebuild => coreos-sources-4.19.75.ebuild} (94%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.71 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.75 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.71 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.75 index d7d782d5e7..da164f08c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.71 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.75 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.19.71 app-arch/gzip app-shells/bash coreos-base/coreos-init:= 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.19.71 +DEPEND==sys-kernel/coreos-modules-4.19.75 app-arch/gzip app-shells/bash coreos-base/coreos-init:= 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.19.75 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.71 +RDEPEND==sys-kernel/coreos-modules-4.19.75 RESTRICT=binchecks strip -SLOT=0/4.19.71 +SLOT=0/4.19.75 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 _md5_=1a19bf8157015b4dcd933d7281d1920d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.71 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.75 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.71 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.75 index 2d60657a82..9cc44d953a 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.71 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.75 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.19.71 +DEPEND==sys-kernel/coreos-sources-4.19.75 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 virtual/libelf ) RESTRICT=binchecks strip -SLOT=4.19.71 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz +SLOT=4.19.75 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.75.xz 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 b2fdd65b5edb72d87dedaa82df19553c ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=2cdcfc21a3fe0650309ffa033e2d0bd5 +_md5_=d79cabc85557a16224cb73e5803fb741 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.71.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.75.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.71.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.75.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.71.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.75.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.71.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.75.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 3c5d8aabf3..5d704e487e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -DIST patch-4.19.71.xz 1733204 BLAKE2B 76d07ebae44ca5c4c275df79adb913eb40080eaaf7eef603c6f6be01e7c8c739cd7811f5a865253ba14bffff69b2abe239bd6ba63bd14961901a246197cdb799 SHA512 a600bfb9f45b589ccdba0a99428f55e6c8f235df0b170f0a1d4d30c2decd5e92f423763a3b377837b46504505214e1fd0b47ff2f246b00a677779bbf299eb68e +DIST patch-4.19.75.xz 1812812 BLAKE2B 2f665255e46b3bdc44aedcaa74b7e205782c4c702028f4cb88e22d6708b9c8e24ec68d80430962071aab38d40a95fcc66f768292e006e8d065d0c6fb7645d3c4 SHA512 e4a288355fdcb5f4e33d09f0c158305caac0326fccab603b24f7ef42fa1a369f9ac7e17a4bfad85cace5c67848eb5dca40a8849e1fcf5c5f867a59f9e9357c75 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.71.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.75.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.71.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.75.ebuild index ee9c66a6a9..2eb2f2f26c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.71.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.75.ebuild @@ -34,5 +34,4 @@ 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 \ ${PATCH_DIR}/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch \ - ${PATCH_DIR}/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index e5478346cf..a7f1707a58 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ -From 28e04d1a30add44e49698007b319ea2fe976b731 Mon Sep 17 00:00:00 2001 +From 8b9f7e5551aaad4ef5c5c813bab33570819625f9 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/4] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/3] 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 @@ -12,7 +12,7 @@ by some undesirable path component. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index f6c9d5757470..8074d2fe9e0a 100644 +index 4bf6f24916bf..6322f12fb3f9 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 04a59009cf..646b5a87b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ -From a815716a8ead8e4a03d0f6352a205d7bc418f38c Mon Sep 17 00:00:00 2001 +From e992d15e09d91ea7a5118b22bbab501f27bfbf3f Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 2/4] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 2/3] tools/objtool/Makefile: Don't fail on fallthrough with new GCCs --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch index 1de632201d..1d4014237e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch @@ -1,7 +1,7 @@ -From 8656239ea34f6adc7b375d2578decb70ef80b37d Mon Sep 17 00:00:00 2001 +From b8395f0ab67338c962e8580de07b0826024402f3 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 26 Oct 2018 17:00:56 -0700 -Subject: [PATCH 3/4] net/netfilter: add nf_conntrack_ipv4 compat module for +Subject: [PATCH 3/3] net/netfilter: add nf_conntrack_ipv4 compat module for kube-proxy kube-proxy won't enable ipvs unless it can modprobe nf_conntrack_ipv4 and diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch deleted file mode 100644 index d28b42fd4f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0004-ovl-drop-test-for-upperdir-used-as-lowerdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0b1efec315e61dd6c0ad09d40e39c512aaa1d943 Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Tue, 9 Jul 2019 19:53:49 -0400 -Subject: [PATCH 4/4] ovl: drop test for upperdir used as lowerdir - -This is accidentally triggered by multiple versions of Docker. Drop -the test pending a Docker fix. - -Reverts part of 0319ef1d40ff39d2c0f942a46fb73918669b2350. - -https://github.com/moby/moby/issues/39475 ---- - fs/overlayfs/super.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 2d028c02621f..64bca1f53884 100644 ---- a/fs/overlayfs/super.c -+++ b/fs/overlayfs/super.c -@@ -1289,12 +1289,6 @@ static int ovl_get_lower_layers(struct super_block *sb, struct ovl_fs *ofs, - if (err < 0) - goto out; - -- err = -EBUSY; -- if (ovl_is_inuse(stack[i].dentry)) { -- pr_err("overlayfs: lowerdir is in-use as upperdir/workdir\n"); -- goto out; -- } -- - err = ovl_setup_trap(sb, stack[i].dentry, &trap, "lowerdir"); - if (err) - goto out; --- -2.21.0 -