commit: 895222c778f09ec5a35c4d759e43ea2c34cc6b61 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Mon Jul 20 00:06:08 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Jul 20 00:06:08 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=895222c7
sys-apps/kmod: version 20 in tree works fine. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA sys-apps/kmod/Manifest | 5 - sys-apps/kmod/files/kmod-19-strndupa.patch | 23 ---- sys-apps/kmod/files/kmod-static-nodes-r1 | 19 --- sys-apps/kmod/kmod-19-r99.ebuild | 192 ----------------------------- sys-apps/kmod/metadata.xml | 11 -- 5 files changed, 250 deletions(-) diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest deleted file mode 100644 index 6f82412..0000000 --- a/sys-apps/kmod/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX kmod-19-strndupa.patch 579 SHA256 e090896840b0692bc52ba093f794289580863cc56e9d34191291a2200eac88fa SHA512 2edca256b43503e45cc9878d03619af4d9d02bddc9fb31a18d62e0516e484f49251f376d6545535a5fe83fe56eba45970e972186a18892e040b10035877e4b37 WHIRLPOOL 7fc53b00485312c3e4e42b68459d350f4b7d59e405aeae41a4418daf37b5f1cd8cd398d9186c4c7f0af7f4ee53d16b30d58962e2eebba712c55bf88111c47d20 -AUX kmod-static-nodes-r1 601 SHA256 21995879ee2ac6727ca5784a309eff5dd41b93030efc854f123b8a4d8ef3294b SHA512 d95b63174b7e28cc8d72b28a1a436fb108164528d5643ce9f65012f233151604f6b26c20c64fbe2f657fbbd6863c08ae9094c5bdc2dfc68d417448e268a7bc11 WHIRLPOOL f0342f23912535134e5cbc88cd13fdd9a6681ba5502a15cb5b0d5aafe2d6db4a2bba806293be29b9e14f11ad28456cc1104f6d031b88d1142ab313407df73163 -DIST kmod-19.tar.xz 1473916 SHA256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 SHA512 317aebbfe12e2bd8f610d799642499d411e017cbda6082d0de92b1597753d29f42c4a2faac574879166e8cda8d7fd42ad2f98086b169e85b238cf024887ec0ee WHIRLPOOL a2aec8057cbc7776b71cea5c70fcec90fa20f09d2195f532f03085df2e85ae6dfbba50450a1b33425fd17caa01b997e052ec4676e0ed9c6afd7555b53aa8c589 -EBUILD kmod-19-r99.ebuild 5008 SHA256 1c2ab7972062629f53a1535320849c96348bc36538cbbd52d4c797f62c60511f SHA512 08e3db0296c39f0d258879051c0fa579bcd43d6154ee64acd128faa1b0f8170d8dec0b684686896b060d1f26eb9188b3be8ec50bddeecd3bb7b1a1c42ab82b01 WHIRLPOOL 93eb10f54be24c710e91b42d3cca03fe1f3a1602e54cc35c2fed1ee5f3ca172479818883b8c50e03837b94da9bc7fdaf793056fe0dcd45c54894b7fe0d198a3b -MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37 diff --git a/sys-apps/kmod/files/kmod-19-strndupa.patch b/sys-apps/kmod/files/kmod-19-strndupa.patch deleted file mode 100644 index 74b2af6..0000000 --- a/sys-apps/kmod/files/kmod-19-strndupa.patch +++ /dev/null @@ -1,23 +0,0 @@ -From efb5bfaca938fa5991865c1e9a0c730dc919708c Mon Sep 17 00:00:00 2001 -From: Natanael Copa <[email protected]> -Date: Mon, 17 Nov 2014 09:36:29 +0100 -Subject: util: fix build on systems missing strndupa - -we need include shared/missing.h to be able to compile on sysmtes that -lacks strndupa. - -diff --git a/shared/util.c b/shared/util.c -index 855d4e4..23bbb26 100644 ---- a/shared/util.c -+++ b/shared/util.c -@@ -30,6 +30,7 @@ - #include <string.h> - #include <unistd.h> - -+#include <shared/missing.h> - #include <shared/util.h> - - #define USEC_PER_SEC 1000000ULL --- -cgit v0.10.1 - diff --git a/sys-apps/kmod/files/kmod-static-nodes-r1 b/sys-apps/kmod/files/kmod-static-nodes-r1 deleted file mode 100644 index dcbf679..0000000 --- a/sys-apps/kmod/files/kmod-static-nodes-r1 +++ /dev/null @@ -1,19 +0,0 @@ -#!/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-19-r99.ebuild b/sys-apps/kmod/kmod-19-r99.ebuild deleted file mode 100644 index 6da3cd0..0000000 --- a/sys-apps/kmod/kmod-19-r99.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# 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="amd64 arm ~mips ppc 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 - !<sys-apps/openrc-0.13 - !<sys-apps/systemd-217 - 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 - elibtoolize - fi - - epatch "${FILESDIR}"/${P}-strndupa.patch - - # 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/metadata.xml b/sys-apps/kmod/metadata.xml deleted file mode 100644 index 723317e..0000000 --- a/sys-apps/kmod/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>base-system</herd> - <maintainer> - <email>[email protected]</email> - </maintainer> - <use> - <flag name='tools'>Install module loading/unloading tools.</flag> - </use> -</pkgmetadata>
