mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-02 19:50:51 +02:00
pentoo-installer: new version to fix bugs 65 and 66
This commit is contained in:
Zero_Chaos
parent
55c4665e78
commit
f92e5e9904
3 changed files with 86 additions and 0 deletions
|
|
@ -1,6 +1,7 @@
|
|||
AUX 7500-ext4.patch 732 SHA256 cc139f34f29dbf2d797eb4b4da0f5887a2aea27d130722fb2165ed3338e82e72 SHA512 04c80c3da0987ec013d7fcb5b04def19b10693826c4c2ab8624187b3049eaf9a46609c2237defe3bcaf8fae7ccfc73e3571436d0182c3e732b3801a2d082e553 WHIRLPOOL 3ca4e7fbb23e2aa3a23c46025bbcbf93c0bd61a6108824f4e4abde100e2963ddf707dbf5320ad5442591ceb888a1ca33c931bb9bc369dc1453eb9926fe2b57f5
|
||||
AUX 8000-ext4.patch 763 SHA256 e53e752ec4cc3f32e5a70b5f2b4e29a5fb1afce4fc9c8d44f0d97f58009736fb SHA512 42ce2bcc1ffa7484c2c7dcb0fce7afb76b40f2e323d0fd4a11b152c5903566ee8f300951defcacebcf2d3db6e7074aa340e9b969478a7d05c7b99297a900f4b2 WHIRLPOOL 93a982d3d669de34e10c3fbe64593a329d465048d270d4227173c058667d648ad990c7d2bfe8903423fa635dd85aafb832ee8198d2d4babc5321c4ded0c32c64
|
||||
AUX auto-set-swap-to-ram.patch 918 SHA256 72650ee8073981afd8786ae8c096b6a793bb4d8f48b12a8ba7e486afcc54669c SHA512 adefd0ecf41d633d033f09d693506b9e241abebb9e729a05ec59db54106a46a4225acfda7590486407792335a4e538125770a8e388366e47e516f1713e9d7c8d WHIRLPOOL 89580cf7b8004b796d59bab4e4d8e92ddc922121120213846e5e97fc070a3106c83832fc05abf3ee90c2490c8d439de05b37c13b26af623a6e5f2c61053a9011
|
||||
AUX bugs-65-66.patch 2317 SHA256 efb4802ef20178a16f98cb39137093de4a9e01790cd7550c50e53c692278481c SHA512 694b720ef2521a0ee512a766f6989bc3c5e8e349456c1176d817776910aa8e7e1180ebd4fd342bb0cb1bd3fb893b68bce84655ab19a2bb0a5e662b2a0b115728 WHIRLPOOL 080fc5b5bd95c818067a6702b7cd8a18a6052aa71b88fd4778f8796d2ec35a02f42270ceb14a4b649358989d9dfcaeb37f9b6ce7aa5d2cbd693720816395b7b0
|
||||
AUX fix-useflags-on-install.diff 455 SHA256 9f0b8542f21d6d06e35f6171d2b6925cc72872fd6724ca8008e5b63f972da796 SHA512 fae7b01232aec28f7f9dfd8536dcd4a8003ac172f686059f316645b8127181398a316bd888f09a4f7e1536e760a82c1a9a00b786ec9e1cd5b777784ab678a76e WHIRLPOOL 9c8afffce5d0f131fc8726c4e0f410ed3c7bb97d15cb7c4eb17dea4ffa5caf8d4afc6ff59a306408239aaa579abfc3af722621da05df47774e8ee3ab0e8d6584
|
||||
AUX more-fixes-for-installer-bugs.patch 4582 SHA256 693ea18c861a941c141b66b4c4d5e3dee112ec3c729bc991708f1b62d74f7784 SHA512 764522f9f3d5ece2b2a432ab200e4ee32b45934c95625b201a85b4a7d32663244e1d1093705eecb01508164c320ea8fce9b8605b034417dffe9a711b666e8033 WHIRLPOOL 2491cfce7c024bdfa94ac46b0282c6ae594c4a1f4c534b88d2c634c97db9f30dc48d8efd7ba3cd6df1f6946a1c0bc193df6e9a05642468ec8d54180db692beed
|
||||
AUX pentoo-installer.desktop 213 SHA256 81e5bdc9639e24a7b727c571f3db4dd76020f4f5bd094b1b78cdb8ddd8da8278 SHA512 d3c8fa5d220d29fdb4fd007283a1095dde2207a68ca1dbde7d72a26affabc45e9d7f9268ff35bbd8ebe7bc50c7d3078c3352c2f9ece6312557dc367a1f497319 WHIRLPOOL aeb3631bce78ff66e0e4297934a323988cea9d5f3d796059c37da4deb1ede0ee4a234cd7e47141f6e57805a9828f20d271c6454b89b62c6b95090a8315363ef4
|
||||
|
|
@ -10,4 +11,5 @@ EBUILD pentoo-installer-0.1.3.2-r2.ebuild 669 SHA256 866cdd5ea28c26a86c32f2474b4
|
|||
EBUILD pentoo-installer-0.1.3.2-r3.ebuild 782 SHA256 ced75233cbfc0f902a5c511ba86b4c0b9eec033fc96949133dcb6bd39e8101ed SHA512 ebd7cd97bd93a50fffb04911e4928267cd144ba0baccee95abe41b5af6e4d1f86f12951662fdbff2c751779bf1b5747d34dfcb2c16a6b872850b54a18e0b8b6d WHIRLPOOL 5d849d78932c42c081a28545a7c568238c0598ecbe6198b35017dfc483f073d918838b270f2146c1e906cc67a36d22259c2382680190750d9be4235ef9811bf3
|
||||
EBUILD pentoo-installer-0.1.3.2-r4.ebuild 840 SHA256 9faed8d20a8ad4e3367ac72363a0262286eff522636a669baee5c0563f55e499 SHA512 e7aeff7496af501aeb9be3d3fd905b991c02fbc627b4991cecbf49e06f669ac04bc8a0ef8593400e5bc99c6bee61222b630328a73c12abcbcfcfb118fe4bbce8 WHIRLPOOL 124305fbdc9b4e6e6f9b67a2d1f8a606ca46f636ed39bdf8f161dbcd4dfc7c49d6c7840410f56101a824e47f8e17b610ae39a511c9ec99c25d72ea6328467582
|
||||
EBUILD pentoo-installer-0.1.3.2-r5.ebuild 889 SHA256 254a2aba2619b324508bef18e36cb761a43ad7bf04311592dc43ef3927630ac9 SHA512 6d738c2691544c00753878ad37ba58b355f74c2d81525f3416c91f732fd8e1d3998721268e9f2237625f929c4598d79ca6329532b08eddc4be20c45d99c7f7ec WHIRLPOOL 7a5ea0b5d993d0a1d2bc26ebd8e60adc43bec6f244aeeff05356f9d4ec885f7bc3d34a35a2bdc9426e80176a6ff6b90c31d0c689fdb255a11baac14f2803a51b
|
||||
EBUILD pentoo-installer-0.1.3.2-r6.ebuild 928 SHA256 bc3c01915648d13e8e2350bb76e44a358e120bcffd5765b570cb3cf6c4380629 SHA512 8e3a3abf36c2d86413e5cef6c968fa77492c6bf6ea895c36aeb5d46d33a19dc62294506cd340925a5162560b117eaf5a67f6429801f91d5d2448998fb4e79b64 WHIRLPOOL cfc0953865aeae856c7a7f188b40d360c7e3851982a689865b431ff324383e330f674b2122d7465c4d7fdc01ac5b891f122613a746bbd52f29326ca96dff038e
|
||||
EBUILD pentoo-installer-0.1.3.2.ebuild 552 SHA256 09347afb7d09592787a88a1d76414155de65129be6abfa29aa476d052b0f4be8 SHA512 2bac023d1a2a35bf5cf0a75219992e47c2f15d39c3d8ba6509d9da29ba415bcd5f0cb48bca916e0f90f66d975317843ec8d05eb176e665f98378f3c20f4dcc30 WHIRLPOOL b265471c8ffeb7e823d4077b850e66dbe606db5ad61a61bbb9cefab62fe8a250c3c74e4aaf0cdf0c62f0642451879e900125e424a4a270dec083353067a8ec14
|
||||
|
|
|
|||
47
pentoo/pentoo-installer/files/bugs-65-66.patch
Normal file
47
pentoo/pentoo-installer/files/bugs-65-66.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
--- setup.orig 2012-11-12 19:54:49.200915436 -0500
|
||||
+++ setup 2012-11-12 21:54:37.686772374 -0500
|
||||
@@ -2,6 +2,8 @@
|
||||
# This script is released under the GNU General Public License 3.0
|
||||
# Check the COPYING file included with this distribution
|
||||
|
||||
+## start by exiting if the user doesn't have enough RAM for the install to work
|
||||
+
|
||||
ANSWER="/tmp/.setup"
|
||||
TITLE="Pentoo Installation"
|
||||
# use the first VT not dedicated to a running console
|
||||
@@ -380,7 +382,7 @@
|
||||
done
|
||||
DISC_SIZE=$(($DISC_SIZE-$BOOT_PART_SIZE))
|
||||
while [ "$SWAP_PART_SET" = "" ]; do
|
||||
- SUGGESTED_SWAP_SIZE=`awk '/MemTotal/ {printf( "%.2f\n", int ( $2 / 1024 ) + 1)}' /proc/meminfo`
|
||||
+ SUGGESTED_SWAP_SIZE=$(awk '/MemTotal/ {printf( "%.0f\n", int ( $2 / 1024 ) + 1)}' /proc/meminfo)
|
||||
DIALOG --inputbox "Enter the size (MiB) of your swap partition. Minimum value is > 0.\n\nDisk space left: $DISC_SIZE MiB" 10 65 "${SUGGESTED_SWAP_SIZE}" 2>$ANSWER || return 1
|
||||
SWAP_PART_SIZE=$(cat $ANSWER)
|
||||
if [ "$SWAP_PART_SIZE" = "" -o "$SWAP_PART_SIZE" -le "0" ]; then
|
||||
@@ -654,11 +656,12 @@
|
||||
rsync -av /etc/* ${DESTDIR}/etc/ 2>&1 >>$LOG
|
||||
rsync -av /root/* ${DESTDIR}/root/ 2>&1 >>$LOG
|
||||
rsync -av /usr/portage ${DESTDIR}/usr/ >>$LOG
|
||||
+ rsync -av /var/lib/layman/pentoo ${DESTDIR}/var/lib/layman/ >>$LOG
|
||||
if [ $? -ne 0 ]; then
|
||||
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
|
||||
+ sed -i 's#aufs bindist livecd##' ${DESTDIR}/etc/portage/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
|
||||
@@ -1003,6 +1006,12 @@
|
||||
#####################
|
||||
## begin execution ##
|
||||
|
||||
+RAMSIZE=$(awk '/MemTotal/ {printf( "%.0f\n", int ( $2 / 1024 ) + 1)}' /proc/meminfo)
|
||||
+if [ "$RAMSIZE" -le "1500" ]; then
|
||||
+ DIALOG --msgbox "The Pentoo Installer requires a minimum of 1.5GB of RAM to run. Failing safe." 0 0
|
||||
+ exit 1
|
||||
+fi
|
||||
+
|
||||
DIALOG --msgbox "Welcome to the Pentoo Installation program. The install \
|
||||
process is fairly straightforward, and you should run through the options in \
|
||||
the order they are presented. If you are unfamiliar with partitioning/making \
|
||||
37
pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r6.ebuild
Normal file
37
pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r6.ebuild
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
# 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
|
||||
|| ( <sys-boot/grub-1
|
||||
<sys-boot/grub-static-1 )
|
||||
net-misc/rsync"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/8000-ext4.patch
|
||||
epatch "${FILESDIR}"/fix-useflags-on-install.diff
|
||||
epatch "${FILESDIR}"/more-fixes-for-installer-bugs.patch
|
||||
epatch "${FILESDIR}"/auto-set-swap-to-ram.patch
|
||||
epatch "${FILESDIR}"/bugs-65-66.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newsbin setup $PN
|
||||
domenu ${FILESDIR}/pentoo-installer.desktop
|
||||
insinto /root/Desktop/
|
||||
doins ${FILESDIR}/pentoo-installer.desktop
|
||||
}
|
||||
Loading…
Reference in a new issue