diff options
| -rw-r--r-- | sys-cluster/drbd-kernel/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild | 12 | ||||
| -rw-r--r-- | sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild | 6 | ||||
| -rw-r--r-- | sys-cluster/drbd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/drbd/drbd-0.7.24-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-cluster/drbd/drbd-0.7.24.ebuild | 20 | ||||
| -rw-r--r-- | sys-cluster/drbd/drbd-8.0.6-r1.ebuild | 8 |
7 files changed, 35 insertions, 31 deletions
diff --git a/sys-cluster/drbd-kernel/ChangeLog b/sys-cluster/drbd-kernel/ChangeLog index d22cbea098ae..7d047150775e 100644 --- a/sys-cluster/drbd-kernel/ChangeLog +++ b/sys-cluster/drbd-kernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/drbd-kernel # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/ChangeLog,v 1.1 2007/10/05 14:01:19 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/ChangeLog,v 1.2 2007/10/05 20:37:07 xmerlin Exp $ + + 05 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org> + drbd-kernel-0.7.24.ebuild, drbd-kernel-8.0.6.ebuild: + Added some escaping. *drbd-kernel-8.0.6 (05 Oct 2007) *drbd-kernel-0.7.24 (05 Oct 2007) diff --git a/sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild index 3256b23e8c04..1b7b25fee12a 100644 --- a/sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild +++ b/sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild,v 1.1 2007/10/05 14:01:19 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-0.7.24.ebuild,v 1.2 2007/10/05 20:37:07 xmerlin Exp $ inherit eutils versionator linux-mod @@ -24,10 +24,6 @@ SLOT="0" S="${WORKDIR}/${MY_P}" pkg_setup() { -# if ! kernel_is 2 6; then -# die "Unsupported kernel, drbd-8.0.x needs kernel 2.6.x ." -# fi - MODULE_NAMES="drbd(block:${S}/drbd)" BUILD_TARGETS="default" CONFIG_CHECK="CONNECTOR" @@ -38,10 +34,10 @@ pkg_setup() { src_unpack() { unpack ${A} - cd ${S} + cd "${S}" - epatch ${FILESDIR}/${MY_PN}-0.7.22-nodevfs.patch || die - epatch ${FILESDIR}/${MY_PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die + epatch "${FILESDIR}"/${MY_PN}-0.7.22-nodevfs.patch || die + epatch "${FILESDIR}"/${MY_PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die } pkg_postinst() { diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild index d162c8be758b..3e909c2177b1 100644 --- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild +++ b/sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild,v 1.1 2007/10/05 14:01:19 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-8.0.6.ebuild,v 1.2 2007/10/05 20:37:07 xmerlin Exp $ inherit eutils versionator linux-mod @@ -38,9 +38,9 @@ pkg_setup() { src_unpack() { unpack ${A} - cd ${S} + cd "${S}" - epatch ${FILESDIR}/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die + epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die } pkg_postinst() { diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog index 1bd74dbad43b..6a697f30ee7f 100644 --- a/sys-cluster/drbd/ChangeLog +++ b/sys-cluster/drbd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/drbd # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.74 2007/10/05 14:02:51 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.75 2007/10/05 20:34:56 xmerlin Exp $ + + 05 Oct 2007; Christian Zoffoli <xmerlin@gentoo.org> drbd-0.7.24.ebuild, + drbd-0.7.24-r1.ebuild, drbd-8.0.6-r1.ebuild: + Added some escaping. *drbd-8.0.6-r1 (05 Oct 2007) *drbd-0.7.24-r1 (05 Oct 2007) diff --git a/sys-cluster/drbd/drbd-0.7.24-r1.ebuild b/sys-cluster/drbd/drbd-0.7.24-r1.ebuild index 8ba2f8996f9e..3f27540f8479 100644 --- a/sys-cluster/drbd/drbd-0.7.24-r1.ebuild +++ b/sys-cluster/drbd/drbd-0.7.24-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24-r1.ebuild,v 1.1 2007/10/05 14:02:51 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24-r1.ebuild,v 1.2 2007/10/05 20:34:56 xmerlin Exp $ inherit eutils versionator @@ -28,10 +28,10 @@ src_compile() { } src_install() { - emake PREFIX=${D} install-tools || die "install problem" + emake PREFIX="${D}" install-tools || die "install problem" # gentoo-ish init-script - newinitd ${FILESDIR}/${PN}-0.7.rc ${PN} || die + newinitd "${FILESDIR}"/${PN}-0.7.rc ${PN} || die # needed by drbd startup script #keepdir /var/lib/drbd @@ -43,7 +43,7 @@ src_install() { # we put drbd.conf into docs # it doesnt make sense to install a default conf in /etc # put it to the docs - rm -f ${D}/etc/drbd.conf + rm -f "${D}"/etc/drbd.conf dodoc scripts/drbd.conf || die dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die } diff --git a/sys-cluster/drbd/drbd-0.7.24.ebuild b/sys-cluster/drbd/drbd-0.7.24.ebuild index dd8b7558b591..08bd55de1f67 100644 --- a/sys-cluster/drbd/drbd-0.7.24.ebuild +++ b/sys-cluster/drbd/drbd-0.7.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24.ebuild,v 1.4 2007/08/16 16:36:24 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24.ebuild,v 1.5 2007/10/05 20:34:56 xmerlin Exp $ inherit eutils versionator linux-mod linux-info @@ -24,10 +24,10 @@ pkg_setup() { src_unpack() { unpack ${A} - cd ${S} + cd "${S}" - epatch ${FILESDIR}/${PN}-0.7.22-nodevfs.patch || die - epatch ${FILESDIR}/${PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die + epatch "${FILESDIR}"/${PN}-0.7.22-nodevfs.patch || die + epatch "${FILESDIR}"/${PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die } src_compile() { @@ -40,18 +40,18 @@ src_compile() { einfo "" if kernel_is 2 6; then - emake -j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT} || die "compile problem" + emake -j1 KDIR="${KERNEL_DIR}" O="${KBUILD_OUTPUT}" || die "compile problem" else - cp -R /usr/src/linux-${KV} ${WORKDIR} - emake -j1 KDIR=/${WORKDIR}/linux-${KV} O=${KBUILD_OUTPUT} || die "compile problem" + cp -R /usr/src/linux-${KV} "${WORKDIR}" + emake -j1 KDIR="${WORKDIR}"/linux-${KV} O="${KBUILD_OUTPUT}" || die "compile problem" fi } src_install() { - emake PREFIX=${D} install || die "install problem" + emake PREFIX="${D}" install || die "install problem" # gentoo-ish init-script - newinitd ${FILESDIR}/${PN}-0.7.rc ${PN} || die + newinitd "${FILESDIR}"/${PN}-0.7.rc ${PN} || die # needed by drbd startup script #keepdir /var/lib/drbd @@ -63,7 +63,7 @@ src_install() { # we put drbd.conf into docs # it doesnt make sense to install a default conf in /etc # put it to the docs - rm -f ${D}/etc/drbd.conf + rm -f "${D}"/etc/drbd.conf dodoc scripts/drbd.conf || die dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die } diff --git a/sys-cluster/drbd/drbd-8.0.6-r1.ebuild b/sys-cluster/drbd/drbd-8.0.6-r1.ebuild index 4fb21b2db099..9a0e2aef44c4 100644 --- a/sys-cluster/drbd/drbd-8.0.6-r1.ebuild +++ b/sys-cluster/drbd/drbd-8.0.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.0.6-r1.ebuild,v 1.1 2007/10/05 14:02:51 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.0.6-r1.ebuild,v 1.2 2007/10/05 20:34:56 xmerlin Exp $ inherit eutils versionator @@ -28,10 +28,10 @@ src_compile() { } src_install() { - emake PREFIX=${D} install-tools || die "install problem" + emake PREFIX="${D}" install-tools || die "install problem" # gentoo-ish init-script - newinitd ${FILESDIR}/${PN}-8.0.rc ${PN} || die + newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die # docs dodoc README ChangeLog COPYING ROADMAP INSTALL @@ -39,7 +39,7 @@ src_install() { # we put drbd.conf into docs # it doesnt make sense to install a default conf in /etc # put it to the docs - rm -f ${D}/etc/drbd.conf + rm -f "${D}"/etc/drbd.conf dodoc scripts/drbd.conf || die } |