From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6F37D138010 for ; Tue, 11 Sep 2012 17:11:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C657E075E; Tue, 11 Sep 2012 17:10:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AA9D1E075C for ; Tue, 11 Sep 2012 17:10:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E269A33C99E for ; Tue, 11 Sep 2012 17:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8BE53E544C for ; Tue, 11 Sep 2012 17:10:46 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1347382816.f7bc0307105418b1bbbe2c4d0aeb365a8cee6717.aballier@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-cddl/Manifest sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch sys-freebsd/freebsd-cddl/files/zfs.initd sys-freebsd/freebsd-cddl/files/zvol.initd sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild X-VCS-Directories: sys-freebsd/freebsd-cddl/files/ sys-freebsd/freebsd-cddl/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: f7bc0307105418b1bbbe2c4d0aeb365a8cee6717 X-VCS-Branch: master Date: Tue, 11 Sep 2012 17:10:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: edee4c8d-fc89-4ae1-8689-5cabea8fda1d X-Archives-Hash: 4cd1c83b9490f8acb03807afc980b8ec commit: f7bc0307105418b1bbbe2c4d0aeb365a8cee6717 Author: Alexis Ballier gentoo org> AuthorDate: Tue Sep 11 17:00:16 2012 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Sep 11 17:00:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=f7bc0307 remove freebsd-cddl, merged to the main tree --- sys-freebsd/freebsd-cddl/Manifest | 18 -- .../files/freebsd-cddl-7.1-libpaths.patch | 102 ------------ .../files/freebsd-cddl-7.1-xdr_header.patch | 16 -- .../files/freebsd-cddl-8.0-libpaths.patch | 114 ------------- .../files/freebsd-cddl-8.2-libpaths.patch | 22 --- .../files/freebsd-cddl-9.0-bsdxml.patch | 28 ---- .../files/freebsd-cddl-9.0-libpaths.patch | 167 -------------------- .../files/freebsd-cddl-9.0-underlink.patch | 22 --- sys-freebsd/freebsd-cddl/files/zfs.initd | 24 --- sys-freebsd/freebsd-cddl/files/zvol.initd | 47 ------ sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 | 45 ------ .../freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild | 62 ------- 12 files changed, 0 insertions(+), 667 deletions(-) diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest deleted file mode 100644 index 70f8517..0000000 --- a/sys-freebsd/freebsd-cddl/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX freebsd-cddl-7.1-libpaths.patch 3739 RMD160 93f97c9d820bc875954ab2b18268a7cc4f107a4a SHA1 ca17300a24df00cafcc4e990dd7727375a2992f5 SHA256 f07e90c67926b5ff1af3b1839797fd95f7eeecb7ec5cd938bb3eaf598de05287 -AUX freebsd-cddl-7.1-xdr_header.patch 380 RMD160 84ca8934581eb1e7728b690edbf0609ac5862265 SHA1 e107524735127ee5b290c64aab786e743e583134 SHA256 cb9d14f3770866c3d07d9aa09067428f0f1de432a7ac60567f57089a43704762 -AUX freebsd-cddl-8.0-libpaths.patch 4418 RMD160 5d21119466909363012ce062a2525d4a7a990b52 SHA1 d01a290b365624e5ddee879fc7347e0ad8b747dc SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c -AUX freebsd-cddl-8.2-libpaths.patch 822 RMD160 df5cb25f474da011973a1c4cf3acfc833c0f5d39 SHA1 d792e7fcac8c087e59f97db14e222a26f6cf0ad7 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db -AUX freebsd-cddl-9.0-bsdxml.patch 1419 RMD160 41e1a1a1ac5eb17709634a6198b1782768a6066d SHA1 a339d43ef9260faa254d5166fcdc5c18243735bb SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542 -AUX freebsd-cddl-9.0-libpaths.patch 7621 RMD160 5a6e4429826314892f5309fed3c9645d4cbda0c9 SHA1 77a4f692dbc9cb0480f4ac07a6d10a50ea834fbe SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 -AUX freebsd-cddl-9.0-underlink.patch 755 RMD160 fd26244f69dececaf488efe196866b095595d3e3 SHA1 5775f9691c5c64e2165d8f7f8267a5f28c9355a9 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c -AUX zfs.initd 481 RMD160 5a12f8be72bc71d605479f0677d7f31b8d3bff1d SHA1 bad2add2bedef6f110d47afc67c82bd1b139e0b6 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 -AUX zvol.initd 955 RMD160 cfd7bda7514f8217edc42a7ca103c92b174046fa SHA1 5e5af05dd5a0dc4bda75cf1548387ebe06c5b81c SHA256 6252345dca575d479621de99e4b19a384d76d0db1490fc1048ce742a065e9467 -AUX zvol.initd-9.0 930 RMD160 2a776a61c6c30083b152e57ce607c351f7f8118c SHA1 1bc21a74ae70573f31d4d40e7fec2c8d86e78ca2 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a -DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7 -DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d -DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5 -DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12 -DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52 -DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f -DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979 -EBUILD freebsd-cddl-9.1_rc1.ebuild 1524 RMD160 76cfbea7ab3f37057fd9f5be4bbce6f9fdde48ef SHA1 6ed1ca77401bb0fd4b58c18b7419628c57ceb2b9 SHA256 d16bcc6fe29047a307bc02f8c6208cda7eaa150c121f69fc74df8db17902909c diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch deleted file mode 100644 index e50fe5e..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch +++ /dev/null @@ -1,102 +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= 1 -+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,7 @@ - - LIB= zfs - DPADD= ${LIBUTIL} --LDADD= -lutil -+LDADD= -lutil -lgeom -lm - - 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 -+LDFLAGS+= -L${.CURDIR}/../libavl - - # 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 -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 -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 -diff -ru cddl.orig/usr.sbin/zdb/Makefile cddl/usr.sbin/zdb/Makefile ---- cddl.orig/usr.sbin/zdb/Makefile 2008-06-22 10:02:30 -0300 -+++ cddl/usr.sbin/zdb/Makefile 2008-06-22 10:13:31 -0300 -@@ -19,5 +19,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 -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" diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch deleted file mode 100644 index 0abc089..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- sys/cddl/compat/opensolaris/rpc/xdr.h.orig 2007-04-05 22:09:06 -0300 -+++ sys/cddl/compat/opensolaris/rpc/xdr.h 2008-06-22 09:46:28 -0300 -@@ -55,13 +55,6 @@ - - #define XDR_GET_BYTES_AVAIL 1 - --struct xdr_bytesrec { -- bool_t xc_is_last_record; -- size_t xc_num_avail; --}; -- --typedef struct xdr_bytesrec xdr_bytesrec; -- - /* - * These are the request arguments to XDR_CONTROL. - * 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 ad5c83e..0000000 --- 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 -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 -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 -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 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 a0e5677..0000000 --- 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/freebsd-cddl-9.0-bsdxml.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch deleted file mode 100644 index b3d95bb..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile ---- cddl.old/sbin/zfs/Makefile 2011-11-04 10:01:46.000000000 +0000 -+++ cddl/sbin/zfs/Makefile 2011-11-04 10:07:15.000000000 +0000 -@@ -21,8 +21,8 @@ - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - --DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ -+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} --LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -+LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs - - .include -diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile ---- cddl.old/sbin/zpool/Makefile 2011-11-04 10:01:46.000000000 +0000 -+++ cddl/sbin/zpool/Makefile 2011-11-04 10:06:38.000000000 +0000 -@@ -26,8 +26,8 @@ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - --DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ -+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} --LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -+LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs - - .include diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch deleted file mode 100644 index c81a2c3..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile ---- a/cddl/lib/libzfs/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/lib/libzfs/Makefile 2012-03-30 19:04:39.904906253 +0000 -@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+ - .include -diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile ---- a/cddl/lib/libzpool/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/lib/libzpool/Makefile 2012-03-30 19:04:55.839233753 +0000 -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+ - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} - LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl - -diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile ---- a/cddl/sbin/zfs/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/sbin/zfs/Makefile 2012-03-30 19:05:11.094859502 +0000 -@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} - LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile ---- a/cddl/sbin/zpool/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/sbin/zpool/Makefile 2012-03-30 19:05:24.830721002 +0000 -@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} - LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs -diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile ---- a/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 19:05:49.454897012 +0000 -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile ---- a/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 19:06:08.084858412 +0000 -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile ---- a/cddl/usr.bin/zinject/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/zinject/Makefile 2012-03-30 19:06:25.084865592 +0000 -@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS} ${LIBZPOOL} - LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool -diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile ---- a/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 19:06:44.544860132 +0000 -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile ---- a/cddl/usr.bin/ztest/Makefile 2012-03-30 18:58:53.174771000 +0000 -+++ b/cddl/usr.bin/ztest/Makefile 2012-03-30 19:06:58.344895642 +0000 -@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile ---- a/cddl/usr.sbin/zdb/Makefile 2012-03-30 18:58:53.164736000 +0000 -+++ b/cddl/usr.sbin/zdb/Makefile 2012-03-30 19:07:17.454861002 +0000 -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} - LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool ---- a/cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000 -+++ b/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 \ ---- a/cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000 -+++ b/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/freebsd-cddl-9.0-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch deleted file mode 100644 index ff87d2c..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- cddl/lib/libzfs/Makefile.old 2011-11-04 10:27:30.000000000 +0000 -+++ cddl/lib/libzfs/Makefile 2011-11-04 10:28:59.000000000 +0000 -@@ -7,7 +7,7 @@ - - LIB= zfs - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} --LDADD= -lmd -lpthread -lumem -lutil -+LDADD= -lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom - - SRCS= deviceid.c \ - fsshare.c \ ---- cddl/lib/libzpool/Makefile.old 2011-11-04 18:22:28.000000000 +0000 -+++ cddl/lib/libzpool/Makefile 2011-11-04 18:24:01.000000000 +0000 -@@ -57,7 +57,7 @@ - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} --LDADD= -lmd -lpthread -lz -+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl - - # atomic.S doesn't like profiling. - NO_PROFILE= diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd deleted file mode 100644 index a2b0f97..0000000 --- a/sys-freebsd/freebsd-cddl/files/zfs.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zfs.initd,v 1.1 2012/05/27 06:23:07 naota Exp $ - -depend() { - need hostid - before fsck -} - -start() { - einfo "Starting zfs ..." - zfs mount -a - zfs share -a - if [ ! -r /etc/zfs/exports ]; then - touch /etc/zfs/exports - fi -} - -stop() { - einfo "Stopping zfs ..." - zfs unshare -a - zfs unmount -a -} diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd deleted file mode 100755 index 738ec23..0000000 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zvol.initd,v 1.2 2011/07/06 05:51:32 aballier Exp $ - -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/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 deleted file mode 100755 index 5086680..0000000 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0,v 1.1 2012/05/12 07:57:13 naota Exp $ - -depend() { - need hostid - before fsck -} - -start() { - einfo "Starting zfs volumes..." - 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..." - eend $? -} - -restart() { - : -} diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild deleted file mode 100644 index 1477b4e..0000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit bsdmk freebsd toolchain-funcs multilib - -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" -SLOT="0" -KEYWORDS="~amd64-fbsd ~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/${SYS}.tar.bz2 - 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/libelf" - -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* )" - -S="${WORKDIR}/cddl" - -PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch" - "${FILESDIR}/${PN}-9.0-underlink.patch" - "${FILESDIR}/${PN}-9.0-libpaths.patch" ) - -src_unpack() { - freebsd_src_unpack - # Link in include headers. - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." -} - -src_install() { - # Install libraries proper place - local mylibdir=$(get_libdir) - mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die - - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool - - # Install zfs volinit script. - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol - - # Install zfs script - newinitd "${FILESDIR}"/zfs.initd zfs - - keepdir /etc/zfs -}