summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-01-23 14:15:54 +0100
committerMichał Górny <mgorny@gentoo.org>2018-01-23 15:45:47 +0100
commit5c8441a05868e8fff774956a43bc3cbb7ff8af76 (patch)
treed22c506a4f7e959d6e7cf8a2907ae807e644ac80 /sys-freebsd
parentsys-freebsd/freebsd-bin: Remove 8.2 (diff)
downloadgentoo-5c8441a05868e8fff774956a43bc3cbb7ff8af76.tar.gz
gentoo-5c8441a05868e8fff774956a43bc3cbb7ff8af76.tar.bz2
gentoo-5c8441a05868e8fff774956a43bc3cbb7ff8af76.zip
sys-freebsd/freebsd-cddl: Remove 8.2
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-cddl/Manifest7
-rw-r--r--sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch114
-rw-r--r--sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch22
-rw-r--r--sys-freebsd/freebsd-cddl/files/zvol.initd46
-rw-r--r--sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild47
5 files changed, 0 insertions, 236 deletions
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index e179eb2396a..a914029f7dc 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,15 +1,8 @@
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
deleted file mode 100644
index ad5c83eca3d..00000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile
---- cddl.orig/lib/libctf/Makefile 2009-01-24 03:36:33 -0200
-+++ cddl/lib/libctf/Makefile 2009-01-24 03:55:10 -0200
-@@ -4,6 +4,7 @@
-
- LIB= ctf
- SHLIB_MAJOR= 2
-+LDADD+=-lz
-
- SRCS= ctf_create.c \
- ctf_decl.c \
-diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile
---- cddl.orig/lib/libdtrace/Makefile 2009-01-24 00:18:47 -0200
-+++ cddl/lib/libdtrace/Makefile 2009-01-24 03:31:06 -0200
-@@ -74,7 +74,7 @@
- .endif
-
- LFLAGS+=-l
--
-+LDADD+=-lz -lproc
- YFLAGS+=-d
-
- CLEANFILES= dt_errtags.c dt_names.c
-diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.orig/lib/libzfs/Makefile 2008-06-22 10:26:18 -0300
-+++ cddl/lib/libzfs/Makefile 2008-06-22 10:26:26 -0300
-@@ -7,7 +7,8 @@
-
- LIB= zfs
- DPADD= ${LIBUTIL}
--LDADD= -lutil
-+LDADD= -lutil -lgeom -lm -luutil -lumem
-+LDFLAGS+= -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem
-
- SRCS= deviceid.c \
- mnttab.c \
-diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.orig/lib/libzpool/Makefile 2008-06-22 10:35:15 -0300
-+++ cddl/lib/libzpool/Makefile 2008-06-22 10:37:06 -0300
-@@ -42,7 +42,8 @@
- CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-
- DPADD= ${LIBPTHREAD} ${LIBZ}
--LDADD= -lpthread -lz
-+LDADD= -lpthread -lz -lavl -lumem
-+LDFLAGS+= -L${.CURDIR}/../libavl -L${.CURDIR}/../libumem
-
- # atomic.S doesn't like profiling.
- NO_PROFILE=
-diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.orig/sbin/zfs/Makefile 2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zfs/Makefile 2008-06-22 10:14:23 -0300
-@@ -23,5 +23,7 @@
- ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD= -lzfs -lgeom -lbsdxml -lsbuf \
- -lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \
-+ -L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib
-
- .include <bsd.prog.mk>
-diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.orig/sbin/zpool/Makefile 2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zpool/Makefile 2008-06-22 10:14:47 -0300
-@@ -23,5 +23,7 @@
- ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \
- -lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib \
-+ -L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil
-
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
---- cddl.orig/usr.bin/ztest/Makefile 2008-06-22 10:02:30 -0300
-+++ cddl/usr.bin/ztest/Makefile 2008-06-22 10:12:40 -0300
-@@ -18,5 +18,7 @@
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib
-
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc
---- cddl.orig/usr.bin/Makefile.inc 2009-01-10 07:21:10 +0000
-+++ cddl/usr.bin/Makefile.inc 2009-01-10 07:18:55 +0000
-@@ -1,5 +1,6 @@
- # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
-
- BINDIR?= /usr/bin
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
-
- .include "../Makefile.inc"
---- cddl.orig/usr.sbin/zdb/Makefile 2010-03-11 13:19:48 +0100
-+++ cddl/usr.sbin/zdb/Makefile 2010-03-11 13:20:08 +0100
-@@ -22,6 +22,8 @@
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
- LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs
-
- CSTD= c99
-
---- cddl.orig/usr.bin/zinject/Makefile 2010-03-11 13:30:32 +0100
-+++ cddl/usr.bin/zinject/Makefile 2010-03-11 13:33:27 +0100
-@@ -21,5 +21,8 @@
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
- LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \
-+ -L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \
-+ -L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool
-
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
deleted file mode 100644
index a0e56779047..00000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000
-+++ cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000
-@@ -24,6 +24,8 @@
- #CFLAGS+= -DNEED_ERRLOC
- #YFLAGS+= -d
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
- ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
- LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
---- cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000
-+++ cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000
-@@ -23,6 +23,8 @@
-
- CFLAGS+= -DNEED_ERRLOC -g
-
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+= -d
-
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd
deleted file mode 100644
index 28eba8e8c68..00000000000
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need hostid
- before fsck
-}
-
-start() {
- einfo "Starting zfs volumes..."
- zfs volinit
- eend $?
- # Enable swap on ZVOLs that have org.freebsd:swap=on.
- zfs list -H -o org.freebsd:swap,name -t volume | \
- while read state name; do
- case "${state}" in
- [oO][nN])
- einfo "Enabling swap on zvol ${name}"
- swapon /dev/zvol/${name}
- eend $?
- ;;
- esac
- done
-}
-
-stop() {
- # Disable what we had enabled before.
- zfs list -H -o org.freebsd:swap,name -t volume | \
- while read state name; do
- case "${state}" in
- [oO][nN])
- einfo "Disabling swap on zvol ${name}"
- swapoff /dev/zvol/${name}
- eend $?
- ;;
- esac
- done
- einfo "Stopping zfs volumes..."
- zfs volfini
- eend $?
-}
-
-restart() {
- :
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
deleted file mode 100644
index 32d09d66b25..00000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${SYS}.tar.bz2
- build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )
- dev-libs/libedit
- dev-libs/libelf"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" "${FILESDIR}/${PN}-8.2-libpaths.patch" )
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
- freebsd_src_install
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd zvol
-}