From 58d9e69737a115d7e61efb2749c6e1121e0f7305 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 23 Jun 2015 17:45:16 -0400 Subject: [PATCH 1/3] profiles: update to gentoo-functions 0.10 gentoo-functions replaces the old /etc/init.d/functions.sh (provided by sys-apps/efunctions in CoreOS or OpenRC in Gentoo). Version 0.10 fixes eerror to log to stderr, matching the behavior of OpenRC. This bug is also present in efunctions and will be resolved by switching to gentoo-functions instead. --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 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 a06f609dac..22b625068c 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 @@ -119,3 +119,6 @@ dev-util/checkbashisms # link jq binary dynamically =app-misc/jq-1.4-r1 + +# https://bugs.gentoo.org/show_bug.cgi?id=548158 +=sys-apps/gentoo-functions-0.10 From fd91ed98a8c781428f4f87ffa0ab89d5c6600457 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 23 Jun 2015 18:43:18 -0400 Subject: [PATCH 2/3] baselayout: migrate from efunctions to gentoo-functions --- ...baselayout-3.0.13.ebuild => baselayout-3.0.14.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.13.ebuild => baselayout-3.0.14.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.13.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.14.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.13.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.14.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 63c774a0a0..f7d9568c91 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -31,7 +31,7 @@ DEPEND="sys-apps/systemd # Make sure coreos-init is not installed in the SDK RDEPEND="${DEPEND} - sys-apps/efunctions + >=sys-apps/gentoo-functions-0.10 cros_host? ( !coreos-base/coreos-init )" declare -A LIB_SYMS # list of /lib->lib64 symlinks @@ -186,4 +186,11 @@ pkg_postinst() { touch "${ROOT}/etc/"{group,gshadow,passwd,shadow} chmod 640 "${ROOT}/etc/"{gshadow,shadow} fi + # compat symlink for packages that haven't migrated to gentoo-functions + local func=../../lib/gentoo/functions.sh + if [[ "$(readlink "${ROOT}/etc/init.d/functions.sh")" != "${func}" ]]; then + elog "Creating /etc/init.d/functions.sh symlink..." + mkdir -p "${ROOT}/etc/init.d" + ln -sf "${func}" "${ROOT}/etc/init.d/functions.sh" + fi } From c5137ff7f2eb5aae62d4229279b59021a64a673f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 23 Jun 2015 18:56:28 -0400 Subject: [PATCH 3/3] profiles: replace efunctions with gentoo-functions in @system --- .../profiles/coreos/base/package.accept_keywords | 5 ----- .../coreos-overlay/profiles/features/systemd/packages | 2 +- .../coreos-overlay/profiles/features/systemd/packages.build | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) 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 22b625068c..21f2b22b55 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 @@ -26,11 +26,6 @@ =app-benchmarks/i7z-0.27-r1 ~amd64 =dev-libs/opencryptoki-2.4.2 ~amd64 -# Replace the function.sh script in baselayout -=sys-apps/efunctions-1 ~amd64 ~x86 - -#=dev-libs/libxml2-2.9.0-r1 ~amd64 - # CRIU dependencies =dev-libs/protobuf-c-0.15 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages index 2d4ed12f5b..92783beb68 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages @@ -1,4 +1,4 @@ # Add systemd to the 'system' set -*sys-apps/efunctions +*sys-apps/gentoo-functions *sys-apps/systemd -*sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build index 12a43c51e8..a3d7e98b94 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build @@ -1,3 +1,3 @@ sys-apps/dbus -sys-apps/efunctions +sys-apps/gentoo-functions -sys-apps/openrc