From ddb5dfd8368c31c007bd142cc74e005b55856a76 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 23 Nov 2014 06:51:14 +0000 Subject: [PATCH] version bump. Also, per Samuli, drop the dynamic-kmod patch since it broke parallel builds and no longer applies cleanly. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x30C46538 --- sys-apps/kmod/ChangeLog | 9 +- sys-apps/kmod/Manifest | 16 ++- sys-apps/kmod/kmod-19.ebuild | 190 +++++++++++++++++++++++++++++++++ sys-apps/kmod/kmod-9999.ebuild | 9 +- 4 files changed, 206 insertions(+), 18 deletions(-) create mode 100644 sys-apps/kmod/kmod-19.ebuild diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 6c6e914a0932..24402f6efd68 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.176 2014/10/30 09:20:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.177 2014/11/23 06:51:01 williamh Exp $ + +*kmod-19 (23 Nov 2014) + + 23 Nov 2014; William Hubbs +kmod-19.ebuild, + kmod-9999.ebuild: + version bump. Also, per Samuli, drop the dynamic-kmod patch since it broke + parallel builds and no longer applies cleanly. 30 Oct 2014; Samuli Suominen kmod-18-r1.ebuild: Relax systemd blockers since the severity of impact is, at most, normal, not diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 0617d4bf2307..3d37582fff7a 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -5,19 +5,17 @@ AUX kmod-15-dynamic-kmod.patch 493 SHA256 36aa0232ec80a8f211c29d349ab5ef8c3f6dea AUX kmod-18-static-nodes-indicate-that-creation-of-static-nodes-.patch 1352 SHA256 1896fff7ca582f9975ddff41e12ce0c6aaca04de92896d22e8377457f183cd07 SHA512 5e40000e7dcebd64379d7960e95128a5f352a0cfcd900f70788af7712657c799b6bf5fc450fe8b499cdd98fab0440fbf8b9dc1006c6e684c04b3ee2b10bcc89a WHIRLPOOL 8de780a1a899b0db98689dc6a2f8762c0568dfb5a8a6073192a1dad8088e28b7fde05c723f83f74e71917261e027f603e31b144afac909d1766f36ddbf6bb95b AUX kmod-static-nodes-r1 601 SHA256 21995879ee2ac6727ca5784a309eff5dd41b93030efc854f123b8a4d8ef3294b SHA512 d95b63174b7e28cc8d72b28a1a436fb108164528d5643ce9f65012f233151604f6b26c20c64fbe2f657fbbd6863c08ae9094c5bdc2dfc68d417448e268a7bc11 WHIRLPOOL f0342f23912535134e5cbc88cd13fdd9a6681ba5502a15cb5b0d5aafe2d6db4a2bba806293be29b9e14f11ad28456cc1104f6d031b88d1142ab313407df73163 DIST kmod-18.tar.xz 1473904 SHA256 e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e SHA512 6704f52f1b69837f06516237fb61d3f29551b06e59f270561993e0318c104bdc0140a32d3fc9bda859d0918412ea2c40effa0ceeccbda5e1cb79a204d7219847 WHIRLPOOL d8e022cdbf19cef8dac46f70d49dcb0b9812e6b263bf40628a082de3696793fe591cc402b12773b43a86b3514910c292aebb7b8fc8954c796ac9679e65f43b98 +DIST kmod-19.tar.xz 1473916 SHA256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 SHA512 317aebbfe12e2bd8f610d799642499d411e017cbda6082d0de92b1597753d29f42c4a2faac574879166e8cda8d7fd42ad2f98086b169e85b238cf024887ec0ee WHIRLPOOL a2aec8057cbc7776b71cea5c70fcec90fa20f09d2195f532f03085df2e85ae6dfbba50450a1b33425fd17caa01b997e052ec4676e0ed9c6afd7555b53aa8c589 EBUILD kmod-18-r1.ebuild 5239 SHA256 bb154ec79a7dd1517c0ac71fc029e9cfac3e7040f3a2eec1ed1fc2351f2a07cd SHA512 219df6833bac123add666502fc962401d79567b115675d8faba37a1955e0ce286f2b12640c99631b504d562c471a91f96a95e79067b3f26f9a3bf71c230c2c33 WHIRLPOOL 83077d86079416d806128b62b42e3c35b2ae0f0b11a94d5979290b130043150a750d30d5bc154daf60a4898bd748a84917a4d42fdaf5f4896def4729e5d94e3c EBUILD kmod-18-r2.ebuild 5348 SHA256 42f46ae519ca41469f6c2238fe881010e166bebed754b48529a027ca0561d2db SHA512 71f5842ed613bb4d9f26dd10a00afb5001aed664f6b51419c38d1f250a4923437040ae121979c0dc690546dd9af5c7ecdfab580cbebc9ce4ae457242bb3aad49 WHIRLPOOL 255ce8045f10c2f8fa9b9bec0ea672f1904060f671ba8d985d84dfcebbaeaf7dd5dccd04e0217e058d861626307d4e3b6f58d41ee6b31ad1680834385aeafaf1 -EBUILD kmod-9999.ebuild 5261 SHA256 438f098bdb279232756279216ae7196f8df3e9b40b67a7813a561865c4d37ac6 SHA512 25e929f1a13fa200d3543cef74bbac289b69c11884631471074b98072024432851aab3ca1b833a070375ac136e9cbe9d728b0bba732d43dc36890d96e574f046 WHIRLPOOL 5766eed5c49e2dbec49c9549dccd23475001477693c690a1048db1ae87169ca1fadf56b312edf96a6be4d9085a0c537fbd66d6e928ee0a69543b7376fe08fa68 -MISC ChangeLog 25351 SHA256 ae9ee14282786d6e222689ec396eeaf307c10a9fd93c8b4a2a606f1b0fbc1c5c SHA512 02b56e523ed21c73884eab3a7524da05bfd907abbd924f78df141ef56f771f96861f9d9aa7a8e72af0c278b8bf08d4fd65fab0ee39af58ce3c9254508e6b3493 WHIRLPOOL fdffa17413f0102bc49adecf63721a2a014f9f3306a3a0833902a6eba9d42dedeed419bbcdc35873e518f3b6fa762612af96307add37810dd97a4b7eafe35ff9 +EBUILD kmod-19.ebuild 5025 SHA256 b35ffa629e400d83bb33422f057936cd09f4468e2fd465000b9eb1a064b58d3e SHA512 95b894e955a5bc9e4d512c9ab1423c3289476f1c5bdbb96c7c2ec367a63b6a71cca7c9e574708e17f6942eea1d84e26fabc96120eac7cb79c3b4dd9b1578f881 WHIRLPOOL 4fca025d27220849e0cabc88fa5105dfd23c3b965a0983436fd59efaa213876211657563441870ac74175f683cb57f6e38005b07fdc380fa6e29b735a5b2d0f1 +EBUILD kmod-9999.ebuild 5028 SHA256 af441c32eb90f12631c128db8de64fbb5e3e5efc4f878e41d882611115e5f985 SHA512 191f41d9559a7591b395e63c56b4d113575794496bb5f11c6b1e91c6cc550ef733daccd39512da8074ff95c6568d8aa9dc1e4d27019fbd6f7530e8df607f62aa WHIRLPOOL be2410881ee6088e68e45661e42f9841fa2bf030808885df30aab08ac1c34a6dc8354a4e5fb00e013f4c091cc1dad65468a66e61e11feb6473228cb4a29aa3f7 +MISC ChangeLog 25589 SHA256 dc2f437f0148deae1027b352a911fbd397695613b5897a47118d93d6c37f3551 SHA512 a44110ba1c28226b322c19d66d9608e3785a0f2e00888ac3f0eaa90b37f91e6566873d146fc405e88a918bef65cbd2cfa0e8d3eff4b523efecb7b475a329136e WHIRLPOOL 5b1affaee320a3cf337d22d7142f68af8cf10f649f37f9daee7321ceb1ecd168b09bda3b7a6755656c803af84a38f9dcdeb06932aa2a19d0e6de772ebec0ee46 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUUgLCAAoJEEdUh39IaPFNJo4H/1Nwy0mGAng6oJAHZcHrYrJB -D/8ln/+sWH4anKC/gI+AEOSMWhsc8+3l/48MKcUuNfhvDDDClg7gsjxtZfNeD2Vu -MacjO+iL2v47iDNG9bT/alfH8woX7vxsVZJvvnp3vauzGXg1nybhrDtZWLYyJA72 -7b0Ntijfn3AxS5ysEAeme9FNkRzgSEnSo9RcIj/TKwS7VxIXFRI5iBsH2z8KIxb6 -on08+Fw7sSUJZdIDFQa6e0PSuQL0dSPMvrD4rPEbDpKn8YvzvTGrYqsVZ8fanOZp -OCj7x2jOoHBVbQZ/Ek/wLHpnJegdusQKEH1j2XQRzt3emt4TqRSqhIemDSs5BCw= -=Z2Kx +iEYEAREIAAYFAlRxg+EACgkQblQW9DDEZTiM8ACgt5rzHDQw1O6rI3ebE7dh0dna +NnIAn1A2zmE4E0NsI24dmzwKBTVHxvTm +=PSzM -----END PGP SIGNATURE----- diff --git a/sys-apps/kmod/kmod-19.ebuild b/sys-apps/kmod/kmod-19.ebuild new file mode 100644 index 000000000000..6e1d6e7fe63d --- /dev/null +++ b/sys-apps/kmod/kmod-19.ebuild @@ -0,0 +1,190 @@ +# 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-19.ebuild,v 1.1 2014/11/23 06:51:01 williamh 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" + +# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !=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 + 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="${EPREFIX}/bin" + --with-rootlibdir="${EPREFIX}/$(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() { + 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 ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then + ewarn "Removing old conflicting static-nodes init script from the boot runlevel" + rm -f "${EROOT%/}"/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 ${EROOT%/}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT%/}"/etc/runlevels/sysinit + fi + if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes + fi + fi + + if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then + if [[ ! -e ${EROOT%/}/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 a609ce979c4b..0bf1a8d78ebf 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.84 2014/10/30 09:13:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.85 2014/11/23 06:51:01 williamh Exp $ EAPI=5 @@ -64,7 +64,6 @@ src_prepare() { fi eautoreconf else - epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630 elibtoolize fi @@ -104,12 +103,6 @@ src_configure() { } 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 -- 2.26.2