diff options
author | Jeremy Olexa <darkside@gentoo.org> | 2008-06-12 23:48:08 +0000 |
---|---|---|
committer | Jeremy Olexa <darkside@gentoo.org> | 2008-06-12 23:48:08 +0000 |
commit | 5f6dd8fee78c08e8e022bc07e94f8ce84f9fbffd (patch) | |
tree | f8a4853079d07413d4a7a2eaedbc210de0dcd607 /dev-util/devel-chroots | |
parent | Version bump (diff) | |
download | gentoo-2-5f6dd8fee78c08e8e022bc07e94f8ce84f9fbffd.tar.gz gentoo-2-5f6dd8fee78c08e8e022bc07e94f8ce84f9fbffd.tar.bz2 gentoo-2-5f6dd8fee78c08e8e022bc07e94f8ce84f9fbffd.zip |
install was hardcoded in the Makefile. Fix bug #218896.
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-util/devel-chroots')
-rw-r--r-- | dev-util/devel-chroots/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/devel-chroots/devel-chroots-1.0.1.ebuild | 11 | ||||
-rw-r--r-- | dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch | 21 |
3 files changed, 35 insertions, 3 deletions
diff --git a/dev-util/devel-chroots/ChangeLog b/dev-util/devel-chroots/ChangeLog index 7adc048e9c99..4cfc19e8b9dd 100644 --- a/dev-util/devel-chroots/ChangeLog +++ b/dev-util/devel-chroots/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/devel-chroots # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/ChangeLog,v 1.33 2008/06/03 01:27:11 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/ChangeLog,v 1.34 2008/06/12 23:48:08 darkside Exp $ + + 12 Jun 2008; Jeremy Olexa <darkside@gentoo.org> + +files/devel-chroots-1.0.1-install.patch, devel-chroots-1.0.1.ebuild: + install was hardcoded in the Makefile. Fix bug #218896. 03 Jun 2008; Jeremy Olexa <darkside@gentoo.org> devel-chroots-2.1.0.ebuild: diff --git a/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild b/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild index 27649e68dd76..5137de3d16b3 100644 --- a/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild +++ b/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild,v 1.9 2007/07/12 01:05:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devel-chroots/devel-chroots-1.0.1.ebuild,v 1.10 2008/06/12 23:48:08 darkside Exp $ DESCRIPTION="Gentoo Developer chroots installation/configuration launcher" HOMEPAGE="http://www.gentoo.org/proj/en/hardened/docs/devel-chroots-intro.xml" @@ -19,6 +19,13 @@ IUSE="" DEPEND="app-misc/screen net-misc/wget sys-apps/sed" +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i -e 's/\/bin\/install/install/' Makefile || die "sed failed" +} + src_compile() { emake || die "emake failed" diff --git a/dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch b/dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch new file mode 100644 index 000000000000..893ff7902100 --- /dev/null +++ b/dev-util/devel-chroots/files/devel-chroots-1.0.1-install.patch @@ -0,0 +1,21 @@ +--- Makefile.orig 2008-06-12 18:32:17.000000000 -0500 ++++ Makefile 2008-06-12 18:32:39.000000000 -0500 +@@ -5,13 +5,13 @@ + + install: + +- /bin/install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots" "${DESTDIR}/usr/bin/devel-chroots" +- /bin/install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots-umount-all" "${DESTDIR}/usr/bin/devel-chroots-umount-all" ++ install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots" "${DESTDIR}/usr/bin/devel-chroots" ++ install -D --mode=0755 -p --group=root --owner=root "src/scripts/devel-chroots-umount-all" "${DESTDIR}/usr/bin/devel-chroots-umount-all" + +- /bin/install -D --mode=0755 -p --group=root --owner=root "devel-chroots-hostname" "${DESTDIR}/usr/bin/devel-chroots-hostname" ++ /install -D --mode=0755 -p --group=root --owner=root "devel-chroots-hostname" "${DESTDIR}/usr/bin/devel-chroots-hostname" + +- /bin/install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-core.conf" "${DESTDIR}/etc/devel-chroots-core.conf" +- /bin/install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-user.conf" "${DESTDIR}/etc/devel-chroots-user.conf" ++ install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-core.conf" "${DESTDIR}/etc/devel-chroots-core.conf" ++ install -D --mode=0755 -p --group=root --owner=root "config/devel-chroots-user.conf" "${DESTDIR}/etc/devel-chroots-user.conf" + + clean: + |