From 81e4c17d6044cacf1794814a141bc91548d6b6e2 Mon Sep 17 00:00:00 2001 From: Jeremiah Orem Date: Fri, 22 Nov 2013 20:43:19 -0500 Subject: [PATCH] Symlink /{bin,sbin,lib64} to /usr/. This also introduces a new USE flag, "symlink-usr". --- .../baselayout/baselayout-2.2-r102.ebuild | 255 ++++++++++++++++++ .../sys-apps/systemd-sysv-utils/ChangeLog | 20 ++ .../sys-apps/systemd-sysv-utils/Manifest | 1 + .../sys-apps/systemd-sysv-utils/metadata.xml | 8 + .../systemd-sysv-utils-207-r1.ebuild | 37 +++ 5 files changed, 321 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r102.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/ChangeLog create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r102.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r102.ebuild new file mode 100644 index 0000000000..7dc8b3d554 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r102.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.16 2013/07/27 22:56:21 williamh Exp $ + +inherit eutils multilib + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="build cros_host kernel_linux symlink-usr" + +RDEPEND="cros_host? ( !coreos-base/coreos-init )" + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_warn() { + local syms=$1 dirs=$2 def_libdir=$3 + + [ -z "${syms}${dirs}" ] && return + + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means" + if [ -z "${syms}" ] ; then + ewarn "you need to have these paths as symlinks to ${def_libdir}:" + ewarn "$1" + fi +} +multilib_layout() { + local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + exp=( {,usr/,usr/local/}${libdir} ) + for d in "${exp[@]/#/${ROOT}}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + +if use symlink-usr ; then + for libdir in ${libdirs} ; do + if use symlink-usr && [ "${libdir}" != "lib" ] ; then + ln -s usr/${libdir} ${ROOT}/${libdir} + fi + done +fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + local prefix + for prefix in "${ROOT}"{,usr/,usr/local/} ; do + if [ "${SYMLINK_LIB}" = yes ] ; then + # we need to make sure "lib" points to the native libdir + if [ -h "${prefix}lib" ] ; then + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] ; then + # make sure the old "lib" ABI location does not exist; we + # only symlinked the lib dir on systems where we moved it + # to "lib32" ... + case ${CHOST} in + *-gentoo-freebsd*) ;; # We want it the other way on fbsd. + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [ -d "${prefix}lib32" ] ; then + rm -f "${prefix}lib32"/.keep + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + fi + fi + done +} + +pkg_preinst() { + # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of + # the baselayout-1.x ebuild copies all the real configs from the user's + # /etc/conf.d into ${D}, it makes them all appear to be the default + # versions. In order to protect them from being unmerged after this + # upgrade, modify their timestamps. + touch "${ROOT}"/etc/conf.d/* 2>/dev/null + + # This is written in src_install (so it's in CONTENTS), but punt all + # pending updates to avoid user having to do etc-update (and make the + # pkg_postinst logic simpler). + rm -f "${ROOT}"/etc/._cfg????_gentoo-release + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use symlink-usr ; then + for bindir in bin sbin ; do + mkdir -p "${ROOT}"/usr/${bindir} + ln -s usr/${bindir} "${ROOT}"/${bindir} + done + fi + if use build ; then + emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die + fi + rm -f "${D}"/usr/share/${PN}/Makefile +} + +src_install() { + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${D}" \ + install || die + dodoc ChangeLog.svn + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile || die + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release + + if use !cros_host; then + # Don't install /etc/issue since it is handled by coreos-init + rm "${D}"/etc/issue + fi +} + +pkg_postinst() { + local x + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${ROOT}etc/${x}" ] && continue + [ -e "${ROOT}usr/share/baselayout/${x}" ] || continue + cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc + done + + # Force shadow permissions to not be world-readable #260993 + for x in shadow ; do + [ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}" + done + + # Take care of the etc-update for the user + if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then + mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release + fi + + # whine about users that lack passwords #193541 + if [[ -e ${ROOT}/etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi + + # baselayout leaves behind a lot of .keep files, so let's clean them up + find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null + find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null + + # whine about users with invalid shells #215698 + if [[ -e ${ROOT}/etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort) + if [[ -n ${bad_shells} ]] ; then + echo + ewarn "The following users have non-existent shells!" + ewarn "${bad_shells}" + fi + fi + + # http://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${ROOT}"/run + + if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then + echo + ewarn "You should reboot the system now to get /run mounted with tmpfs!" + fi + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/ChangeLog new file mode 100644 index 0000000000..6ffb32a20e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/ChangeLog @@ -0,0 +1,20 @@ +# ChangeLog for sys-apps/systemd-sysv-utils +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog,v 1.3 2013/09/20 16:37:33 mgorny Exp $ + +*systemd-sysv-utils-207 (20 Sep 2013) + + 20 Sep 2013; Michał Górny +systemd-sysv-utils-207.ebuild, + -systemd-sysv-utils-194.ebuild, -systemd-sysv-utils-37.ebuild: + Version bump, remove old. Fix init symlink wrt bug #485446. + +*systemd-sysv-utils-194 (04 Oct 2012) + + 04 Oct 2012; Michał Górny +systemd-sysv-utils-194.ebuild: + Version bump, as requested per bug #430876. + +*systemd-sysv-utils-37 (07 Jan 2012) + + 07 Jan 2012; Michał Górny + +systemd-sysv-utils-37.ebuild, +metadata.xml: + Introduce an ebuild for systemd sysv-compat symlinks and manpages. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/Manifest new file mode 100644 index 0000000000..4f7196f198 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/Manifest @@ -0,0 +1 @@ +DIST systemd-207.tar.xz 2363804 SHA256 ac1f8120315e7969063bbb0c181c8dc59509aeaf10c4266077c257a182ad5942 SHA512 566c6126fea038cb182608f7b9c3bb4410d0622cb637f30c60fba73c9052f7a36d2b0f790e3d94bb751080448ba14cee600481da378f5e97b0f5becfc849be54 WHIRLPOOL 823c3064e1e961599011d4cd027f5e2d0ba3b434c67b880d1a541720220f40c7cc82211f3f086042dbb440b2c7e11e1379aa0d656e33a2a7ba5b1d7e45b904f7 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/metadata.xml new file mode 100644 index 0000000000..fe305d2095 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/metadata.xml @@ -0,0 +1,8 @@ + + + + + systemd@gentoo.org + Gentoo systemd team + + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild new file mode 100644 index 0000000000..86333fd470 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207.ebuild,v 1.1 2013/09/20 16:37:33 mgorny Exp $ + +EAPI=5 + +MY_P=systemd-${PV} + +DESCRIPTION="sysvinit compatibility symlinks and manpages" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="http://www.freedesktop.org/software/systemd/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="symlink-usr" + +RDEPEND="!sys-apps/sysvinit + >=sys-apps/systemd-201" + +S=${WORKDIR}/${MY_P}/man + +src_install() { + local sym_prefix + if use symlink-usr ; then + sym_prefix=".." + else + sym_prefix="../usr" + fi + for app in halt poweroff reboot runlevel shutdown telinit; do + doman ${app}.8 + dosym ${sym_prefix}/bin/systemctl /sbin/${app} + done + + newman init.1 init.8 + dosym ${sym_prefix}/lib/systemd/systemd /sbin/init +}