From 8836cc7aec26699b0fc1104da45cd67eb6ca4430 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 22 May 2018 12:44:08 +0000 Subject: [PATCH 1/2] Revert "dev-util/catalyst: Hack the stage1 script to upgrade ncurses" This reverts commit 96efbc56da5b8782e31e117f952cc4dfee858b2c. With all the slotted deps and soname changes built into the SDK, the patch is no longer needed. This package can be dropped from the overlay when Gentoo stabilizes a newer version. --- ...yst-2.0.18-r5.ebuild => catalyst-2.0.18-r6.ebuild} | 1 - .../catalyst-2.0.18-coreos-upgrade-ncurses.patch | 11 ----------- 2 files changed, 12 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/{catalyst-2.0.18-r5.ebuild => catalyst-2.0.18-r6.ebuild} (98%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild index e75053b0ea..98e502b926 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r6.ebuild @@ -52,7 +52,6 @@ PATCHES=( "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch" - "${FILESDIR}/catalyst-2.0.18-coreos-upgrade-ncurses.patch" ) pkg_setup() { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch deleted file mode 100644 index a53604c5d8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- targets/stage1/stage1-chroot.sh -+++ targets/stage1/stage1-chroot.sh -@@ -30,6 +30,8 @@ - if [ -n "${clst_update_seed_command}" ]; then - clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" - else -+ clst_root_path=/ run_merge "--unmerge sys-libs/ncurses-5.9-r99" -+ clst_root_path=/ run_merge " Date: Tue, 22 May 2018 12:47:27 +0000 Subject: [PATCH 2/2] chore(metadata): Regenerate cache --- .../md5-cache/dev-libs/{rustlib-1.25.0 => rustlib-1.26.0} | 4 ++-- .../dev-util/{catalyst-2.0.18-r5 => catalyst-2.0.18-r6} | 2 +- .../{coreos-kernel-4.16.7-r1 => coreos-kernel-4.14.42} | 6 +++--- .../{coreos-kernel-4.14.39-r1 => coreos-kernel-4.16.10} | 6 +++--- .../{coreos-modules-4.16.7-r1 => coreos-modules-4.14.42} | 4 ++-- .../{coreos-modules-4.14.39-r1 => coreos-modules-4.16.10} | 4 ++-- .../{coreos-sources-4.14.39 => coreos-sources-4.14.42} | 6 +++--- .../{coreos-sources-4.16.7 => coreos-sources-4.16.10} | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/{rustlib-1.25.0 => rustlib-1.26.0} (85%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/{catalyst-2.0.18-r5 => catalyst-2.0.18-r6} (98%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.16.7-r1 => coreos-kernel-4.14.42} (53%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.14.39-r1 => coreos-kernel-4.16.10} (53%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.16.7-r1 => coreos-modules-4.14.42} (93%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.14.39-r1 => coreos-modules-4.16.10} (93%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.14.39 => coreos-sources-4.14.42} (88%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.16.7 => coreos-sources-4.16.10} (88%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.25.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.26.0 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.25.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.26.0 index 50d343105c..e3f04933cf 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.25.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/rustlib-1.26.0 @@ -6,7 +6,7 @@ IUSE=debug KEYWORDS=amd64 arm64 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA RDEPEND=!dev-lang/rust -SLOT=0/1.25.0 -SRC_URI=https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.gz +SLOT=0/1.26.0 +SRC_URI=https://static.rust-lang.org/dist/rustc-1.26.0-src.tar.gz _eclasses_=cargo 5a58e76471ae53decd3da1fa44915831 coreos-cargo ecc71b7f40f79def52bcee3f1dca6559 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af _md5_=19643e3862fb1b2e03af563c7111e46d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 index b9ec49992a..9857f4749f 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r6 @@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 SLOT=0 SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=6dc70771ae3415c7d0e6a64e8dc8bde4 +_md5_=c71150e9d8822360aeb45bb306aa7efe diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.7-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.42 similarity index 53% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.7-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.42 index 442778995f..4ce19a6f46 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.7-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.42 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.16.7-r1 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.16.7 +DEPEND==sys-kernel/coreos-modules-4.14.42 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.42 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.16.7-r1 +RDEPEND==sys-kernel/coreos-modules-4.14.42 RESTRICT=binchecks strip -SLOT=0/4.16.7-r1 +SLOT=0/4.14.42 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=b06e416b987a33bf039f3788ebb4a943 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.39-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.10 similarity index 53% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.39-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.10 index 1083ae56ce..6d4d1b0bef 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.39-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.10 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.14.39-r1 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.39 +DEPEND==sys-kernel/coreos-modules-4.16.10 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.16.10 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.39-r1 +RDEPEND==sys-kernel/coreos-modules-4.16.10 RESTRICT=binchecks strip -SLOT=0/4.14.39-r1 +SLOT=0/4.16.10 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=b06e416b987a33bf039f3788ebb4a943 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.16.7-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.42 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.16.7-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.42 index 247f570234..b568350007 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.16.7-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.42 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.16.7 +DEPEND==sys-kernel/coreos-sources-4.14.42 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.39 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.39.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz +SLOT=4.14.42 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.42.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_=452a28a8a0c4b17918bd08be1a3231f3 +_md5_=9821062a96483faa629e83ced6e736b5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.10 similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.7 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.10 index d02a237d5f..9e1955196f 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.7 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.10 @@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.16.7 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz +SLOT=4.16.10 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.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_=f02ea43a50aac3606fb7ce210d1dda8e