From 65cf2cd8ff6e75e493d86e0389b1987c7d7c342f Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 7 Feb 2018 16:46:56 -0500 Subject: [PATCH 1/8] profiles: Upgrade to GCC 7.3 for retpoline support --- .../profiles/coreos/base/package.accept_keywords | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index fe993e9afe..d85332b774 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -71,3 +71,8 @@ dev-util/checkbashisms # systemd v235 requires util-linux 2.30 =sys-apps/util-linux-2.30.2 ~amd64 ~arm64 + +# Upgrade to GCC 7.3 for retpoline support. +=sys-devel/gcc-7.3.0 +=cross-aarch64-cros-linux-gnu/gcc-7.3.0 ~arm64 +=cross-x86_64-cros-linux-gnu/gcc-7.3.0 ~amd64 From 131ceb6ec8c4e86b2657d5e7a0b4c8dad38aa6ca Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 9 Feb 2018 16:08:23 -0500 Subject: [PATCH 2/8] profiles: Disable building unused C++ libraries for ncurses --- .../coreos-overlay/profiles/coreos/base/package.use.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index 53d3e82b68..9c3c4b3929 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -12,3 +12,6 @@ sys-apps/util-linux python # not needed, requires lots of Perl sys-boot/syslinux perl + +# not needed, problems building with GCC 7.3.0 +sys-libs/ncurses cxx From 59d1a667f08cfe83f778ab68e679e35bb794fde1 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 9 Feb 2018 08:52:39 -0500 Subject: [PATCH 3/8] profiles: Match the arm64 board GCC build with the SDK --- .../coreos-overlay/profiles/coreos/arm64/package.use.mask | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask new file mode 100644 index 0000000000..91f11200ab --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.mask @@ -0,0 +1,2 @@ +# This fails from -Werror=implicit-fallthrough, and it's disabled in the SDK. +sys-devel/gcc sanitize From aceb94d63a40db5f4aa347cdd71e65c2143d7a90 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 10 Feb 2018 10:27:54 -0500 Subject: [PATCH 4/8] profiles: Save build time by masking gcc-6.4.0-r1 --- .../coreos-overlay/profiles/coreos/base/package.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 8e2e86bac9..1e5225a4b4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -14,3 +14,6 @@ # mask an accidental rkt major version bump to ensure it's not chosen over more # recent releases =app-emulation/rkt-13.0 + +# Prevent this from attempting to install along with GCC 7. +=sys-devel/gcc-6.4.0-r1 From 6ddd960c07d2d591f4dd67955ec87b5caf9db925 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 22:26:14 -0500 Subject: [PATCH 5/8] sys-kernel/coreos-sources: Disable -Werror as needed for GCC 7.3 --- ...ebuild => coreos-kernel-4.14.18-r3.ebuild} | 2 +- ....ebuild => coreos-kernel-4.15.2-r3.ebuild} | 2 +- ...build => coreos-modules-4.14.18-r3.ebuild} | 2 +- ...ebuild => coreos-modules-4.15.2-r3.ebuild} | 2 +- ...build => coreos-sources-4.14.18-r1.ebuild} | 1 + ...ebuild => coreos-sources-4.15.2-r1.ebuild} | 1 + ...lative-path-for-KBUILD_SRC-from-CURD.patch | 2 +- .../z0002-Add-arm64-coreos-verity-hash.patch | 2 +- ...017-8824-use-after-free-in-DCCP-code.patch | 2 +- ...factor-out-__blkdev_issue_zero_pages.patch | 2 +- ...WRITE-ZEROES-failing-in-blkdev_issue.patch | 2 +- ...kefile-Don-t-fail-on-fallthrough-wit.patch | 27 +++++++++++++++++++ ...lative-path-for-KBUILD_SRC-from-CURD.patch | 2 +- .../z0002-Add-arm64-coreos-verity-hash.patch | 2 +- ...kefile-Don-t-fail-on-fallthrough-wit.patch | 27 +++++++++++++++++++ 15 files changed, 67 insertions(+), 11 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.14.18-r2.ebuild => coreos-kernel-4.14.18-r3.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.15.2-r2.ebuild => coreos-kernel-4.15.2-r3.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.14.18-r2.ebuild => coreos-modules-4.14.18-r3.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.15.2-r2.ebuild => coreos-modules-4.15.2-r3.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.14.18.ebuild => coreos-sources-4.14.18-r1.ebuild} (94%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.15.2.ebuild => coreos-sources-4.15.2-r1.ebuild} (93%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.18-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.18-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.18-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.18-r3.ebuild index 8e6f61c1ee..e93db60616 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.18-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.18-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="" +COREOS_SOURCE_REVISION="-r1" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.2-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.2-r3.ebuild index 8e6f61c1ee..e93db60616 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.2-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.15.2-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="" +COREOS_SOURCE_REVISION="-r1" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.18-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.18-r3.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.18-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.18-r3.ebuild index 685aa802e6..6c70281dca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.18-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.18-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="" +COREOS_SOURCE_REVISION="-r1" inherit coreos-kernel savedconfig DESCRIPTION="CoreOS Linux kernel modules" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.2-r3.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.2-r3.ebuild index 685aa802e6..6c70281dca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.2-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.15.2-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="" +COREOS_SOURCE_REVISION="-r1" inherit coreos-kernel savedconfig DESCRIPTION="CoreOS Linux kernel modules" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.18.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.18-r1.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.18.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.18-r1.ebuild index af3569f7fd..a911706909 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.18.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.18-r1.ebuild @@ -36,4 +36,5 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch \ ${PATCH_DIR}/z0004-block-factor-out-__blkdev_issue_zero_pages.patch \ ${PATCH_DIR}/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \ + ${PATCH_DIR}/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.2-r1.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.2-r1.ebuild index 0b9533821a..db6abb3a27 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.15.2-r1.ebuild @@ -33,4 +33,5 @@ IUSE="" UNIPATCH_LIST=" ${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch \ ${PATCH_DIR}/z0002-Add-arm64-coreos-verity-hash.patch \ + ${PATCH_DIR}/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/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.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index 5577d09722..8a7c4c95d6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/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.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ From 9f43b5429ada4b27f5b88719b5062357533e33aa Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/5] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/6] 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 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch index eea0c62cc2..3afc4c5ce8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,7 +1,7 @@ From 5bb1d1e4eb3547ee8ef7a4645d82f01b54b9f61b Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/5] Add arm64 coreos verity hash +Subject: [PATCH 2/6] Add arm64 coreos verity hash Signed-off-by: Geoff Levand --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch index 434a7b41e8..e6147c87be 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch @@ -1,7 +1,7 @@ From 8a1eacaf13518d7233f401d706e5c813a22294ce Mon Sep 17 00:00:00 2001 From: Mohamed Ghannam Date: Tue, 5 Dec 2017 12:23:04 -0800 -Subject: [PATCH 3/5] dccp: CVE-2017-8824: use-after-free in DCCP code +Subject: [PATCH 3/6] dccp: CVE-2017-8824: use-after-free in DCCP code Whenever the sock object is in DCCP_CLOSED state, dccp_disconnect() must free dccps_hc_tx_ccid and dccps_hc_rx_ccid and set to NULL. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch index ed0a4a9082..ed1a532024 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-factor-out-__blkdev_issue_zero_pages.patch @@ -1,7 +1,7 @@ From 54740b5bf0365b6717d45e098411d4c648581974 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:09 +0200 -Subject: [PATCH 4/5] block: factor out __blkdev_issue_zero_pages() +Subject: [PATCH 4/6] block: factor out __blkdev_issue_zero_pages() blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch index d1df188b5d..17f2d6b374 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch @@ -1,7 +1,7 @@ From e9ecef4f0b416048e8f111b204f6e3dc8e273eeb Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:10 +0200 -Subject: [PATCH 5/5] block: cope with WRITE ZEROES failing in +Subject: [PATCH 5/6] block: cope with WRITE ZEROES failing in blkdev_issue_zeroout() sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch new file mode 100644 index 0000000000..f8011aed07 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -0,0 +1,27 @@ +From 0173d1a9abc2e21dc6a545ec32390aeff95ddbfb Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Thu, 8 Feb 2018 21:23:12 -0500 +Subject: [PATCH 6/6] 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.14.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/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.15/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index fb1979d849..52d27ddf3b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/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.15/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ From dc6d3ff6aed90455fc3b375e2180bedb9717b064 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/2] 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 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0002-Add-arm64-coreos-verity-hash.patch index 9dea1b8e3b..17a37a2bac 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,7 +1,7 @@ From 8017137c3bac33566a82b03b509699b113a3a03b Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/2] Add arm64 coreos verity hash +Subject: [PATCH 2/3] Add arm64 coreos verity hash Signed-off-by: Geoff Levand --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch new file mode 100644 index 0000000000..64242efc93 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.15/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -0,0 +1,27 @@ +From 0f68639723273c3157477fc3385b6276476b6e27 Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Thu, 8 Feb 2018 21:23:12 -0500 +Subject: [PATCH 3/3] 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.14.3 + From 227218a3a5889380962d58a488f3efb4563ecefd Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 10 Feb 2018 18:32:37 -0500 Subject: [PATCH 6/8] dev-lang/rust: Import from portage-stable --- .../coreos-overlay/dev-lang/rust/Manifest | 3 + .../coreos-overlay/dev-lang/rust/metadata.xml | 17 ++ .../dev-lang/rust/rust-1.23.0.ebuild | 175 ++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest new file mode 100644 index 0000000000..3427384032 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest @@ -0,0 +1,3 @@ +DIST rust-1.22.0-i686-unknown-linux-gnu.tar.gz 151889962 SHA256 4def030b03dcdb1a82bbb3aff63deac6f2745d870b6b358083abb69c841e0bcf SHA512 b46eb37f918833f1dbf3700fe156f26eff19dc90534434add5aa2d86b8ccc02aef273cba6a8291deaa89d27d2bd4af1529655b6463f44736a9f521a67cccc4f0 WHIRLPOOL ac8bab4817c543ae56fd52553481878b880fab9bbc5cfa210715606668f831392e10066941a493f97e729a52c3baf1d84dc09ff9bfcec369915a3a3b8b8630f0 +DIST rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz 160427151 SHA256 11118f670343f3ebdd4790f845fd68f38db65b19261b81b3ab580d8425d0a7c6 SHA512 30206d5ccec432a6a92aeffb34170290109d65973a6d1cd91e7e1aa82781a0da00023275b5a3a3effad79d539d2f4829d1eea5fc3d0c1c58a7f3a4855a84785c WHIRLPOOL 503dad91f402f244f94675ae4e85bc59526534cf744ae4c17ff7472fd3b691f5c0212a62a090937cf5764f8de92cfb3a0ae1ad534a1f14ab69027a77d3763ba7 +DIST rustc-1.23.0-src.tar.gz 60010149 SHA256 7464953871dcfdfa8afcc536916a686dd156a83339d8ec4d5cb4eb2fe146cb91 SHA512 a1dbb1a625c6d8dfe9708e1cf478a49154b1eb0aba5ba67ac85518a8c7d1c70d2d86ac4d441156e9bfd0fd77ca241fb5491a2bd68aefcf0b3c2e164c3cc29e4e WHIRLPOOL 6e6d0eaa2f1b7f336f5a15f1f98327ad04df1a1b00d9d583de33068ee6412200bf101e4bdb007ae0e9681d54c041edd639f68a299009110c8b754c7ca17f0042 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml new file mode 100644 index 0000000000..050e235f71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml @@ -0,0 +1,17 @@ + + + + + rust@gentoo.org + Rust Project + + + Use sys-devel/clang for building + Use sys-libs/libcxx as standard + library when building with sys-devel/clang + Use system sys-devel/llvm in + place of the bundled one + Use sys-libs/jemalloc as the + standard memory allocator + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild new file mode 100644 index 0000000000..eb5a124a96 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 versionator toolchain-funcs + +if [[ ${PV} = *beta* ]]; then + betaver=${PV//*beta} + BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" + MY_P="rustc-beta" + SLOT="beta/${PV}" + SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz" + KEYWORDS="" +else + ABI_VER="$(get_version_component_range 1-2)" + SLOT="stable/${ABI_VER}" + MY_P="rustc-${PV}" + SRC="${MY_P}-src.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +CHOST_amd64=x86_64-unknown-linux-gnu +CHOST_x86=i686-unknown-linux-gnu + +RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0" +RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}" +RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}" + +CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0" + +DESCRIPTION="Systems programming language from Mozilla" +HOMEPAGE="http://www.rust-lang.org/" + +SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz + amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz ) + x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz ) +" + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" + +IUSE="debug doc +jemalloc" + +RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 + jemalloc? ( dev-libs/jemalloc )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + || ( + >=sys-devel/gcc-4.7 + >=sys-devel/clang-3.5 + ) + dev-util/cmake +" +PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}" + +S="${WORKDIR}/${MY_P}-src" + +toml_usex() { + usex "$1" true false +} + +src_prepare() { + local rust_stage0_root="${WORKDIR}"/rust-stage0 + + local rust_stage0_name="RUST_STAGE0_${ARCH}" + local rust_stage0="${!rust_stage0_name}" + + "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die + + default +} + +src_configure() { + local rust_stage0_root="${WORKDIR}"/rust-stage0 + + local rust_target_name="CHOST_${ARCH}" + local rust_target="${!rust_target_name}" + + cat <<- EOF > "${S}"/config.toml + [llvm] + optimize = $(toml_usex !debug) + release-debuginfo = $(toml_usex debug) + assertions = $(toml_usex debug) + [build] + build = "${rust_target}" + host = ["${rust_target}"] + target = ["${rust_target}"] + cargo = "${rust_stage0_root}/bin/cargo" + rustc = "${rust_stage0_root}/bin/rustc" + docs = $(toml_usex doc) + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + verbose = 2 + [install] + prefix = "${EPREFIX}/usr" + libdir = "$(get_libdir)" + docdir = "share/doc/${P}" + mandir = "share/${P}/man" + [rust] + optimize = $(toml_usex !debug) + debuginfo = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + use-jemalloc = $(toml_usex jemalloc) + default-linker = "$(tc-getCC)" + rpath = false + [target.${rust_target}] + cc = "$(tc-getBUILD_CC)" + cxx = "$(tc-getBUILD_CXX)" + linker = "$(tc-getCC)" + ar = "$(tc-getAR)" + EOF +} + +src_compile() { + ./x.py build --verbose --config="${S}"/config.toml || die +} + +src_install() { + env DESTDIR="${D}" ./x.py install || die + + mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die + mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die + mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die + mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die + + dodoc COPYRIGHT + + if use doc ; then + dodir "/usr/share/doc/rust-${PV}/" + mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die + rmdir "${D}/usr/share/doc/rust/" || die + fi + + cat <<-EOF > "${T}"/50${P} + LDPATH="/usr/$(get_libdir)/${P}" + MANPATH="/usr/share/${P}/man" + EOF + doenvd "${T}"/50${P} + + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-lldb + EOF + dodir /etc/env.d/rust + insinto /etc/env.d/rust + doins "${T}/provider-${P}" +} + +pkg_postinst() { + eselect rust update --if-unset + + elog "Rust installs a helper script for calling GDB and LLDB," + elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." + + if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + elog "install app-emacs/rust-mode to get emacs support for rust." + fi + + if has_version app-editors/gvim || has_version app-editors/vim; then + elog "install app-vim/rust-vim to get vim support for rust." + fi + + if has_version 'app-shells/zsh'; then + elog "install app-shells/rust-zshcomp to get zsh completion for rust." + fi +} + +pkg_postrm() { + eselect rust unset --if-invalid +} From aaf560f909973380a79ac2bc91a08a604286152d Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 10 Feb 2018 18:32:59 -0500 Subject: [PATCH 7/8] dev-lang/rust: Apply CoreOS changes Prevent build failures with GCC 7 due to -Wimplicit-fallthrough. --- .../dev-lang/rust/{rust-1.23.0.ebuild => rust-1.23.0-r1.ebuild} | 2 ++ 1 file changed, 2 insertions(+) rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.23.0.ebuild => rust-1.23.0-r1.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild index eb5a124a96..116376fe5a 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.23.0-r1.ebuild @@ -67,6 +67,8 @@ src_prepare() { local rust_stage0_name="RUST_STAGE0_${ARCH}" local rust_stage0="${!rust_stage0_name}" + sed -i -e /-Werror/d src/binaryen/CMakeLists.txt + "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die default From 4cbbb604921846da29095e5ea4413f80732954c5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 10 Feb 2018 18:33:55 -0500 Subject: [PATCH 8/8] chore(metadata): Regenerate cache --- ...reos-init-0.0.1-r157 => coreos-init-0.0.1-r158} | 2 +- .../md5-cache/coreos-base/coreos-init-9999 | 2 +- .../metadata/md5-cache/dev-lang/rust-1.23.0-r1 | 14 ++++++++++++++ ...oud-sdk-138.0.0 => google-cloud-sdk-138.0.0-r1} | 4 ++-- .../sys-apps/{ignition-0.21.0 => ignition-0.22.0} | 4 ++-- .../metadata/md5-cache/sys-apps/ignition-9999 | 2 +- .../md5-cache/sys-kernel/coreos-kernel-4.14.18 | 12 ------------ .../md5-cache/sys-kernel/coreos-kernel-4.14.18-r3 | 12 ++++++++++++ ...oreos-kernel-4.15.2 => coreos-kernel-4.15.2-r3} | 8 ++++---- ...os-modules-4.15.2 => coreos-modules-4.14.18-r3} | 6 +++--- ...os-modules-4.14.18 => coreos-modules-4.15.2-r3} | 6 +++--- ...s-sources-4.14.18 => coreos-sources-4.14.18-r1} | 4 ++-- ...eos-sources-4.15.2 => coreos-sources-4.15.2-r1} | 4 ++-- 13 files changed, 47 insertions(+), 33 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{coreos-init-0.0.1-r157 => coreos-init-0.0.1-r158} (95%) create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/{google-cloud-sdk-138.0.0 => google-cloud-sdk-138.0.0-r1} (95%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{ignition-0.21.0 => ignition-0.22.0} (95%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18-r3 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.15.2 => coreos-kernel-4.15.2-r3} (50%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.15.2 => coreos-modules-4.14.18-r3} (88%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.14.18 => coreos-modules-4.15.2-r3} (88%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.14.18 => coreos-sources-4.14.18-r1} (94%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.15.2 => coreos-sources-4.15.2-r1} (94%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r157 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r158 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r157 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r158 index 1fcd0accb4..579a3ccbe5 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r157 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r158 @@ -10,4 +10,4 @@ RDEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-la REQUIRED_USE=symlink-usr SLOT=0 _eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 52a888802d25387c2c74cb845d1219bc multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=cad64ab7caed63496ce15a6cd9609e21 +_md5_=b521ee2c80171a05631b5e77ec9e803c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 index 5b45d3f14b..8e2a853b22 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 @@ -10,4 +10,4 @@ RDEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-la REQUIRED_USE=symlink-usr SLOT=0 _eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 52a888802d25387c2c74cb845d1219bc multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=cad64ab7caed63496ce15a6cd9609e21 +_md5_=b521ee2c80171a05631b5e77ec9e803c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 new file mode 100644 index 0000000000..1b5bb1a580 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/rust-1.23.0-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup +DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake +DESCRIPTION=Systems programming language from Mozilla +EAPI=6 +HOMEPAGE=http://www.rust-lang.org/ +IUSE=debug doc +jemalloc +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA +PDEPEND=>=dev-util/cargo-0.24.0 +RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) +SLOT=stable/1.23 +SRC_URI=https://static.rust-lang.org/dist/rustc-1.23.0-src.tar.gz -> rustc-1.23.0-src.tar.gz amd64? ( https://static.rust-lang.org/dist/rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rust-1.22.0-i686-unknown-linux-gnu.tar.gz ) +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=952875a39677cdf7006c0e53e0fa44b6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/google-cloud-sdk-138.0.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/google-cloud-sdk-138.0.0-r1 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/google-cloud-sdk-138.0.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/google-cloud-sdk-138.0.0-r1 index f0911007c9..0251e333e7 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/google-cloud-sdk-138.0.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/google-cloud-sdk-138.0.0-r1 @@ -6,8 +6,8 @@ HOMEPAGE=https://cloud.google.com/sdk/#linux IUSE=python_targets_python2_7 KEYWORDS=amd64 LICENSE=Apache-2.0 -RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !net-misc/gsutil +RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyopenssl !net-misc/gsutil SLOT=0 SRC_URI=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-138.0.0-linux-x86_64.tar.gz _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=ae3f5fbdf15a4600e387628148522852 +_md5_=9afcf5f1050281497a5a0e1cd916e885 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.21.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.22.0 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.21.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.22.0 index dc30ff9f5c..9278187704 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.21.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.22.0 @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 RDEPEND=sys-apps/coreutils sys-apps/gptfdisk sys-apps/shadow sys-apps/systemd sys-fs/btrfs-progs sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs sys-apps/util-linux REQUIRED_USE=go_version_go1_9 -SLOT=0/0.21.0 +SLOT=0/0.22.0 _eclasses_=coreos-go 1b5f6ac7749b16d9f26b8b2813f6d09c coreos-go-depend 14c6f09b2aaca3f3965f1895f1566f7c coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=04375ae18a65e2aacb79dbdde5bcbb06 +_md5_=01a97f57aac3616e88a13ef1f336f304 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 index 0d4138e915..0f9544760f 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 @@ -10,4 +10,4 @@ RDEPEND=sys-apps/coreutils sys-apps/gptfdisk sys-apps/shadow sys-apps/systemd sy REQUIRED_USE=go_version_go1_9 SLOT=0/9999 _eclasses_=coreos-go 1b5f6ac7749b16d9f26b8b2813f6d09c coreos-go-depend 14c6f09b2aaca3f3965f1895f1566f7c coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=04375ae18a65e2aacb79dbdde5bcbb06 +_md5_=01a97f57aac3616e88a13ef1f336f304 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18 deleted file mode 100644 index 18bb32672f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.14.18 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.18 -DESCRIPTION=CoreOS Linux kernel -EAPI=5 -HOMEPAGE=http://www.kernel.org -KEYWORDS=amd64 arm64 -LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.14.18 -RESTRICT=binchecks strip -SLOT=0/4.14.18 -_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=3e4e3373c05c9f190b12d6c0c9520669 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18-r3 new file mode 100644 index 0000000000..4fa59118f5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.18-r3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare pretend setup unpack +DEPEND==sys-kernel/coreos-modules-4.14.18-r3 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.18-r1 +DESCRIPTION=CoreOS Linux kernel +EAPI=5 +HOMEPAGE=http://www.kernel.org +KEYWORDS=amd64 arm64 +LICENSE=GPL-2 freedist +RDEPEND==sys-kernel/coreos-modules-4.14.18-r3 +RESTRICT=binchecks strip +SLOT=0/4.14.18-r3 +_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=7a56a7bfabe4a6255d5a16643ffca3ca diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.2-r3 similarity index 50% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.2-r3 index 536ab6d0cc..e7bc070fad 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.2-r3 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.15.2 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.15.2 +DEPEND==sys-kernel/coreos-modules-4.15.2-r3 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.15.2-r1 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.15.2 +RDEPEND==sys-kernel/coreos-modules-4.15.2-r3 RESTRICT=binchecks strip -SLOT=0/4.15.2 +SLOT=0/4.15.2-r3 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=3e4e3373c05c9f190b12d6c0c9520669 +_md5_=7a56a7bfabe4a6255d5a16643ffca3ca diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.15.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.18-r3 similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.15.2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.18-r3 index a22100fa8f..e5b70d7be9 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.15.2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.18-r3 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.15.2 +DEPEND==sys-kernel/coreos-sources-4.14.18-r1 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.14.18 +SLOT=4.14.18-r1 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=7ca470ff8c885956f6f2f3246752c9c3 +_md5_=f614ac0f1795ccc8a0fe92563706bd0a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.2-r1 similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.2-r1 index bf98740fd8..e75c0d4329 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.2-r1 @@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.15.2 +SLOT=4.15.2-r1 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.2.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=a86e13746a6ea22a0f7700ddd5a37b8f +_md5_=3b1ad86e253a7863f7348bc9ea0ade87