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 "=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