mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1305 from marineam/gentoo-functions

Browse Source 
Migrate to gentoo-functions
This commit is contained in:
Michael Marineau 2015-06-23 16:18:29 -07:00
commit d6022b1163
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -26,11 +26,6 @@
=app-benchmarks/i7z-0.27-r1 ~amd64 =app-benchmarks/i7z-0.27-r1 ~amd64
=dev-libs/opencryptoki-2.4.2 ~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 # CRIU dependencies
=dev-libs/protobuf-c-0.15 ~amd64 =dev-libs/protobuf-c-0.15 ~amd64
@ -119,3 +114,6 @@ dev-util/checkbashisms
# link jq binary dynamically # link jq binary dynamically
=app-misc/jq-1.4-r1 =app-misc/jq-1.4-r1
# https://bugs.gentoo.org/show_bug.cgi?id=548158
=sys-apps/gentoo-functions-0.10

2
sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages vendored
View File

@ -1,4 +1,4 @@
# Add systemd to the 'system' set # Add systemd to the 'system' set
*sys-apps/efunctions *sys-apps/gentoo-functions
*sys-apps/systemd *sys-apps/systemd
-*sys-apps/openrc -*sys-apps/openrc

2
sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build vendored
View File

@ -1,3 +1,3 @@
sys-apps/dbus sys-apps/dbus
sys-apps/efunctions sys-apps/gentoo-functions
-sys-apps/openrc -sys-apps/openrc

0
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.13.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.14.ebuild vendored
View File

9
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild vendored
View File

@ -31,7 +31,7 @@ DEPEND="sys-apps/systemd
# Make sure coreos-init is not installed in the SDK # Make sure coreos-init is not installed in the SDK
RDEPEND="${DEPEND} RDEPEND="${DEPEND}
sys-apps/efunctions >=sys-apps/gentoo-functions-0.10
cros_host? ( !coreos-base/coreos-init )" cros_host? ( !coreos-base/coreos-init )"
declare -A LIB_SYMS # list of /lib->lib64 symlinks declare -A LIB_SYMS # list of /lib->lib64 symlinks
@ -186,4 +186,11 @@ pkg_postinst() {
touch "${ROOT}/etc/"{group,gshadow,passwd,shadow} touch "${ROOT}/etc/"{group,gshadow,passwd,shadow}
chmod 640 "${ROOT}/etc/"{gshadow,shadow} chmod 640 "${ROOT}/etc/"{gshadow,shadow}
fi 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
} }