From 9dbeb1b7131ea53bfa99053dd147610ffc5b8005 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 19 Mar 2019 22:13:07 +0000 Subject: [PATCH 1/6] profiles: Drop some obsolete package references --- .../coreos-overlay/profiles/coreos/amd64/package.use.force | 0 .../profiles/coreos/base/package.accept_keywords | 7 ------- .../coreos-overlay/profiles/coreos/base/package.unmask | 6 ------ .../coreos/targets/generic/package.accept_keywords | 0 4 files changed, 13 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.accept_keywords diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/package.use.force deleted file mode 100644 index e69de29bb2..0000000000 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 2726cb3ba8..6b8149873a 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 @@ -33,12 +33,6 @@ dev-util/checkbashisms # mtools 4.0.18 has '-i' flag for working with images =sys-fs/mtools-4.0.18 -# flex 2.6.1 breaks cross-compiling, but 2.6.3 adds a configure workaround -=sys-devel/flex-2.6.3 ** - -# xfsprogs 4.5.0 has install conflicts, and versions in between fail to link -=sys-fs/xfsprogs-4.9.0 ** - # systemd v238 requires libseccomp 2.3.3 =sys-libs/libseccomp-2.3.3 ** @@ -58,4 +52,3 @@ dev-util/checkbashisms # Force upgrades to work around catalyst problems while upgrading ncurses. =app-crypt/gnupg-2.2.7 ~amd64 =sys-apps/gptfdisk-1.0.3 ~amd64 -=sys-apps/util-linux-2.32 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask deleted file mode 100644 index 22d08b96ab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask +++ /dev/null @@ -1,6 +0,0 @@ -# masked in portage-stable, but is unmasked in upstream. -# remove this when upstream portage-stable package.mask is sync'd. -=sys-block/open-iscsi-2.0.873 - -# masked upstream due to ancientness - Date: Tue, 19 Mar 2019 22:21:15 +0000 Subject: [PATCH 2/6] sys-libs/timezone-data: Sync with Gentoo --- ...imezone-data-2018e => timezone-data-2018i} | 10 +- .../sys-libs/timezone-data/Manifest | 4 +- .../timezone-data/timezone-data-2018e.ebuild | 97 ---------- .../timezone-data/timezone-data-2018i.ebuild | 178 ++++++++++++++++++ 4 files changed, 185 insertions(+), 104 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/{timezone-data-2018e => timezone-data-2018i} (64%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018e.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018e b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i similarity index 64% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018e rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i index 41298f041f..c85257e59e 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018e +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i @@ -1,13 +1,13 @@ -DEFINED_PHASES=compile configure install prepare test +DEFINED_PHASES=compile config configure install postinst preinst prepare test DEPEND=nls? ( virtual/libintl ) DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump) EAPI=6 -HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm +HOMEPAGE=https://www.iana.org/time-zones IUSE=nls leaps_timezone elibc_FreeBSD -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 -SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2018e.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2018e.tar.gz +SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2018i.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2018i.tar.gz _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=151a11dcda86d01d9551c03c7294ea6f +_md5_=f0fd2fc53d05f12fda5575aa97d61810 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest index fd3538ccc9..50bea910eb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/Manifest @@ -1,2 +1,2 @@ -DIST tzcode2018e.tar.gz 231732 BLAKE2B 5e73cd4d005413e3be56dfa01b5d023a6f07a37f84c0c2ac2eb126319fb8c34f435541b79f7f9776d3ef155e5db026ce8818a555687061fbf466220cb27c7343 SHA512 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 -DIST tzdata2018e.tar.gz 353953 BLAKE2B eaa18546434f71541567de75df17e03f8b7e4b5397e2b22e41d3ba51ba26dfe08a311926329737d9175df5e3a554ba06237cb12ff80a93a7ca441ceb7cd02710 SHA512 d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae +DIST tzcode2018i.tar.gz 242962 BLAKE2B 682a23c324b6d8e1a0d63c6140c82ca3a24017c0972e7f915ecad5e0838f8f57743ffa2c5d9cc9744739a0e7d791ddb21947618cd11635767800ac99307c9548 SHA512 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d +DIST tzdata2018i.tar.gz 377009 BLAKE2B fa28fdac145756368d4760c418742efd558e63fd9900fc4649971b683b162df5e566c6214a79ec46b48fc65af488a7e0e95ddb6176a4f9adb5b39bc634426143 SHA512 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018e.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018e.ebuild deleted file mode 100644 index 3d123e34d9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018e.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs flag-o-matic - -code_ver=${PV} -data_ver=${PV} -DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" -HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" -SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz - http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" - -LICENSE="BSD public-domain" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="nls leaps_timezone elibc_FreeBSD" - -DEPEND="nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !sys-libs/glibc[vanilla(+)]" - -S=${WORKDIR} - -src_prepare() { - default - tc-is-cross-compiler && cp -pR "${S}" "${S}"-native -} - -src_configure() { - tc-export CC - - append-lfs-flags #471102 - - if use elibc_FreeBSD || use elibc_Darwin ; then - append-cppflags -DSTD_INSPIRED #138251 - fi - - append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' - LDLIBS="" - if use nls ; then - # See if an external libintl is available. #154181 #578424 - local c="${T}/test" - echo 'main(){}' > "${c}.c" - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then - LDLIBS+=" -lintl" - fi - fi -} - -_emake() { - emake \ - REDO=$(usex leaps_timezone posix_right posix_only) \ - TZDATA_TEXT= \ - TOPDIR="${EPREFIX}" \ - ZICDIR='$(TOPDIR)/usr/bin' \ - "$@" -} - -src_compile() { - _emake \ - AR="$(tc-getAR)" \ - cc="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LDLIBS="${LDLIBS}" - if tc-is-cross-compiler ; then - _emake -C "${S}"-native \ - AR="$(tc-getBUILD_AR)" \ - cc="$(tc-getBUILD_CC)" \ - RANLIB="$(tc-getBUILD_RANLIB)" \ - CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ - LDFLAGS="${BUILD_LDFLAGS}" \ - LDLIBS="${LDLIBS}" \ - zic - fi -} - -src_test() { - # VALIDATE_ENV is used for extended/web based tests. Punt on them. - emake -j1 check VALIDATE_ENV=true -} - -src_install() { - local zic="" - tc-is-cross-compiler && zic="zic=${S}-native/zic" - _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" - rm -rf "${D}/nukeit" "${ED}/etc" || die - # Delete man pages installed by man-pages package. - rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die - dodoc CONTRIBUTING README NEWS *.html - - # install the symlink by hand to not break existing timezones - dosym . /usr/share/zoneinfo/posix -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild new file mode 100644 index 0000000000..48ee5887cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit toolchain-funcs flag-o-matic + +code_ver=${PV} +data_ver=${PV} +DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" +HOMEPAGE="https://www.iana.org/time-zones" +SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz + https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" + +LICENSE="BSD public-domain" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="nls leaps_timezone elibc_FreeBSD" + +DEPEND="nls? ( virtual/libintl )" +RDEPEND="${DEPEND} + !sys-libs/glibc[vanilla(+)]" + +S=${WORKDIR} + +src_prepare() { + default + + # check_web contacts validator.w3.org + sed -i -e 's/check_tables check_web/check_tables/g' \ + Makefile || die "Failed to disable check_web" + + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native +} + +src_configure() { + tc-export CC + + append-lfs-flags #471102 + + if use elibc_FreeBSD || use elibc_Darwin ; then + append-cppflags -DSTD_INSPIRED #138251 + fi + + append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' + LDLIBS="" + if use nls ; then + # See if an external libintl is available. #154181 #578424 + local c="${T}/test" + echo 'main(){}' > "${c}.c" + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then + LDLIBS+=" -lintl" + fi + fi +} + +_emake() { + emake \ + REDO=$(usex leaps_timezone posix_right posix_only) \ + TZDATA_TEXT= \ + TOPDIR="${EPREFIX}" \ + ZICDIR='$(TOPDIR)/usr/bin' \ + "$@" +} + +src_compile() { + _emake \ + AR="$(tc-getAR)" \ + cc="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LDLIBS="${LDLIBS}" + if tc-is-cross-compiler ; then + _emake -C "${S}"-native \ + AR="$(tc-getBUILD_AR)" \ + cc="$(tc-getBUILD_CC)" \ + RANLIB="$(tc-getBUILD_RANLIB)" \ + CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + LDLIBS="${LDLIBS}" \ + zic + fi +} + +src_test() { + # VALIDATE_ENV is used for extended/web based tests. Punt on them. + emake -j1 check VALIDATE_ENV=true +} + +src_install() { + local zic="" + tc-is-cross-compiler && zic="zic=${S}-native/zic" + _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" + rm -rf "${D}/nukeit" "${ED}/etc" || die + + insinto /usr/share/zoneinfo + doins "${S}"/leap-seconds.list + + # Delete man pages installed by man-pages package. + rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die + dodoc CONTRIBUTING README NEWS *.html +} + +get_TIMEZONE() { + local tz src="${EROOT}etc/timezone" + if [[ -e ${src} ]] ; then + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") + else + tz="FOOKABLOIE" + fi + [[ -z ${tz} ]] && return 1 || echo "${tz}" +} + +pkg_preinst() { + local tz=$(get_TIMEZONE) + if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then + eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" + eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" + eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" + eerror "be using right/xxx for the system timezone as it breaks programs." + die "Please fix your timezone setting" + fi + + # Trim the symlink by hand to avoid portage's automatic protection checks. + rm -f "${EROOT}"/usr/share/zoneinfo/posix + + if has_version "<=${CATEGORY}/${PN}-2015c" ; then + elog "Support for accessing posix/ and right/ directly has been dropped to match" + elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." + elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" + elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" + fi +} + +configure_tz_data() { + # make sure the /etc/localtime file does not get stale #127899 + local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" + + # If it's a symlink, assume the user knows what they're doing and + # they're managing it themselves. #511474 + if [[ -L ${etc_lt} ]] ; then + einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." + return 0 + fi + + if ! tz=$(get_TIMEZONE) ; then + einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." + return 0 + fi + if [[ ${tz} == "FOOKABLOIE" ]] ; then + elog "You do not have TIMEZONE set in ${src}." + + if [[ ! -e ${etc_lt} ]] ; then + cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" + elog "Setting ${etc_lt} to Factory." + else + elog "Skipping auto-update of ${etc_lt}." + fi + return 0 + fi + + if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then + elog "You have an invalid TIMEZONE setting in ${src}" + elog "Your ${etc_lt} has been reset to Factory; enjoy!" + tz="Factory" + fi + einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" + cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" +} + +pkg_config() { + configure_tz_data +} + +pkg_postinst() { + configure_tz_data +} From 17390976f02d8f00f401092520c6c5d9b65d6d18 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 19 Mar 2019 22:23:28 +0000 Subject: [PATCH 3/6] sys-libs/timezone-data: Apply CoreOS changes Recreate the old posix symlink for compatibility, and drop all the pkg functions that maintain /etc/localtime since we default to UTC. --- .../md5-cache/sys-libs/timezone-data-2018i | 4 +- .../timezone-data/timezone-data-2018i.ebuild | 78 +------------------ 2 files changed, 5 insertions(+), 77 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i index c85257e59e..526392e858 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2018i @@ -1,4 +1,4 @@ -DEFINED_PHASES=compile config configure install postinst preinst prepare test +DEFINED_PHASES=compile configure install prepare test DEPEND=nls? ( virtual/libintl ) DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump) EAPI=6 @@ -10,4 +10,4 @@ RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2018i.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2018i.tar.gz _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=f0fd2fc53d05f12fda5575aa97d61810 +_md5_=98ebd925da30d67ca3a4c61d356f5bc3 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild index 48ee5887cf..bd2cd3b286 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2018i.ebuild @@ -100,79 +100,7 @@ src_install() { # Delete man pages installed by man-pages package. rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die dodoc CONTRIBUTING README NEWS *.html -} - -get_TIMEZONE() { - local tz src="${EROOT}etc/timezone" - if [[ -e ${src} ]] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") - else - tz="FOOKABLOIE" - fi - [[ -z ${tz} ]] && return 1 || echo "${tz}" -} - -pkg_preinst() { - local tz=$(get_TIMEZONE) - if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then - eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" - eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" - eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" - eerror "be using right/xxx for the system timezone as it breaks programs." - die "Please fix your timezone setting" - fi - - # Trim the symlink by hand to avoid portage's automatic protection checks. - rm -f "${EROOT}"/usr/share/zoneinfo/posix - - if has_version "<=${CATEGORY}/${PN}-2015c" ; then - elog "Support for accessing posix/ and right/ directly has been dropped to match" - elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." - elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" - elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" - fi -} - -configure_tz_data() { - # make sure the /etc/localtime file does not get stale #127899 - local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" - - # If it's a symlink, assume the user knows what they're doing and - # they're managing it themselves. #511474 - if [[ -L ${etc_lt} ]] ; then - einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." - return 0 - fi - - if ! tz=$(get_TIMEZONE) ; then - einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." - return 0 - fi - if [[ ${tz} == "FOOKABLOIE" ]] ; then - elog "You do not have TIMEZONE set in ${src}." - - if [[ ! -e ${etc_lt} ]] ; then - cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" - elog "Setting ${etc_lt} to Factory." - else - elog "Skipping auto-update of ${etc_lt}." - fi - return 0 - fi - - if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then - elog "You have an invalid TIMEZONE setting in ${src}" - elog "Your ${etc_lt} has been reset to Factory; enjoy!" - tz="Factory" - fi - einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" - cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" -} - -pkg_config() { - configure_tz_data -} - -pkg_postinst() { - configure_tz_data + + # install the symlink by hand to not break existing timezones + dosym . /usr/share/zoneinfo/posix } From f0bf4fe7582693c8b64a87f1d4d4d0699ed09d62 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Mar 2019 03:29:14 +0000 Subject: [PATCH 4/6] sys-apps/seismograph: Bump for GCC 8 fix --- .../md5-cache/sys-apps/{seismograph-2.2.4 => seismograph-2.2.5} | 2 +- .../coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999 | 2 +- .../{seismograph-2.2.4.ebuild => seismograph-2.2.5.ebuild} | 0 .../coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{seismograph-2.2.4 => seismograph-2.2.5} (96%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/{seismograph-2.2.4.ebuild => seismograph-2.2.5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.5 similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.4 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.5 index 05d3a7bd48..29928e20a4 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.4 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.5 @@ -8,4 +8,4 @@ LICENSE=BSD RDEPEND=!coreos-base/vboot_reference !sys-apps/rootdev sys-apps/util-linux sys-fs/e2fsprogs SLOT=0 _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 696393cddf6200db17a31641f597b403 cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=ca3ba8177a20e34a195fabd0691ac29d +_md5_=884ae90d241d44711ac77e7548e7689a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999 index b851c9fad1..8d289f01c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999 @@ -8,4 +8,4 @@ LICENSE=BSD RDEPEND=!coreos-base/vboot_reference !sys-apps/rootdev sys-apps/util-linux sys-fs/e2fsprogs SLOT=0 _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 696393cddf6200db17a31641f597b403 cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=ca3ba8177a20e34a195fabd0691ac29d +_md5_=884ae90d241d44711ac77e7548e7689a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild index e86c7b4d3b..5263de4b2a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild @@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="d4dbaa5bbcab7f659a22c11d904c61c626b4c514" + CROS_WORKON_COMMIT="edbe2360e9af362914868df0c7c1ace62e8e1778" KEYWORDS="amd64 arm arm64 x86" fi From 99ea366c6bd1236c1283997669e9a993a29f5920 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Mar 2019 14:36:13 +0000 Subject: [PATCH 5/6] coreos-base/update_engine: Bump for GCC 8 fix --- .../{update_engine-0.4.9.ebuild => update_engine-0.4.10.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- .../coreos-base/{update_engine-0.4.9 => update_engine-0.4.10} | 2 +- .../metadata/md5-cache/coreos-base/update_engine-9999 | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.9.ebuild => update_engine-0.4.10.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{update_engine-0.4.9 => update_engine-0.4.10} (97%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.9.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.9.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index e42e1cd1a1..35cda83503 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="47dfb956377b748d2c5ab0a0e49218b79b29c2bf" # v0.4.9 + CROS_WORKON_COMMIT="b0a992aca295028f9854a9036f1e089c09539fb1" # v0.4.10 KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.10 similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.9 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.10 index 3b1b04f850..7c1899b07b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.9 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.10 @@ -9,4 +9,4 @@ LICENSE=BSD RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:= dev-util/bsdiff net-misc/curl >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs SLOT=0 _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 696393cddf6200db17a31641f597b403 cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=9ac3e28793738c7b392c25a6eb2aa9a8 +_md5_=ff9f35065c0522165540d01b53b0afbf diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 index 030e2c4380..82f9e25eca 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 @@ -9,4 +9,4 @@ LICENSE=BSD RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:= dev-util/bsdiff net-misc/curl >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs SLOT=0 _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 696393cddf6200db17a31641f597b403 cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=9ac3e28793738c7b392c25a6eb2aa9a8 +_md5_=ff9f35065c0522165540d01b53b0afbf From f1a736fe76394a71f0f799cfe4eb07e34bde85e1 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 22 Mar 2019 04:36:52 +0000 Subject: [PATCH 6/6] profiles: Pin gcc-config to the last working version --- .../coreos-overlay/profiles/coreos/base/package.mask | 4 ++++ 1 file changed, 4 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..c381183244 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,7 @@ # mask an accidental rkt major version bump to ensure it's not chosen over more # recent releases =app-emulation/rkt-13.0 + +# Since version 2, it tries to write liblto symlinks with absolute paths that +# don't work when building for the board root directories. +>=sys-devel/gcc-config-2