| 1 |
aballier 12/05/12 14:59:29 |
| 2 |
|
| 3 |
Modified: freebsd-cddl-9.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
fix installation, bug #414879 and simplify ebuild |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: freebsd-cddl-9.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- freebsd-cddl-9.0.ebuild 12 May 2012 07:57:13 -0000 1.5 |
| 23 |
+++ freebsd-cddl-9.0.ebuild 12 May 2012 14:59:29 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.5 2012/05/12 07:57:13 naota Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.6 2012/05/12 14:59:29 aballier Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -48,23 +48,10 @@ |
| 33 |
src_install() { |
| 34 |
# Install libraries proper place |
| 35 |
local mylibdir=$(get_libdir) |
| 36 |
- for d in libavl libctf libdtrace; do |
| 37 |
- cd "${S}"/lib/$d |
| 38 |
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die |
| 39 |
- done |
| 40 |
- for d in libnvpair libumem libuutil libzfs libzpool;do |
| 41 |
- cd "${S}"/lib/$d |
| 42 |
- mkinstall SHLIBDIR="/${mylibdir}" LIBDIR="/${mylibdir}" || die |
| 43 |
- done |
| 44 |
- for d in lib/drti sbin usr.bin usr.sbin; do |
| 45 |
- cd "${S}"/$d |
| 46 |
- mkinstall || die |
| 47 |
- done |
| 48 |
- mv "${ED}"/${mylibdir}/lib{nvpair,umem,uutil,zfs}{,_p}.a \ |
| 49 |
- "${ED}"/${mylibdir}/libzpool.a \ |
| 50 |
- "${ED}"/usr/${mylibdir} || die |
| 51 |
- gen_usr_ldscript libnvpair.so libumem.so libuutil.so libzfs.so libzpool.so |
| 52 |
- # Install zfs volinit script. |
| 53 |
+ mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die |
| 54 |
+ |
| 55 |
+ gen_usr_ldscript -a nvpair umem uutil zfs zpool |
| 56 |
|
| 57 |
+ # Install zfs volinit script. |
| 58 |
newinitd "${FILESDIR}"/zvol.initd-9.0 zvol |
| 59 |
} |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.22 sys-freebsd/freebsd-cddl/ChangeLog |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog?rev=1.22&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog?rev=1.22&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog?r1=1.21&r2=1.22 |
| 68 |
|
| 69 |
Index: ChangeLog |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v |
| 72 |
retrieving revision 1.21 |
| 73 |
retrieving revision 1.22 |
| 74 |
diff -u -r1.21 -r1.22 |
| 75 |
--- ChangeLog 12 May 2012 07:57:13 -0000 1.21 |
| 76 |
+++ ChangeLog 12 May 2012 14:59:29 -0000 1.22 |
| 77 |
@@ -1,6 +1,9 @@ |
| 78 |
# ChangeLog for sys-freebsd/freebsd-cddl |
| 79 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.21 2012/05/12 07:57:13 naota Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.22 2012/05/12 14:59:29 aballier Exp $ |
| 82 |
+ |
| 83 |
+ 12 May 2012; Alexis Ballier <aballier@g.o> freebsd-cddl-9.0.ebuild: |
| 84 |
+ fix installation, bug #414879 and simplify ebuild |
| 85 |
|
| 86 |
12 May 2012; Naohiro Aota <naota@g.o> +files/zvol.initd-9.0, |
| 87 |
freebsd-cddl-9.0.ebuild: |
Archives