diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild index 98e502b926..e75053b0ea 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild @@ -52,6 +52,7 @@ 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 new file mode 100644 index 0000000000..a53604c5d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch @@ -0,0 +1,11 @@ +--- 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 "