Include "keyword -lxc" in the kmod-static-nodes init script wrt #511642 by "Walter"

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 235 insertions, 12 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 6d16ff48ab52..fd3743deb2d9 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.158 2014/06/22 08:03:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.159 2014/07/11 12:28:07 ssuominen Exp $
+
+*kmod-18-r1 (11 Jul 2014)
+
+  11 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/kmod-static-nodes-r1, +kmod-18-r1.ebuild, kmod-9999.ebuild:
+  Include "keyword -lxc" in the kmod-static-nodes init script wrt #511642 by
+  "Walter"
 
 *kmod-18 (22 Jun 2014)
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index be53770943d6..91f88741e9bf 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 AUX kmod-15-dynamic-kmod.patch 493 SHA256 36aa0232ec80a8f211c29d349ab5ef8c3f6dea1cb490e5d5c272125d30e3f04d SHA512 f26a75da8b0cfe861c60e6bdb66eec61be74038e1fa4ae45c4f8d19ea2b08e2b96683bc33e5b91945522c8dfc3af61bac094b31a1dda44965e378acf4ec4eb83 WHIRLPOOL 33e5bcb0658215005feb952dd0f42fb60242d1541d4e9ac5a76a34fba16b3638d48eeec17c1d9a98caff4d0f80e8fa9e37a2b0a2bbcfabbf9c25571460d8536d
 AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7fa8b7188b364689b0e SHA512 cddd4e95ffd112adedfb01c90ea3cea268236983f2dd88f0a83855d62dfa8a63e1f1457a9517ebbc45970455b8f8c0dc7f4d56c138bcc3d453c7ba61d189ff85 WHIRLPOOL 920e19b8d99ff77a337b0edf2fda3461249bdd253d1c6d14c1e872d931ef643679185e8bac6b7d58490dae640f78cc1a8492f627893bfee46b48fa2c4efc947b
+AUX kmod-static-nodes-r1 601 SHA256 21995879ee2ac6727ca5784a309eff5dd41b93030efc854f123b8a4d8ef3294b SHA512 d95b63174b7e28cc8d72b28a1a436fb108164528d5643ce9f65012f233151604f6b26c20c64fbe2f657fbbd6863c08ae9094c5bdc2dfc68d417448e268a7bc11 WHIRLPOOL f0342f23912535134e5cbc88cd13fdd9a6681ba5502a15cb5b0d5aafe2d6db4a2bba806293be29b9e14f11ad28456cc1104f6d031b88d1142ab313407df73163
 DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5 SHA512 326921bb184d53840837cc600f6301b948031ef7c2048e46ef16bc26ef7b967fa3c20cb133b1ebbddcf8a8537e9af8166fbca6a28d94f694f12ce1d89361a1bc WHIRLPOOL 625c277d7733a344040eaaeca26ce103d79c96ca1ba7759302e5fd573bba86285420c6f599a70411e7732e22145108afadbc29606d9f8fc62fe94479480f3a3f
 DIST kmod-17.tar.xz 1484336 SHA256 3ba7470041de04ca88308f501901b574169cb517d3192397074611b3921a2dfa SHA512 2b237a96b8bcfe03bde30d4f8b6886f8ec33817cc6f0fe810f6f382310bd71814236b299b9051304ca5a9b29c205d8e1ba5a15bf6ee98648644ac268dc368294 WHIRLPOOL 421f95e48da7baf40617c9222d4cc26868d26dbf51f77aa2613cfe5cf7a84b5489eca4611fe86108135c164890eeab32916836776561ab8f2541aa10456d1095
 DIST kmod-18.tar.xz 1473904 SHA256 e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e SHA512 6704f52f1b69837f06516237fb61d3f29551b06e59f270561993e0318c104bdc0140a32d3fc9bda859d0918412ea2c40effa0ceeccbda5e1cb79a204d7219847 WHIRLPOOL d8e022cdbf19cef8dac46f70d49dcb0b9812e6b263bf40628a082de3696793fe591cc402b12773b43a86b3514910c292aebb7b8fc8954c796ac9679e65f43b98
 EBUILD kmod-16.ebuild 3710 SHA256 54a9acb449fa1a3e1c6205c86c25b5ca731d6f60831f57f6cddb9f9f50183ae4 SHA512 af07adaafe88489047b296cd97c345260f5776f34742c89bfef9f372d62ae1a87973a5fcc3237577a9b70265249020b2b6be5a5c308a7c158576402fb4ad228f WHIRLPOOL b93f5d9bbd94013ed7db8cae2b514c573aea7e29110184e6ea57c5f1ac177bee10b95c55615c312ca7e455c93f1c552757ace616f5ec33280b33a3b38101319e
 EBUILD kmod-17.ebuild 5081 SHA256 0e3a66e7aab7a8f34e5264d811670c5dfb6b7d9b87cbba7900b274f094889b06 SHA512 d6f55abecca775bc8c634a1d6acc5ea5d29eb926c2f3d7c99b73890c83ab84fba3dbe071e3170201e3a38480d058cdd91d5745f4f7f9a349754842db27a788ab WHIRLPOOL 378c12213080f916b61af6bba70bdf0897bce9cb38ca7a76773d9e9acac1f9407b330d8b066efad98b7cdd210bdb8b1d9c0f7b5306b3a9c490bd4bb5fb31edd0
+EBUILD kmod-18-r1.ebuild 5117 SHA256 10452c14f6eafbdb39e85f595a632b85877e0556ad3d90a87aca2c6898351d50 SHA512 30b0265ef1c2286ca6380c12fae17e3314f59fa20e2752279c46764dc19752161a49d6f28a6d6d86c8e64918ce3a25fa96faa4530905680d2228c84d9af10836 WHIRLPOOL c9cd370a5ed51ac14ffdbf51cbeeef0f304488c5275626023b906666a91abda050ffc64bba0f39da96bd1241250b759c3c5160cbe02e506584aefd6c019af95e
 EBUILD kmod-18.ebuild 5092 SHA256 309445ef64199998eecc220f305c20bca5f86f65959fe456c5e19b77fb970a09 SHA512 1b6912c36c8264ad8b4b20de23b0925a72da807c308921451d1724dad9aa4c25028ded986cb3b81d8f37a63701ed6d41aa58d3b3959c324b2b8c613e37910052 WHIRLPOOL cacef26447716d24a1049cfc9db93bf35e812bde2f1bb4927b64211cb4fdef3cc12d2e24c1ae17af3ce9df82cc2f3ea9a92f8544725c1d0a0269771defd1a9d6
-EBUILD kmod-9999.ebuild 5095 SHA256 394d1c92c2a2d65debe25da2f587d34f6d6a6dc34777b3e5fa64647910828f70 SHA512 daa5b3f6a4fd422f960c0162ce3682b81b0ecf0d403f5f07a2c9726039cf678e63fe917bb95b72b5e00eefd35ab4669afb749be16b698c59da14d3ea94fa7db7 WHIRLPOOL cbfdab4abf604381e3f93d6c2731027ebca0571e4ec2edd27d9513b52543d27d31912405cd5d36298183ae84cf7f5f97c7a3415fd6b191610aad102ab7e0ae32
-MISC ChangeLog 22430 SHA256 9183c35f0df2a6540280978688c0b4a35e4bd1227b37dc779ce64b70a9b204cc SHA512 99fd482e05638ac3d0fa60a7d7aa1d2464222e81f93ab44506773478f5d2273d867b86f1de6c02a7f06c852a892cadfbc0ad74f363d1cbd8fd558c5c8a2240ea WHIRLPOOL 686ecee7ce6b8ef3cc0c6164f71592efcdcc6f0421e6e860e4a8f48d7be8204afed5b4a52da4995ad3131252a976a1a7e96220eef4222a9457ed51c2f2121d35
+EBUILD kmod-9999.ebuild 5117 SHA256 97e5a38fe649a07983bd27caa2b1fb42ab6b9703ff0c82b82d0d8b26d3e2c34e SHA512 88f6a0c748441bdb9c0ee6d0d21c2ecc923957cc6aecccd35bf86f3709a567947fde179ae35a68044840d4058e62bc0f5fc6a09ebe91a3500cac97778e639d69 WHIRLPOOL 1bc8e4363e81f56ae7b1444b3f9ef142dd84e19f39cec5de07b9e9607718e485e0f24df868108c617d455de52f6256e716dab0659222fd40e00f181b1fd838dc
+MISC ChangeLog 22669 SHA256 4124ebb61279a6b74a06fc8ab1d4b179c6c8c7c8358ec035c58299c10dbb415f SHA512 ff796c32a8f9035127056e9ca9599a09ba241f3863a350c964276ac2c8a440940af34a25973a7d3e7d84a1c2ffedfcdc489b8fb5b3d90ffe8d6349c138c1e349 WHIRLPOOL a991845e1c81648793c2eab972d41cc87121ac05e35b18c894bb6963f5e1a698c137d5fbf65f4ac89080e394a543286f313c4db2e922d2eb7a6807303b4016bb
 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTpo0XAAoJEEdUh39IaPFNKkYIAKLcXq3LSsoRRIbLVIUHp+k+
-yiXC0KpI8hXQStdufXaXonAiapUPwAch17VzsxM6/G2fKVrMyAFZSCiC0n3bbT34
-V1Bgk440mKi1bnVtaDvgGJcI+eZmd6+DliaIssyf15l9ZdWUN3xqd8/QsBjRI3Cv
-5c80C6b8V/eG7BCCqgECjKCAOm8Q4kLcponi4BPM9jfx1Tc/GAUnwQv5iTQAPKux
-p7WVqZafhmGQOvIlkq7JP7fZt1hH1wBBK8FuQcMeHrJq2xqzgQ9K8jv6R85p0TfW
-BDfCCyeuNv5BUP5zPGITXvJC1w9C3Xy89IrtL5kux3C7KUu9V8ehqHbYb9CmDns=
-=wUi0
+iQEcBAEBCAAGBQJTv9crAAoJEEdUh39IaPFNTmYIAJtOQQF80O36TuU/mR2lZQ1p
+Kt3u4HyGbuhhwPkHz/Tz5yWw1gxnTsXMB0l5SQZJAb4ZM6hSdSfJx35c6Hxidynb
+FHH9ZQnxdhoIkE6sOoDuZfipAnDzzeDpgAZQdY8OS2wPv+sFi2a8xkxrS5eDwiKN
+7bk+hndSvN9GEbVXdsawrnlhP9pEAtLyeUWlsI6IlSrgJ/4W06ED4WIyfvgLN8ts
+7cDpBgOSQ1VNIIpTKSck9XBEPqHscOw4fnVyyvmBv44QNIdiZzPUIIO3B2YWkzbk
+DqaccxZ9DQG5cVv/vW1uLxUCC0xnt0WAazh0X0MzMM8V0yCfzak87PF8I4nlVSs=
+=BvS+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/files/kmod-static-nodes-r1 b/sys-apps/kmod/files/kmod-static-nodes-r1
new file mode 100644
index 000000000000..dcbf679332d6
--- /dev/null
+++ b/sys-apps/kmod/files/kmod-static-nodes-r1
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/kmod-static-nodes-r1,v 1.1 2014/07/11 12:28:07 ssuominen Exp $
+
+description="Create list of required static device nodes for the current kernel"
+
+depend() {
+	after dev-mount
+	before tmpfiles.dev dev
+	keyword -lxc
+}
+
+start() {
+	ebegin "Creating list of required static device nodes for the current kernel"
+	checkpath -q -d /run/tmpfiles.d
+	kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+	eend $?
+}
diff --git a/sys-apps/kmod/kmod-18-r1.ebuild b/sys-apps/kmod/kmod-18-r1.ebuild
new file mode 100644
index 000000000000..d1d89f4bbfff
--- /dev/null
+++ b/sys-apps/kmod/kmod-18-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.1 2014/07/11 12:28:07 ssuominen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit bash-completion-r1 eutils multilib python-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit autotools git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	inherit libtool
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc lzma python static-libs +tools zlib"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	!<sys-apps/openrc-0.12
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	python? ( ${PYTHON_DEPS} )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		virtual/pkgconfig
+		)
+	zlib? ( virtual/pkgconfig )"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS="NEWS README TODO"
+
+src_prepare() {
+	if [ ! -e configure ]; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir=/bin
+		--with-rootlibdir="/$(get_libdir)"
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable tools)
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_with lzma xz)
+		$(use_with zlib)
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	local ECONF_SOURCE="${S}"
+
+	kmod_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir econf "${myeconfargs[@]}" "$@"
+	}
+
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
+	if use python; then
+		python_parallel_foreach_impl kmod_configure --enable-python
+	fi
+}
+
+src_compile() {
+	if [[ ${PV} != 9999* ]]; then
+		# Force -j1 because of -15-dynamic-kmod.patch, likely caused by lack of eautoreconf
+		# wrt #494806
+		local MAKEOPTS="${MAKEOPTS} -j1"
+	fi
+
+	emake -C "${BUILD_DIR}"
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	einstalldocs
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+		}
+
+		python_foreach_impl python_install
+	fi
+
+	prune_libtool_files --modules
+
+	if use tools; then
+		local bincmd sbincmd
+		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym /bin/kmod /sbin/${sbincmd}
+		done
+
+		# These are also usable as normal user
+		for bincmd in lsmod modinfo; do
+			dosym kmod /bin/${bincmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
+
+	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+	fi
+
+	# Add kmod to the runlevel automatically if this is the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		fi
+		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		fi
+	fi
+
+	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+			ewarn
+			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+			ewarn "kernel modules to have required static nodes!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add kmod-static-nodes sysinit"
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index e9896b3a00ea..5d2d7138b097 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.78 2014/06/22 08:03:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.79 2014/07/11 12:28:07 ssuominen Exp $
 
 EAPI=5
 
@@ -164,7 +164,7 @@ src_install() {
 	insinto /lib/modprobe.d
 	doins "${T}"/usb-load-ehci-first.conf #260139
 
-	doinitd "${FILESDIR}"/kmod-static-nodes
+	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
 }
 
 pkg_postinst() {