From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 16:47:37 +0100 Subject: gentoo resync : 16.04.2018 --- sys-kernel/spl/Manifest | 9 +-- sys-kernel/spl/spl-0.6.5.11.ebuild | 2 +- sys-kernel/spl/spl-0.6.5.4-r1.ebuild | 121 ----------------------------------- sys-kernel/spl/spl-0.7.6.ebuild | 111 -------------------------------- sys-kernel/spl/spl-0.7.8.ebuild | 2 +- 5 files changed, 4 insertions(+), 241 deletions(-) delete mode 100644 sys-kernel/spl/spl-0.6.5.4-r1.ebuild delete mode 100644 sys-kernel/spl/spl-0.7.6.ebuild (limited to 'sys-kernel/spl') diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest index 0235d3037649..ec3322cf19ea 100644 --- a/sys-kernel/spl/Manifest +++ b/sys-kernel/spl/Manifest @@ -1,12 +1,7 @@ DIST spl-0.6.5.11.tar.gz 531710 BLAKE2B e89cb5a023d3f4b3949a385100b56e01c5fd0ff4448bc175f8463a84b74d1d8f1fcf669c2e4b73f2ec3326653594106ebfa3e66987e49a9cd029355bbb317990 SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722 -DIST spl-0.6.5.4-patches-p1.tar.xz 2020 BLAKE2B 82b836df5c18f68ebd967d5d33e65232167ff1c4b1da3998dadf49c1fd0ffad4a86fa418a30ba0ba106ee4baa190fc51dedabec68083af80e5eb5aa1b225dcc5 SHA512 2650f06bf23045bd2805ef58baa2561534373862e1fbbaf189cf93283aa8e18cbee989b4e81751b37da3058aeba357cf8e46db97331379e1b5eafde7faa33851 -DIST spl-0.6.5.4.tar.gz 556298 BLAKE2B 142d92ece51f544ed53f8d15390a97469b322c0e8f16c6510eb72f69493a3489f98ead9fa4138765b364c22777ee0cb49a76c4d9b1c4ac4e5ce8c0e5dbfe9952 SHA512 a50d804008237820d6a8e7d938f6699df2966836ebedf0b6a4421f55bd6c24ae69e8f80eaf3aa2b7f6ed308983ab4ca11abfb32f98c8d070e4957b4802e00cac -DIST spl-0.7.6.tar.gz 550089 BLAKE2B c0b1cc87a9b7997f6346a106eb8f23493938357fce9d6209e159016f2df5655678fce5ddc64dc4a63a4f93b715c44d5ff7fd30097c63ab62a1daabb3dcc28908 SHA512 b8e74e4ad8c16df1a4742639f00c4c4162607d136145bae58489f9a34539dcc5569da18639a67ac5d9d52b5feac93e052323ebf6efce6a92ba9a2b965f940fdd DIST spl-0.7.8.tar.gz 559558 BLAKE2B 5aa68a8150cb0c922c1ad0df9d1260136cedd95c13df45cc4490d937746a2a0e76e964978128a6f4e553f7bad4adc72a0408ef89969a15ba3f43af26e412b61c SHA512 dcd38dd0971042603baa474460486ed2e7cb59468de7613fa713eb4bdd081026794af7780b5d8970dd17645b04b6dde1e2f43e89a782437a50afc679a8850001 -EBUILD spl-0.6.5.11.ebuild 2708 BLAKE2B 97b92f5e3ee8635caea44103446ccebf89457744ed432a795aab2c839cbe620ba5f328cb309fa647ceb8a4b6414555f757595986567f6152fda9151c1da16ad7 SHA512 f5c4b13a6ffdcceb29924a0e3aef243c9f43dd11340416a0ed068f4d6abea2fbdadde0fd1ad805fce850ad0e7285d0004260120eef0cc1c9c18a4a5d08ea8dff -EBUILD spl-0.6.5.4-r1.ebuild 2924 BLAKE2B 496213b2c56731291103b98595daf77ae5748f2514022eca2e8c39e172f485019c1fabbad80d5e4d3029d73a9cd62e4618cdb194ad3172a44bdad060da27f57b SHA512 4092f4be37805660a15982bdedc05d1650789e2711ba550cbbbe7171929ce58e7157221991210f8f5f496bbe897af6d8aef5435058a31984a692c2324d8ed494 -EBUILD spl-0.7.6.ebuild 2687 BLAKE2B a2671237360f4169cb3de8d419604b45e486fb6f54fbd4cb645a6a32f8fe109a86d81504bfe69c93213b44677c0bf99fafa4641bbc948c7ee2998f56c8cbafc1 SHA512 7c50bcd5e4751f3f0cc2db4ba11029a47b84a696aab725d502dfaeb3da4a824cdfc0c4213af0058ae14bc27be54487e3aab6d5a0360808648b795d520c8dc54e -EBUILD spl-0.7.8.ebuild 2687 BLAKE2B 0bcd325ede719f57c890567d0d5bf489eb18fc9f09475e938973360e9a5327b8991fa80b899666f1c5ea59be14c48798338ad80765abe809f09ee5026bdbece8 SHA512 8068af0fab33fef6a21ec8e17dac8e332e8fe9bb2923ae9f583241e486aa98dcb55794e54319d97f76816e01b017719119ee6b8340e3cd0cf1a440ef49867db5 +EBUILD spl-0.6.5.11.ebuild 2707 BLAKE2B 056ca8888de322833390969112d45cccc4cd7d59e93891355ca81f95098eb4e381bf638c105b5150a4b5a55c94bf8a772fa9bd2968d3d2f7e3e32779bf52e5c5 SHA512 96a12346f728c144a78cfa701f5b451ad2bdacaaa544a753a9db5abd8047113acc2340fe1d49f915efe3f5e7c3d79f6459a22291b0e62d6e9b42c28417812a2c +EBUILD spl-0.7.8.ebuild 2686 BLAKE2B 25ada9a1556c66cda953dfe47a09781e0c7d6cf12b41631f465f7c2fa9f1b0d13be8e5539bba41e5251b620fc75dbedd319dc9fd064870f2be1a6af62d771724 SHA512 b6ad416f3f5af65572371e326d94ef5dd7321b50f176fdd85579a384a7f4aea142ef0858d4c9bea0a98d0252339b5ff6c76419736a60cb1a3bd9f5083414f2e5 EBUILD spl-0.7.9999.ebuild 2778 BLAKE2B 07296e3768b48b6c4047180f74e3374d402ec87638c448ac39023785db3ce819fe45d7c134fc79fad507f724b24d381b216f89ddbc9d44528a07fe6392e06a71 SHA512 29cd683cd14f8a61b8a9772d05e5d56702529e1f57602a37922680561cbe09e00d3167961d757133ce5e24b0145e930cbabb82c94070f629e2f8ebf0a6fa72a1 EBUILD spl-9999.ebuild 2744 BLAKE2B bf65299df864ef7a983532e23c8f5764fd30701ad2c24face5c4cd1cf41fd24abe2dc7e57001d1b1a7d8353a21a85737f305d00910bac285723294faa4b8728e SHA512 ccfae24c381d939ce22dd3a745f8ee1933803cb49761f73eb58c54b0a8e915a40155efc088c95549461538af7cec4d2460bff904a4a5c14276d0c373cd1d8729 MISC metadata.xml 436 BLAKE2B df6b2b25107b10b62618306f09e48f4337315792390c58392f73b270466f4927209dba0d8d1f1d8b8f65f345bce077a7b738f240f077a0eb26c23353673d412f SHA512 1b867378bde3ac034a7fbdc84e47b77b570ecf7a7688b0dc47950de7ea6601284c8101600928ddb7725f7a09ecc73eb01bdf646b0ecca250029e3063a4427ca8 diff --git a/sys-kernel/spl/spl-0.6.5.11.ebuild b/sys-kernel/spl/spl-0.6.5.11.ebuild index cd71c032ccce..d527d2919fd0 100644 --- a/sys-kernel/spl/spl-0.6.5.11.ebuild +++ b/sys-kernel/spl/spl-0.6.5.11.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi inherit flag-o-matic linux-info linux-mod autotools-utils diff --git a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild deleted file mode 100644 index 887c46dc770e..000000000000 --- a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [[ ${PV} == "9999" ]] ; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p1.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -inherit flag-o-matic linux-info linux-mod autotools-utils - -DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug" -RESTRICT="debug? ( strip ) test" - -COMMON_DEPEND=" - dev-lang/perl - virtual/awk" - -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND} - !sys-devel/spl" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" -DOCS=( AUTHORS DISCLAIMER ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - !CONFIG_REISER4_FS - !GRKERNSEC_RANDSTRUCT - KALLSYMS - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 4 || die "Linux 4.4 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${P}-patches" - fi - - # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ - die "Cannot patch check.sh" - - # splat is unnecessary unless we are debugging - use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=all - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi -} diff --git a/sys-kernel/spl/spl-0.7.6.ebuild b/sys-kernel/spl/spl-0.7.6.ebuild deleted file mode 100644 index 31cf17318cfa..000000000000 --- a/sys-kernel/spl/spl-0.7.6.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [[ ${PV} == "9999" ]] ; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -inherit flag-o-matic linux-info linux-mod autotools-utils - -DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug" -RESTRICT="debug? ( strip ) test" - -COMMON_DEPEND=" - dev-lang/perl - virtual/awk" - -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND} - !sys-devel/spl" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" -DOCS=( AUTHORS DISCLAIMER ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - MODULES - KALLSYMS - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !PAX_SIZE_OVERFLOW - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 15 || die "Linux 4.15 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ - die "Cannot patch check.sh" - - # splat is unnecessary unless we are debugging - use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=all - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi -} diff --git a/sys-kernel/spl/spl-0.7.8.ebuild b/sys-kernel/spl/spl-0.7.8.ebuild index d8a0446f5736..871dba52938f 100644 --- a/sys-kernel/spl/spl-0.7.8.ebuild +++ b/sys-kernel/spl/spl-0.7.8.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi inherit flag-o-matic linux-info linux-mod autotools-utils -- cgit v1.2.3