From f3712af22437866a5f7a134a4de937df08536256 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Tue, 22 May 2012 02:08:15 +0000 Subject: [PATCH] pentoo-installer: very carefully strip the undesired use flags when no longer running live (like an installer) --- pentoo/pentoo-installer/Manifest | 2 ++ .../files/fix-useflags-on-install.diff | 11 +++++++ .../pentoo-installer-0.1.3.2-r2.ebuild | 31 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 pentoo/pentoo-installer/files/fix-useflags-on-install.diff create mode 100644 pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r2.ebuild diff --git a/pentoo/pentoo-installer/Manifest b/pentoo/pentoo-installer/Manifest index 9eaa7fc09..99a92d4b2 100644 --- a/pentoo/pentoo-installer/Manifest +++ b/pentoo/pentoo-installer/Manifest @@ -1,4 +1,6 @@ AUX 7500-ext4.patch 732 RMD160 b79b95af8d96dfd804abf1bc3b41971ac7d2b690 SHA1 65cdc747467c05330b96bcf878aa6406f227a0f7 SHA256 cc139f34f29dbf2d797eb4b4da0f5887a2aea27d130722fb2165ed3338e82e72 +AUX fix-useflags-on-install.diff 455 RMD160 96f93da26af3881f40f82d3a7227d1cd10a7e3f7 SHA1 cbcc1722239d7781755acb5a0f96f27981e89b53 SHA256 9f0b8542f21d6d06e35f6171d2b6925cc72872fd6724ca8008e5b63f972da796 DIST pentoo-installer-0.1.3.2.tar.xz 20368 RMD160 14790ad732722b285f15859e24bcf274213160a2 SHA1 b69f59575bae6b06eac11a27ac2bf61a7f8c6edf SHA256 5ea5931458018f8422eebd9a5968ca28054607e0643df0c53564abcf7db46e9a EBUILD pentoo-installer-0.1.3.2-r1.ebuild 618 RMD160 ca536eac954721104ed9c647023fa2afd0f79ce5 SHA1 39f3d6e0d7942779aea77da91f6e59dfa7b544fb SHA256 cbf48e69d310a100a96a37194a56d1d0a96597d099dcacabe63129560f832974 +EBUILD pentoo-installer-0.1.3.2-r2.ebuild 669 RMD160 77d6e026a923e977f782a210ee77212feb2a2630 SHA1 dcd59cf9381b30f60b0f0738607b33e23d599629 SHA256 866cdd5ea28c26a86c32f2474b4dd9e1911aaa0ac291d6a42daf4a36ba49d85b EBUILD pentoo-installer-0.1.3.2.ebuild 552 RMD160 e412bcbdfbcf726b4abb3fac6bb0d120749d99d2 SHA1 e85851f5a645c5812a6b7c5ceb62ef7d92ff7f22 SHA256 09347afb7d09592787a88a1d76414155de65129be6abfa29aa476d052b0f4be8 diff --git a/pentoo/pentoo-installer/files/fix-useflags-on-install.diff b/pentoo/pentoo-installer/files/fix-useflags-on-install.diff new file mode 100644 index 000000000..f05af35d1 --- /dev/null +++ b/pentoo/pentoo-installer/files/fix-useflags-on-install.diff @@ -0,0 +1,11 @@ +--- setup 2012-05-21 22:04:50.872093195 -0400 ++++ setup-next 2012-05-21 22:05:25.594094254 -0400 +@@ -657,7 +657,7 @@ + DIALOG --msgbox "Rsync failed (maybe you're out of disk space?). See the log output for more information" + return 1 + fi +- ++ sed -i 's#aufs bindist livecd##' ${DESTDIR}/etc/make.conf + mknod -m666 ${DESTDIR}/dev/zero c 1 5 + mknod -m666 ${DESTDIR}/dev/null c 1 3 + mknod -m600 ${DESTDIR}/dev/console c 5 1 diff --git a/pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r2.ebuild b/pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r2.ebuild new file mode 100644 index 000000000..195d47b51 --- /dev/null +++ b/pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit eutils + +DESCRIPTION="ncurses based installer for pentoo, based on the Arch Linux installer" +HOMEPAGE="http://gitorious.org/pentoo/pentoo-installer" +SRC_URI="http://dev.pentoo.ch/~jensp/distfiles/$P.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="app-arch/xz-utils" +RDEPEND="dev-util/dialog + || (