From 37b7a1d172305addeabe283a50c4bbe136f87725 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 14 Oct 2015 10:34:37 -0700 Subject: [PATCH] bump(sys-apps/kmod): sync with upstream --- .../metadata/md5-cache/sys-apps/kmod-13-r1 | 14 - .../metadata/md5-cache/sys-apps/kmod-15 | 14 - .../metadata/md5-cache/sys-apps/kmod-20 | 15 + .../metadata/md5-cache/sys-apps/kmod-21 | 15 + .../metadata/md5-cache/sys-apps/kmod-9999 | 15 +- .../portage-stable/sys-apps/kmod/ChangeLog | 334 +++++++++++++++++- .../portage-stable/sys-apps/kmod/Manifest | 31 +- .../kmod/files/kmod-13-errno_syscall.patch | 31 -- ...kmod-static-nodes => kmod-static-nodes-r1} | 5 +- .../sys-apps/kmod/kmod-13-r1.ebuild | 89 ----- .../sys-apps/kmod/kmod-15.ebuild | 127 ------- .../sys-apps/kmod/kmod-20.ebuild | 190 ++++++++++ .../sys-apps/kmod/kmod-21.ebuild | 190 ++++++++++ .../sys-apps/kmod/kmod-9999.ebuild | 151 +++++--- .../portage-stable/sys-apps/kmod/metadata.xml | 3 +- 15 files changed, 870 insertions(+), 354 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-13-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-15 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-20 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-21 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch rename sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/{kmod-static-nodes => kmod-static-nodes-r1} (73%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-15.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-20.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-21.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-13-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-13-r1 deleted file mode 100644 index 95b62c3344..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-13-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=library and tools for managing linux kernel modules -EAPI=5 -HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git -IUSE=debug doc lzma static-libs +tools zlib -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -LICENSE=LGPL-2 -RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-13.tar.xz -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=f09589f100e1d4f875280df649d9c4b8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-15 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-15 deleted file mode 100644 index efb53e6e5a..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-15 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare setup -DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) openrc? ( !=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=library and tools for managing linux kernel modules -EAPI=5 -HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git -IUSE=debug doc lzma +openrc static-libs +tools zlib -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=LGPL-2 -RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) openrc? ( !=sys-libs/zlib-1.2.6 ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-15.tar.xz -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=ced869cde5aab1e9ef3ff5304b49ba3d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-20 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-20 new file mode 100644 index 0000000000..7113bce496 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-20 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 ) doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) +DESCRIPTION=library and tools for managing linux kernel modules +EAPI=5 +HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git +IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 +LICENSE=LGPL-2 +RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 ) +REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) +RESTRICT=test +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-20.tar.xz +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=ebbda40d76a0e14a9d5dace0eabea48f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-21 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-21 new file mode 100644 index 0000000000..dbfc440433 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-21 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 ) doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) +DESCRIPTION=library and tools for managing linux kernel modules +EAPI=5 +HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git +IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +LICENSE=LGPL-2 +RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 ) +REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) +RESTRICT=test +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-21.tar.xz +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=0deed55383e066869b2cde1373bbb28c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-9999 index 851bec3150..f761e31e4e 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/kmod-9999 @@ -1,12 +1,13 @@ -DEFINED_PHASES=configure install postinst prepare setup unpack -DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) openrc? ( !=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git +DEFINED_PHASES=compile configure install postinst prepare unpack +DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 ) doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) dev-libs/libxslt !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git DESCRIPTION=library and tools for managing linux kernel modules EAPI=5 -HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git -IUSE=debug doc lzma +openrc static-libs +tools zlib +HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git +IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 LICENSE=LGPL-2 -RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) openrc? ( !=sys-libs/zlib-1.2.6 ) +RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 ) +REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) RESTRICT=test SLOT=0 -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de git-2 e28f0d8a9b321431b1e699782851b827 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=58c9d7ebb5156010497b4c50a047741e +_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de git-2 e28f0d8a9b321431b1e699782851b827 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=0deed55383e066869b2cde1373bbb28c diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/ChangeLog index 80ca0fde24..e743a70b89 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/ChangeLog @@ -1,6 +1,336 @@ # ChangeLog for sys-apps/kmod -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.112 2013/08/25 14:57:09 ssuominen Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.202 2015/07/04 20:48:11 williamh Exp $ + +*kmod-21 (04 Jul 2015) + + 04 Jul 2015; William Hubbs +kmod-21.ebuild: + version bump + + 01 Jul 2015; William Hubbs files/kmod-static-nodes-r1: + Add -systemd-nspawn keyword to service script for #548092 + + 08 Jun 2015; Mike Frysinger kmod-20.ebuild, + kmod-9999.ebuild: + Mark arm64/m68k/s390/sh stable. + + 06 Jun 2015; William Hubbs + -files/kmod-15-dynamic-kmod.patch, + -files/kmod-18-static-nodes-indicate-that-creation-of-static-nodes-.patch, + -kmod-18-r1.ebuild, -kmod-19.ebuild: + remove old versions + + 03 Jun 2015; Matt Turner kmod-20.ebuild: + alpha stable, bug 547502 + + 13 May 2015; Anthony G. Basile kmod-20.ebuild: + Stable for arm. Bug #547502. + + 13 May 2015; Jack Morgan kmod-19.ebuild: + sparc stable wrt bug #530424 + + 26 Apr 2015; Mikle Kolyada kmod-20.ebuild: + ia64 stable wrt bug #547502 + + 26 Apr 2015; Pacho Ramos kmod-20.ebuild: + ppc stable wrt bug #547502 + + 26 Apr 2015; Mikle Kolyada kmod-20.ebuild: + sparc stable wrt bug #547502 + + 25 Apr 2015; Jeroen Roovers kmod-20.ebuild: + Stable for HPPA PPC64 (bug #547502). + + 24 Apr 2015; Mikle Kolyada kmod-20.ebuild: + x86 stable wrt byg #547502 + + 23 Apr 2015; William Hubbs kmod-20.ebuild: + amd64 stable wrt #547502 + + 23 Apr 2015; Mike Gilbert metadata.xml: + Add better descriptions for lzma and zlib. + + 14 Apr 2015; Agostino Sarubbo kmod-19.ebuild: + Stable for ia64, wrt bug #530424 + + 13 Apr 2015; Agostino Sarubbo kmod-19.ebuild: + Stable for alpha, wrt bug #530424 + + 08 Apr 2015; Michał Górny kmod-18-r1.ebuild, + kmod-19.ebuild, kmod-20.ebuild, kmod-9999.ebuild: + Drop old Python implementations + + 19 Mar 2015; William Hubbs -kmod-18-r2.ebuild: + remove old version + +*kmod-20 (02 Mar 2015) + + 02 Mar 2015; William Hubbs +kmod-20.ebuild: + version bump + + 19 Jan 2015; Anthony G. Basile kmod-19.ebuild: + Stable on arm, ppc, ppc64 and x86. Bug #530424. + + 18 Jan 2015; William Hubbs kmod-19.ebuild, + kmod-9999.ebuild: + adjust the openrc blocker to !<0.13.8, restore amd64 stable and sync the live + ebuild. + + 18 Jan 2015; Mike Gilbert kmod-18-r2.ebuild, + kmod-19.ebuild: + Adjust systemd blocker. + + 18 Jan 2015; Richard Freeman kmod-19.ebuild: + Revert amd64 keyword due to stable tree block on systemd. + + 17 Jan 2015; Mikle Kolyada kmod-19.ebuild: + amd64 stable wrt bug #530424 + + 16 Jan 2015; Jeroen Roovers kmod-19.ebuild: + Stable for HPPA (bug #530424). + +*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 + major. + + 30 Oct 2014; Samuli Suominen kmod-18-r2.ebuild, + kmod-9999.ebuild: + Block OpenRC below 0.13 because of the "!c" directive that was introduced + by 686ee62a79e12ad73581ef4e151baad21b624935. Thanks to floppym for + information. + + 30 Oct 2014; Samuli Suominen kmod-18-r1.ebuild, + kmod-18-r2.ebuild, kmod-9999.ebuild: + Adjusting blockers again and dropping udev and eudev references because it's + the tmpfiles generator in systemd that's affected. Thanks to floppym for + information. + +*kmod-18-r2 (30 Oct 2014) + + 30 Oct 2014; Samuli Suominen + +files/kmod-18-static-nodes-indicate-that-creation-of-static-nodes-.patch, + +kmod-18-r2.ebuild, kmod-18-r1.ebuild, kmod-9999.ebuild: + Include upstream patch for udev-217 compability and adjust blockers + accordingly. + + 03 Oct 2014; Raúl Porcel kmod-18-r1.ebuild: + m68k/s390/sh stable + + 21 Sep 2014; Samuli Suominen -files/kmod-static-nodes, + -kmod-16.ebuild, -kmod-17.ebuild, -kmod-18.ebuild: + old + + 21 Sep 2014; Agostino Sarubbo kmod-18-r1.ebuild: + Stable for sparc, wrt bug #517106 + + 21 Sep 2014; Agostino Sarubbo kmod-18-r1.ebuild: + Stable for ia64, wrt bug #517106 + + 02 Sep 2014; Richard Yao kmod-16.ebuild, kmod-17.ebuild, + kmod-18-r1.ebuild, kmod-18.ebuild, kmod-9999.ebuild: + src_configure() should use EPREFIX, not EROOT. The previous commit was not + correct from the perspective of Catalyst. Thanks goes to Arfever for pointing + it out. + + 29 Aug 2014; Richard Yao kmod-16.ebuild, kmod-17.ebuild, + kmod-18-r1.ebuild, kmod-18.ebuild, kmod-9999.ebuild: + Use ${EROOT} instead of / or ${ROOT}. This lets things build on Gentoo Prefix + and should allow cross compilation with Catalyst. WilliamH gave his okay in + IRC for the non-maintainer commit. + + 22 Jul 2014; Tobias Klausmann kmod-18-r1.ebuild: + Stable on alpha, bug #517106 + + 22 Jul 2014; Jeroen Roovers kmod-18-r1.ebuild: + Stable for HPPA (bug #517106). + + 21 Jul 2014; kmod-18-r1.ebuild: + arm64 stable, bug #517106 + + 15 Jul 2014; Anthony G. Basile kmod-18-r1.ebuild: + Stable on arm, ppc, ppc64. Bug #517106 + + 14 Jul 2014; Agostino Sarubbo kmod-18-r1.ebuild: + Stable for x86, wrt bug #517106 + + 14 Jul 2014; Agostino Sarubbo kmod-18-r1.ebuild: + Stable for amd64, wrt bug #517106 + +*kmod-18-r1 (11 Jul 2014) + + 11 Jul 2014; Samuli Suominen + +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) + + 22 Jun 2014; Samuli Suominen +kmod-18.ebuild: + Version bump. + + 06 Jun 2014; Mike Frysinger kmod-17.ebuild: + Mark arm64/ia64/m68k/s390/sh stable. + + 27 May 2014; Samuli Suominen kmod-17.ebuild, + kmod-9999.ebuild: + Fix documentation install after botched conversion to multiple python install + wrt #511434 + + 15 May 2014; Markus Meier kmod-17.ebuild: + arm stable, bug #509924 + + 14 May 2014; Samuli Suominen kmod-16.ebuild, + kmod-17.ebuild, kmod-9999.ebuild, metadata.xml: + Punt USE openrc which was to allow USE="-openrc" install =sys- + apps/openrc-0.11* which finally removed from tree now. + Futher, installing init scripts always is preferred anyway as sys-apps/openrc + is the gentoo default. Futher, this is the exact same behavior in + pkg_postinst() as with sys-fs/udev-init-scripts. Both, + sys-fs/udev-init-scripts and sys-apps/kmod are pulled in by sys-apps/systemd, + and sys-fs/udev. + + 14 May 2014; Samuli Suominen kmod-17.ebuild: + amd64/x86 stable wrt #509924 + + 10 May 2014; Jeroen Roovers kmod-17.ebuild: + Stable for HPPA (bug #509924). + + 24 Apr 2014; Mike Gilbert kmod-17.ebuild, + kmod-9999.ebuild: + Remove .la files for python modules, reported by Arfrever. + + 24 Apr 2014; William Hubbs kmod-17.ebuild, + kmod-9999.ebuild: + Clean up python_compile function by switching to using here-string instead of + echo, thanks to arfrever + + 23 Apr 2014; William Hubbs kmod-17.ebuild, + kmod-9999.ebuild: + Allow python modules to be built for multiple versions of python, thanks to + Michal Gorny. + + 12 Apr 2014; Samuli Suominen kmod-17.ebuild, + kmod-9999.ebuild: + Enable python-kmod support using ebuild patch from Mike Gilbert + +*kmod-17 (08 Apr 2014) + + 08 Apr 2014; Samuli Suominen +kmod-17.ebuild: + Version bump; without the experimental python-kmod for now until the ebuild + has been ported over to python-r1.eclass. + + 08 Apr 2014; Samuli Suominen kmod-9999.ebuild: + Temporarily pass --disable-python until the ebuild has been ported over to + python-r1.eclass. Also, nothing in gentoo-x86 is requiring python-kmod yet. + Move dev-libs/libxslt behind ifdef based on 9999 because it's no longer + required for released tarballs as per NEWS. + + 05 Apr 2014; Samuli Suominen kmod-16.ebuild, + kmod-9999.ebuild: + If /etc/runlevels/sysinit is missing when we are installing for the first + time, create the directory. This way we don't have to pull in sys-apps/openrc + as a dependency. This bug was reported against sys-fs/udev-init-scripts wrt + #487080 + + 22 Mar 2014; Mike Frysinger kmod-16.ebuild, + kmod-9999.ebuild: + Mark arm64/m68k/s390/sh stable. + + 12 Mar 2014; Samuli Suominen + -files/kmod-13-errno_syscall.patch, -kmod-13-r1.ebuild, -kmod-15-r1.ebuild, + -kmod-15.ebuild: + old + + 12 Mar 2014; Samuli Suominen kmod-16.ebuild: + ppc64 stable wrt #500106 + + 12 Mar 2014; Agostino Sarubbo kmod-16.ebuild: + Stable for sparc, wrt bug #500106 + + 23 Feb 2014; Markus Meier kmod-16.ebuild: + arm stable, bug #500106 + + 23 Feb 2014; Agostino Sarubbo kmod-16.ebuild: + Stable for ppc, wrt bug #500106 + + 22 Feb 2014; Agostino Sarubbo kmod-16.ebuild: + Stable for x86, wrt bug #500106 + + 20 Feb 2014; Pacho Ramos kmod-16.ebuild: + amd64 stable, bug #500106 + + 20 Feb 2014; Akinori Hattori kmod-16.ebuild: + ia64 stable wrt bug #500106 + + 11 Feb 2014; Matt Turner kmod-16.ebuild: + alpha stable, bug 500106. + + 05 Feb 2014; Samuli Suominen kmod-16.ebuild, + kmod-9999.ebuild: + Fix bash-completion directory by using bash-completion-r1.eclass. Temporarily + run non-9999 ebuilds as -j1 because of the -15-dynamic-kmod.patch wrt #494806 + + 02 Feb 2014; Jeroen Roovers kmod-16.ebuild: + Stable for HPPA (bug #500106). + + 19 Jan 2014; Agostino Sarubbo kmod-15.ebuild: + Stable for sparc, wrt bug #487338 + + 19 Jan 2014; Agostino Sarubbo kmod-15.ebuild: + Stable for ppc64, wrt bug #487338 + + 19 Jan 2014; Agostino Sarubbo kmod-15.ebuild: + Stable for ppc, wrt bug #487338 + + 18 Jan 2014; Mike Frysinger kmod-15-r1.ebuild, + kmod-16.ebuild, kmod-9999.ebuild: + Add arm64 love. + + 17 Jan 2014; Mike Frysinger kmod-15-r1.ebuild: + Mark ia64/m68k/s390/sh stable #487338. + + 27 Dec 2013; Samuli Suominen kmod-15.ebuild: + Use MERGE_TYPE to avoid the pkg_setup() based compiler version check wrt + #495228 + +*kmod-16 (27 Dec 2013) + + 27 Dec 2013; Samuli Suominen +kmod-16.ebuild, + kmod-9999.ebuild: + Version bump (and synchronize with -9999) + +*kmod-15-r1 (09 Dec 2013) + + 09 Dec 2013; Mike Frysinger + +files/kmod-15-dynamic-kmod.patch, +kmod-15-r1.ebuild: + Do not statically link libkmod #493630 by Nikoli. + + 08 Dec 2013; Markus Meier kmod-15.ebuild: + arm stable, bug #487338 + + 01 Dec 2013; Johannes Huber kmod-15.ebuild: + x86 stable, bug #487338 + + 24 Nov 2013; Pacho Ramos kmod-15.ebuild: + amd64 stable, bug #487338 + + 13 Nov 2013; Matt Turner kmod-15.ebuild: + alpha stable, bug 487338. + + 12 Nov 2013; Jeroen Roovers kmod-15.ebuild: + Stable for HPPA (bug #487338). + + 19 Sep 2013; Samuli Suominen kmod-15.ebuild, + kmod-9999.ebuild: + Check compiler (preprocessor) version only if it's GNU GCC wrt #485310 by + "eroen" 25 Aug 2013; Samuli Suominen -kmod-14-r1.ebuild, -kmod-14-r2.ebuild: diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest index 675ccf9a05..58ba5f12d9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest @@ -1,23 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX kmod-13-errno_syscall.patch 795 SHA256 bc766470c0a0e53471395a8e6499f5bef7a4af5dfd52688cac17d30efb4b2605 SHA512 4bb3fcd824120d19bef2efaf19fcaab3a49089e0d7790899b322db480fe32533786d6b6a0ecd085ed00203bb87af4255c462a22997404a6b4fa431e2c4aeed58 WHIRLPOOL 5410867ec236e24d6075aeeadda8a81a43c9c3a4d02a3b330a0724bdecb3f837141eb6590331c43c5faf9e5cdb903aeaf35efe80f08c342bb14b12bcbbdfcffe -AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7fa8b7188b364689b0e SHA512 cddd4e95ffd112adedfb01c90ea3cea268236983f2dd88f0a83855d62dfa8a63e1f1457a9517ebbc45970455b8f8c0dc7f4d56c138bcc3d453c7ba61d189ff85 WHIRLPOOL 920e19b8d99ff77a337b0edf2fda3461249bdd253d1c6d14c1e872d931ef643679185e8bac6b7d58490dae640f78cc1a8492f627893bfee46b48fa2c4efc947b -DIST kmod-13.tar.xz 1435864 SHA256 6c36d3abba2f98c84973ae275951c866f8bf304e7356c2fe60633800239d7956 SHA512 6182a043c32944c2dc336101e4d8a9be9ccd0106677f9f7a2e76b83a09ec2fc1333aed9b82773abe09f8adb1771e796690f1610c64b337e21bdabffe76fed434 WHIRLPOOL 95196f4c65fec778727a9b8d0209dcb08e64280b4b5d6e88b5343acb3a360b62c13a0dcf510d3c2080fad4ef1562c5e9fa11f84979d0acee03dab3fac8b3eaac -DIST kmod-15.tar.xz 1453996 SHA256 e8ef0ea7e1929b46aa681fe6ce58c5e62d0026289026ebfc63abae3b8fd5ca9e SHA512 67a03cabe9d81c14eb0bef20f3c8ff4614418cb2b2c3e1428d8a57399372ecdce6e403399a578d2f62a1ae4b61c83713edd1ad1e31533ea35503c5b11b92c223 WHIRLPOOL 53249d4b29c3added90c7a9e9c2349c3964809f5a8f274b15f06008151d90f4da8c77c02a0062bf6f2ed19d176d7f16b99c82d149a906c7983aeb9f27d391744 -EBUILD kmod-13-r1.ebuild 2214 SHA256 1c49c3d05418621483f8392448f8f5c2353c6bcee5f96a018f033142557b2db2 SHA512 3f61eb1cb9673da22eb4b0edf195d1cf3c18b4dfcac13f714947ba573821f4c38e4c5fc0854fa255055618b6cb8d750bfb6977347207f5d7bb1dd9906ff09537 WHIRLPOOL ce977f64d4eaa6e4d1440c43734d6c29117c74142c1b19b0163248dd3a26dc39130525ec90014653c173d1ae35a902f507e74223b9df2801ac699d75d8ca16ab -EBUILD kmod-15.ebuild 3558 SHA256 291e05d4d7864cf7fb1818c26d07339c73fc6a6f7e16af7904c28d89a2a07577 SHA512 a7af20bcf87d55392a7a845bf20778a30eb1a8a6fceb8305428514ddf6fe7f80f1ae269bb4d9dd0da4a67f8781acda0f28147e884893e0103f7592e1d1eaf23e WHIRLPOOL 603d4d5a4cf8bf9c5e8fc0afb78653798ab294d454404b3ad6c27c9b8759b59d5146914bbaea35171261b51a8fbbe20724afe2f1232316d91e09a291215dc1e8 -EBUILD kmod-9999.ebuild 3561 SHA256 b91f64d8030369b6e1707d804a7837c00a470e15a517461fcd60d768c935b87b SHA512 b3532cd28e0cdaabf1b6fdab6c616ab1de907e423d76ec01c0b97900144ea32f4b2222311dd8fdf94e14a4f9e0f2a439ec41f08bad6cd39db38ac3f9e09b2886 WHIRLPOOL f7d8b45827345e0a9b1b7570db175fce4a0edeab77768c0b8a75d1f9667b6009d522af8a5e8bbf1dfdc7781d500c3c01decdb1e3d33fa4ce48c708348b2b56e5 -MISC ChangeLog 16524 SHA256 c7be0ee3ede5599b1545f01e862402dd9005f373e85a5466f5f26fde8e582ffc SHA512 8bce650bf01295c59ebd83467aea0c6904890496a7bbc9ebed09fad69c494e5dc23f3a7c27ed5109a7ae75f238ebceabce714943f8b92342efca3b6e9ed14ff1 WHIRLPOOL 529eb80d851c490e570ee4cde5474a3d2222f65551e506dfb9de62eea93f1b9652c31a195d258747b2d55657cbf36c57b9f78b839e5a94f42590bc98c450f3b1 -MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) - -iQEcBAEBCAAGBQJSGhs7AAoJEEdUh39IaPFNarkH/RCD9nfPxZUUCPmUF3ffZWER -vvF0t/gjJ/aoMFXp3CBMvVWjWIoDkMwnlz0RqNn71FgRK0ncPOAiauxuuna9zPMI -yJfFkn69ORUbiRBvsYGv+Z0AaovbQO0QD0rzj7Ses4K3vWmy1X/ASzZE6PLUuo6L -fMTDm2uumoBaHp5KtsIY/ctgWvyhFMiBTivZBSfKKtRYdUzUzvYVv6sl9zQ5DLSc -PkCij4t+WrbNsnZoNGWWriyZrptbL22RJ0ej2lRkEeIl5GBrNJmy2N3KyslLB16d -pGvccQHbt73Y9/5Aqz5QDc4gnfNsSQW3i8tz+8VJkGk856b5L/FKEjDKGCpuHa0= -=HaZm ------END PGP SIGNATURE----- +AUX kmod-static-nodes-r1 506 SHA256 b9452437b06aae67e19e2cade37e89398ab5a7162318e15d1ed083606b1fe7e0 SHA512 e16de3aef68527e49d332ee2c19db433ac6cc31d3b44572f1ec7d64e06c1125275e0a4e680c8b9a3a17cfde34a43c248fce6b17e28ba021c10c4eb3e96c97789 WHIRLPOOL d89dd9e0a85998c3c7023d8504337dc884fcc59fa10f2f88a80879a249ce722745628b372441b60390fc1b5f7a77a0bf5b0e88011b4fcecf8934ed75d8f74bd2 +DIST kmod-20.tar.xz 437880 SHA256 89c1a1a2193c31f9ebe582640bfa2bd401341dc24119f5a7f702588116fadaa0 SHA512 1026d80486e6c823fc74a439d15a8b1e4a501140f67568165904b43a73130133d6c84075ec8a7981a5d4a187d5fbd21afd197de4e81cc05a66506711865edf96 WHIRLPOOL 938d1ea4d153c04231b89701c7a7f602d31166e5c85bb6f2798ba0a7c22a4961f05bdd8631d985785212e5bf359d1cd12c4088fd9c2a07d8b6b9a77599e84a39 +DIST kmod-21.tar.xz 446460 SHA256 160a9448af74cf75b08d089f37a3e8d1fafa75cce92d1cbe869a753b670d95c0 SHA512 93d9c7eda3a04ed94c6531087614d92b5a65a2e642bd3af017a3a8a458a78a5a57acb1707e35bf3a0aa8f22ab0fa99d34cf4e7dd568f202a18eb49fb52bf78c1 WHIRLPOOL 78aa8c086ed8129b3a686f3b7d46e224c09f018fc85cda041bfac253afa8056e3e403eedbedb81be4c2354075040dcb6a526c2295cc3b393a76cb3896491cea3 +EBUILD kmod-20.ebuild 4916 SHA256 c7eedcad8de3fccffa4cf601a1983add5bd5b05d697cb48f8446c9bb381a12fc SHA512 299caa9882ec9dbed9dc80799a01018dc2572e5304a720d1899a4bf3f3ede4cc2ce3c4a44de1f6a8956262aff175e00df043494f92fbb4c346d4f8f9f38bd505 WHIRLPOOL f1c35863ddd718cffd07755214516c6acbaea06977bcfcc1d15bff53a8ab47a34bc5131cf9219a65b9643569c5edccb8279f72608686cde73804bcf6c7e05021 +EBUILD kmod-21.ebuild 4929 SHA256 9c4afc5a013fb899050a0ecbad12a91f1626641684e2cc460da43fddd40d85a2 SHA512 cbf12fb39c9964921da0a11e3667c829962ac306cdaabe874fca57e531407550c67c438a30a6e41e40cfb291b1c137bf8b5dd381f76eae44d6c9c9161824af9a WHIRLPOOL 4106529096f5d2eab153801dfe2cfcf6fcfc9df883af86de1576e8e017cff936c6e2667facdc7968b8b3567e10826a5c4245ce22077147e739be76c5ab6bc15d +EBUILD kmod-9999.ebuild 4929 SHA256 9c4afc5a013fb899050a0ecbad12a91f1626641684e2cc460da43fddd40d85a2 SHA512 cbf12fb39c9964921da0a11e3667c829962ac306cdaabe874fca57e531407550c67c438a30a6e41e40cfb291b1c137bf8b5dd381f76eae44d6c9c9161824af9a WHIRLPOOL 4106529096f5d2eab153801dfe2cfcf6fcfc9df883af86de1576e8e017cff936c6e2667facdc7968b8b3567e10826a5c4245ce22077147e739be76c5ab6bc15d +MISC ChangeLog 28464 SHA256 2da3f02362b9ea452428146157d1973a485828c62205d2d70086cf4e537be87f SHA512 f95c5edbb2cfe646645a156b3aedf1876607b7af57f021712ca225b1ff7be82854e6fa9bfa8d8c39b302e3aa2487cf88d9a2f5d5ddaa20513c2e303d3a610d24 WHIRLPOOL 930a20837ac6b383c680c8915fb9613cdb0234e7564317432d219c9e12d1cf544f9e9b5abe7660cbd260b84d76f5a4a7eefa5466ce54faa481009f7c3e6b95d1 +MISC metadata.xml 445 SHA256 355b675fdbfffc098875cc02f60b3e4489f78e569fcf47b160f15a0a814fe9bd SHA512 55a0bbdccb5d0af3343e22cc4577bd946e39a19948df2fbe634729a1e0bbb43fc4d97ccf35e884253755182c2c1df33c354eb72ae52695ae530d01f01287d11f WHIRLPOOL 12e2201684ebef6c000dc57a87d92e035a74b71ceda56b6d77e67e705909f726df1fb95621eb51bb48e980583be5350c81b0bf3607a18f6fe34880f5ce8ea72a diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch deleted file mode 100644 index 8909ef58c2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001 -From: Jan Luebbe -Date: Thu, 02 May 2013 14:47:12 +0000 -Subject: libkmod: Avoid calling syscall() with -1 - -At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an -illegal instruction error. Solve that by returning an error when -__NR_finit_module is -1. ---- -diff --git a/libkmod/missing.h b/libkmod/missing.h -index edb88b9..b45bbe2 100644 ---- a/libkmod/missing.h -+++ b/libkmod/missing.h -@@ -20,8 +20,15 @@ - #endif - - #ifndef HAVE_FINIT_MODULE -+#include -+ - static inline int finit_module(int fd, const char *uargs, int flags) - { -+ if (__NR_finit_module == -1) { -+ errno = ENOSYS; -+ return -1; -+ } -+ - return syscall(__NR_finit_module, fd, uargs, flags); - } - #endif --- -cgit v0.9.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes-r1 similarity index 73% rename from sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes-r1 index 43d8431113..379cbb13c3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-static-nodes-r1 @@ -1,13 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 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,v 1.1 2013/08/09 19:08:18 ssuominen Exp $ +# $Id$ description="Create list of required static device nodes for the current kernel" depend() { after dev-mount before tmpfiles.dev dev + keyword -lxc -systemd-nspawn } start() { diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild deleted file mode 100644 index a9456c793f..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild,v 1.15 2013/08/24 10:59:48 ssuominen Exp $ - -EAPI=5 -inherit autotools eutils libtool multilib - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit git-2 -else - SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -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 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 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - dev-libs/libxslt - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - zlib? ( virtual/pkgconfig )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-errno_syscall.patch - - 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 -} - -src_configure() { - econf \ - --bindir=/bin \ - --with-rootlibdir=/$(get_libdir) \ - $(use_enable static-libs static) \ - $(use_enable tools) \ - $(use_enable debug) \ - $(use_enable doc gtk-doc) \ - $(use_with lzma xz) \ - $(use_with zlib) -} - -src_install() { - default - prune_libtool_files - - 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 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-15.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-15.ebuild deleted file mode 100644 index 53fe6d5669..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-15.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.1 2013/08/24 12:03:31 ssuominen Exp $ - -EAPI=5 -inherit autotools eutils libtool multilib toolchain-funcs versionator - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit git-2 -else - SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -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 +openrc 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 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - openrc? ( !=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - dev-libs/libxslt - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - zlib? ( virtual/pkgconfig )" - -pkg_setup() { - version_is_at_least 4.6 $(gcc-version) || \ - die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020 -} - -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() { - econf \ - --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) -} - -src_install() { - default - prune_libtool_files - - 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 - - use openrc && doinitd "${FILESDIR}"/kmod-static-nodes -} - -pkg_postinst() { - if use openrc; then - 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 [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; 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 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-20.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-20.ebuild new file mode 100644 index 0000000000..4e4fbd9b29 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-20.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,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="https://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/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-21.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-21.ebuild new file mode 100644 index 0000000000..b377fcb2f3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-21.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,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="https://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/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild index a2ed8f8b63..b377fcb2f3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 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.64 2013/08/24 10:59:48 ssuominen Exp $ +# $Id$ EAPI=5 -inherit autotools eutils libtool multilib toolchain-funcs versionator -if [[ ${PV} == 9999 ]]; then +PYTHON_COMPAT=( python{2_7,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 git-2 + inherit autotools git-2 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + 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" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc lzma +openrc static-libs +tools zlib" +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. @@ -26,21 +30,30 @@ IUSE="debug doc lzma +openrc static-libs +tools zlib" # 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 ) - openrc? ( !=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} - dev-libs/libxslt 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 -pkg_setup() { - version_is_at_least 4.6 $(gcc-version) || \ - die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020 -} +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS="NEWS README TODO" src_prepare() { if [ ! -e configure ]; then @@ -61,21 +74,70 @@ src_prepare() { } src_configure() { - econf \ - --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) \ + 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() { - default - prune_libtool_files + 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 @@ -97,31 +159,32 @@ src_install() { insinto /lib/modprobe.d doins "${T}"/usb-load-ehci-first.conf #260139 - use openrc && doinitd "${FILESDIR}"/kmod-static-nodes + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes } pkg_postinst() { - if use openrc; then - 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 + 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 [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then - ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-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 ${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 + 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/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml index 97fc7c560d..f2fc4f7f08 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml @@ -6,7 +6,8 @@ udev-bugs@gentoo.org - Install the OpenRC init scripts + Enable support for XZ compressed modules Install module loading/unloading tools. + Enable support for gzipped modules