| 1 |
axs 12/11/04 02:19:51 |
| 2 |
|
| 3 |
Modified: dmraid-1.0.0_rc16-r3.ebuild ChangeLog |
| 4 |
Removed: dmraid-1.0.0_rc16-r2.ebuild |
| 5 |
Log: |
| 6 |
remove old; bump rc16 to EAPI=5, add epatch_user and make elog messages contextual to reduce elog spam |
| 7 |
|
| 8 |
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: dmraid-1.0.0_rc16-r3.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- dmraid-1.0.0_rc16-r3.ebuild 24 May 2012 02:51:41 -0000 1.3 |
| 24 |
+++ dmraid-1.0.0_rc16-r3.ebuild 4 Nov 2012 02:19:51 -0000 1.4 |
| 25 |
@@ -1,8 +1,8 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v 1.3 2012/05/24 02:51:41 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v 1.4 2012/11/04 02:19:51 axs Exp $ |
| 30 |
|
| 31 |
-EAPI="2" |
| 32 |
+EAPI=5 |
| 33 |
|
| 34 |
inherit autotools linux-info flag-o-matic eutils |
| 35 |
|
| 36 |
@@ -16,6 +16,7 @@ |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 39 |
IUSE="dietlibc intel_led klibc led mini static" |
| 40 |
+REQUIRED_USE="klibc? ( !dietlibc )" |
| 41 |
|
| 42 |
RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 |
| 43 |
sys-fs/device-mapper ) |
| 44 |
@@ -39,56 +40,60 @@ |
| 45 |
"${FILESDIR}"/${P}-return-all-sets.patch \ |
| 46 |
"${FILESDIR}"/${P}-static-build-fixes.patch |
| 47 |
# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it |
| 48 |
- elog "Appending pkg.m4 from system to aclocal.m4" |
| 49 |
+ einfo "Appending pkg.m4 from system to aclocal.m4" |
| 50 |
cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4" |
| 51 |
+ epatch_user |
| 52 |
eautoreconf |
| 53 |
|
| 54 |
- elog "Creating prepatched source archive for use with Genkernel" |
| 55 |
+ einfo "Creating prepatched source archive for use with Genkernel" |
| 56 |
# archive the patched source for use with genkernel |
| 57 |
- cd "${WORKDIR}" |
| 58 |
- mkdir -p "tmp/${PN}" |
| 59 |
- cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" |
| 60 |
- mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" |
| 61 |
- cd tmp |
| 62 |
+ cd "${WORKDIR}" || die |
| 63 |
+ mkdir -p "tmp/${PN}" || die |
| 64 |
+ cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die |
| 65 |
+ mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die |
| 66 |
+ cd tmp || die |
| 67 |
tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die |
| 68 |
- mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. |
| 69 |
+ mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
- local mylibc |
| 74 |
- if use klibc && use dietlibc; then |
| 75 |
- ewarn "Cannot compile against both klibc and dietlibc -- choosing klibc." |
| 76 |
- mylibc="--enable-klibc --disable-dietlibc" |
| 77 |
- else |
| 78 |
- mylibc="$(use_enable klibc) $(use_enable dietlibc)" |
| 79 |
- fi |
| 80 |
econf --with-usrlibdir='${prefix}'/$(get_libdir) \ |
| 81 |
$(use_enable static static_link) \ |
| 82 |
$(use_enable mini) \ |
| 83 |
$(use_enable led) \ |
| 84 |
$(use_enable intel_led) \ |
| 85 |
- ${mylibc} |
| 86 |
+ $(use_enable klibc) \ |
| 87 |
+ $(use_enable dietlibc) |
| 88 |
} |
| 89 |
|
| 90 |
src_install() { |
| 91 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 92 |
- dodoc CHANGELOG README TODO KNOWN_BUGS doc/* || die "dodoc failed" |
| 93 |
+ emake DESTDIR="${D}" install |
| 94 |
+ dodoc CHANGELOG README TODO KNOWN_BUGS doc/* |
| 95 |
insinto /usr/share/${PN} |
| 96 |
- doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 || die |
| 97 |
+ doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 |
| 98 |
} |
| 99 |
|
| 100 |
pkg_postinst() { |
| 101 |
- elog "For booting Gentoo from Device-Mapper RAID you can use Genkernel." |
| 102 |
- elog " " |
| 103 |
- elog "Genkernel will generate the kernel and the initrd with a statically " |
| 104 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
| 105 |
+ elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs." |
| 106 |
+ elog |
| 107 |
+ elog "Genkernel will generate the kernel and the initramfs with a statically " |
| 108 |
elog "linked dmraid binary (its own version which may not be the same as this version):" |
| 109 |
elog "\t emerge -av sys-kernel/genkernel" |
| 110 |
elog "\t genkernel --dmraid all" |
| 111 |
- elog " " |
| 112 |
+ fi |
| 113 |
+ if [[ ${REPLACING_VERSIONS} != ${PVR} ]]; then |
| 114 |
+ elog |
| 115 |
+ elog "A pre-patched distfile of this version of DMRAID has been installed at" |
| 116 |
+ elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a" |
| 117 |
+ elog "Genkernel initramfs." |
| 118 |
+ elog |
| 119 |
+ fi |
| 120 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
| 121 |
elog "If you would rather use this version of DMRAID with Genkernel, update the following" |
| 122 |
elog "in /etc/genkernel.conf:" |
| 123 |
elog "\t DMRAID_VER=\"${MY_PV}\"" |
| 124 |
elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\"" |
| 125 |
- elog " " |
| 126 |
- ewarn "DMRAID should be safe to use, but no warranties can be given" |
| 127 |
+ elog |
| 128 |
+ fi |
| 129 |
} |
| 130 |
|
| 131 |
|
| 132 |
|
| 133 |
1.28 sys-fs/dmraid/ChangeLog |
| 134 |
|
| 135 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/dmraid/ChangeLog?rev=1.28&view=markup |
| 136 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/dmraid/ChangeLog?rev=1.28&content-type=text/plain |
| 137 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/dmraid/ChangeLog?r1=1.27&r2=1.28 |
| 138 |
|
| 139 |
Index: ChangeLog |
| 140 |
=================================================================== |
| 141 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v |
| 142 |
retrieving revision 1.27 |
| 143 |
retrieving revision 1.28 |
| 144 |
diff -u -r1.27 -r1.28 |
| 145 |
--- ChangeLog 24 May 2012 02:51:41 -0000 1.27 |
| 146 |
+++ ChangeLog 4 Nov 2012 02:19:51 -0000 1.28 |
| 147 |
@@ -1,6 +1,11 @@ |
| 148 |
# ChangeLog for sys-fs/dmraid |
| 149 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 150 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.27 2012/05/24 02:51:41 vapier Exp $ |
| 151 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.28 2012/11/04 02:19:51 axs Exp $ |
| 152 |
+ |
| 153 |
+ 04 Nov 2012; Ian Stakenvicius <axs@g.o> -dmraid-1.0.0_rc16-r2.ebuild, |
| 154 |
+ dmraid-1.0.0_rc16-r3.ebuild: |
| 155 |
+ remove old; bump rc16 to EAPI=5, add epatch_user and make elog messages |
| 156 |
+ contextual to reduce elog spam |
| 157 |
|
| 158 |
24 May 2012; Mike Frysinger <vapier@g.o> dmraid-1.0.0_rc14.ebuild, |
| 159 |
dmraid-1.0.0_rc15.ebuild, dmraid-1.0.0_rc16-r2.ebuild, |
Archives