diff options
Diffstat (limited to 'sys-apps/kmod')
| -rw-r--r-- | sys-apps/kmod/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch | 53 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-29.ebuild (renamed from sys-apps/kmod/kmod-27-r2.ebuild) | 17 |
3 files changed, 11 insertions, 64 deletions
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 51acf71ec72b..d0be6e046158 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,8 +1,7 @@ -AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f065a017bccfdffddbcf76382004c9a7710ff682ed27a502660d7686f544b904a66eb10d50c094152eceb02e9156473380c430a2996720bd384b5 SHA512 344185ea38f4bb6a939b8ce29cf406776b60f193e5e0eaea7ed154fcc4a9be4237bcd2635d2bc614d74a9109fad056674e9356022b46e3bf00fc5db6c964a3de AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63 -DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a -EBUILD kmod-27-r2.ebuild 5203 BLAKE2B 94962af9d143cf4ff694763351a02e493910b99efb9f4a62701fdfe6bedbf815a4e24c4db7d8c568559d5647c0e07d0916afae24576db4330c1626083f4cc512 SHA512 08b451e01ec1a05c694713ac0d67fab1e5ebbf0741e5e21231ba2e15bd08b452d5a7732f49d7723dbd13c85b48ac1216c4dca99a297e44e26baa4b1ae41afd8a +DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 EBUILD kmod-28.ebuild 5224 BLAKE2B a332a2e2544d737b006d0179974de3f86baabfef69ef8291d9c1dda3df94829e2b37fd44862e194eff6107395dcab0ec50ec8e6d99afa136e332212feb34a49b SHA512 9eb983c787a706e7ae56d6b73515d176257ce189a2547405062f5b71a3f6113cea949dd0f73bda634e109608c78869ff40d1bc0cf216b0fba42d780f2a937492 +EBUILD kmod-29.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch deleted file mode 100644 index dc776b515bc0..000000000000 --- a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi <lucas.demarchi@intel.com> -Date: Thu, 5 Mar 2020 13:33:10 -0800 -Subject: depmod: do not output .bin to stdout - -index_write() relies on fseek/ftell to manage the position to which we -are write and thus needs the file stream to support it. - -Right now when trying to write the index to stdout we fail with: - - depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed. - Aborted (core dumped) - -We have no interest in outputting our index to stdout, so just skip it -like is done with other indexes. - -While at it, add/remove some newlines to improve readability. - -Reported-by: Yanko Kaneti <yaneti@declera.com> -Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo") ---- - tools/depmod.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tools/depmod.c b/tools/depmod.c -index fbbce10..875e314 100644 ---- a/tools/depmod.c -+++ b/tools/depmod.c -@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) - struct index_node *idx; - struct kmod_list *l, *builtin = NULL; - -- idx = index_create(); -+ if (out == stdout) -+ return 0; - -+ idx = index_create(); - if (idx == NULL) { - ret = -ENOMEM; - goto fail; -@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out) - - if (count) - index_write(idx, out); -+ - index_destroy(idx); -+ - fail: - if (builtin) - kmod_module_unref_list(builtin); --- -cgit 1.2.3-1.el7 - diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-29.ebuild index 1f01479f1508..b2369d923557 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-29.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #inherit libtool fi @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # 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. @@ -29,6 +29,7 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib" # See bug #408915. RESTRICT="test" +# >=zlib-1.2.6 required because of bug #427130 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils @@ -37,7 +38,8 @@ RDEPEND="!sys-apps/module-init-tools lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -52,15 +54,13 @@ BDEPEND=" zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} dev-libs/libxslt" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS="NEWS README TODO" - -PATCHES=( "${FILESDIR}"/${P}-depmod-do-not-output-.bin-to-stdout.patch ) +DOCS=( NEWS README TODO ) src_prepare() { default @@ -96,6 +96,7 @@ src_configure() { $(use_with lzma xz) $(use_with pkcs7 openssl) $(use_with zlib) + $(use_with zstd) ) local ECONF_SOURCE="${S}" |