From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QsCHa-0005kp-Iw for garchives@archives.gentoo.org; Sat, 13 Aug 2011 11:21:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22AE821C07E; Sat, 13 Aug 2011 11:21:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D2D4D21C07E for ; Sat, 13 Aug 2011 11:21:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF64E1B4024 for ; Sat, 13 Aug 2011 11:21:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 60FDE80040 for ; Sat, 13 Aug 2011 11:21:28 +0000 (UTC) From: "Wim Muskee" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wim Muskee" Message-ID: <3b16065f46531df6eebe8d4d4e887979b2d326ef.wim@gentoo> Subject: [gentoo-commits] proj/ltsp:master commit in: sys-apps/quickstart/, sys-apps/quickstart/files/ X-VCS-Repository: proj/ltsp X-VCS-Files: sys-apps/quickstart/ChangeLog sys-apps/quickstart/Manifest sys-apps/quickstart/files/quickstart-20101128-installsteps.patch sys-apps/quickstart/files/quickstart-20101128-quickstart.patch sys-apps/quickstart/quickstart-20101128-r2.ebuild sys-apps/quickstart/quickstart-9999.ebuild X-VCS-Directories: sys-apps/quickstart/ sys-apps/quickstart/files/ X-VCS-Committer: wim X-VCS-Committer-Name: Wim Muskee X-VCS-Revision: 3b16065f46531df6eebe8d4d4e887979b2d326ef Date: Sat, 13 Aug 2011 11:21:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1f18d2a79cf6b5ae5437f27202b45b30 commit: 3b16065f46531df6eebe8d4d4e887979b2d326ef Author: Wim Muskee gmail com> AuthorDate: Sat Aug 13 11:20:51 2011 +0000 Commit: Wim Muskee gmail com> CommitDate: Sat Aug 13 11:20:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/ltsp.git;a=3D= commit;h=3D3b16065f quickstart: Patch for splitting up to separate build_kernel and build_ini= tramfs. --- sys-apps/quickstart/ChangeLog | 5 ++++ sys-apps/quickstart/Manifest | 6 +++- .../files/quickstart-20101128-installsteps.patch | 23 ++++++++++++++= ++++++ .../files/quickstart-20101128-quickstart.patch | 10 ++++++++ ...t-9999.ebuild =3D> quickstart-20101128-r2.ebuild} | 13 +++++++++- 5 files changed, 53 insertions(+), 4 deletions(-) diff --git a/sys-apps/quickstart/ChangeLog b/sys-apps/quickstart/ChangeLo= g index 135e902..2656ae1 100644 --- a/sys-apps/quickstart/ChangeLog +++ b/sys-apps/quickstart/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*quickstart-20101128-r2 (13 08 2011) + + 13 08 2011; Wim Muskee wimmuskee@gmail.com quickstart-20101128-r2.ebui= ld: + Patch for splitting up to separate build_kernel and build_initramfs. + *quickstart-20101128-r1 (14 04 2011) =20 14 04 2011; Wim Muskee wimmuskee@gmail.com quickstart-20101128-r1.ebui= ld: diff --git a/sys-apps/quickstart/Manifest b/sys-apps/quickstart/Manifest index 71b326f..eeed0fd 100644 --- a/sys-apps/quickstart/Manifest +++ b/sys-apps/quickstart/Manifest @@ -1,8 +1,10 @@ AUX quickstart-20101128-fetcher.patch 554 RMD160 fd77c846f60ef85571a6bde= 386bfd19e850a4ee7 SHA1 00f12f1aa14782ddd4a90960b7581bd81cfa49c7 SHA256 22= 4c02972cfd23e04ca602a9d1e1bb6c9213d697827c98d434405c904e413e89 +AUX quickstart-20101128-installsteps.patch 1046 RMD160 efff99ca6e0e5de9d= a5539f6fc2956498750d7fe SHA1 9c6b498422a304a5110b2ddb58bc39a7105468e2 SHA= 256 744cc8b28d9632ac29105c236590ad48af1cbb67b0b614bafed8ebf750235caa +AUX quickstart-20101128-quickstart.patch 492 RMD160 8984f38ea7d0619e8964= 924fe23a764b401a7818 SHA1 8c38f5b4efd470cd74a1d005de4395b2cfabed39 SHA256= f4cfa7b2d9f1f45bce83d20ed16e8b4b18f41a6ad7cb58258cbf957dcb177003 DIST quickstart-0.6.tar.bz2 13411 RMD160 2141427ed32ba390bbf0d042fee3310= 092632f72 SHA1 3f293eb50762a48aae369dff69a6eb02a3c97222 SHA256 f2a03ba143= 3b429ad043660808c4efe067662d95580731dcbe4722a888a4f065 EBUILD quickstart-0.6.ebuild 676 RMD160 2f8965ec482a1d003ae816a8cba39440= 9004f062 SHA1 7e4fa90ea58240626c98628cac81a49da5769e0b SHA256 ec81ba58806= 99567553f3f938e95f884f2757134308f59a5b55433ac1302f472 EBUILD quickstart-20101128-r1.ebuild 835 RMD160 322b314846fb05ed1c60f4cd= 2f57f191a6ddb359 SHA1 3bc77290f472666451f14d5f898d25cc75209cd2 SHA256 bb6= 737bf7f9536b507049066e7cc9c9d37bd78902360385313d93dd5ee9aa242 +EBUILD quickstart-20101128-r2.ebuild 925 RMD160 a20b9cffd08caf883ab6688c= d036791c744ec364 SHA1 ecdb60bffa8a18d04653fb0cc2053c89bd713949 SHA256 ee0= 796782d8929bf834a3faabd88695d312b8e04fe065e01b6cff6a044a1e7a6 EBUILD quickstart-20101128.ebuild 727 RMD160 dc9a811a6c6b597421dc314d208= 5339f00065560 SHA1 51f9b8b3d9e9244ddab0be786fd79873fdcc75cc SHA256 bf1f0c= 7cba1d027ce602413dbf21cc0fe7c40d7feb48b6b0661bb398f67d0e2a -EBUILD quickstart-9999.ebuild 661 RMD160 4aff706ca68887f69a2998b57829113= 6d3fc97a0 SHA1 9f48616c6a6a388ef4b6942fa8766ed7d0caf117 SHA256 949cd39ab9= 032a0e9dec8adfe99ebe754aca4457771faac6a5951a580af34ce9 -MISC ChangeLog 1127 RMD160 6e5b2898230d69f119231c62a1f4d47da5fc3f8f SHA1= 5c5a88e7c05b74967646f2385460bcafb554ddf8 SHA256 19645c80bac6e255345f3725= aac812569589f0e01115cffeb5fb7b4d3f2b5fc7 +MISC ChangeLog 1313 RMD160 e7f7d1a07f3fa1e039e007a8471f9fcc52f31f4b SHA1= 4c4e35c848cde0a328f433b04530b10225815b52 SHA256 f956ed590f2421cae8e8fbe5= 39665d8dc4fce1d354bfe3eb3a8e41cce204323c MISC metadata.xml 304 RMD160 84ae1f69cc8ecd59f9916319b6d55e4772370296 SH= A1 1e314f501ad304a7316fc362fc52c004e68a3220 SHA256 3d4eb5270a5b625a4680fc= 14d938e590977510a29c953dc487bc559c09bbf715 diff --git a/sys-apps/quickstart/files/quickstart-20101128-installsteps.p= atch b/sys-apps/quickstart/files/quickstart-20101128-installsteps.patch new file mode 100644 index 0000000..e80628e --- /dev/null +++ b/sys-apps/quickstart/files/quickstart-20101128-installsteps.patch @@ -0,0 +1,23 @@ +--- modules/install_steps.sh.orig 2010-12-08 21:14:27.209878112 +0100 ++++ modules/install_steps.sh 2010-12-08 21:22:35.806026385 +0100 +@@ -213,11 +213,19 @@ + fetch "${kernel_config_uri}" "${chroot_dir}/tmp/kconfig" || die "= could not fetch kernel config" + spawn_chroot "genkernel --kernel-config=3D/tmp/kconfig ${genkerne= l_opts} kernel" || die "could not build custom kernel" + else +- spawn_chroot "genkernel ${genkernel_opts} all" || die "could not = build generic kernel" ++ spawn_chroot "genkernel ${genkernel_opts} kernel" || die "could n= ot build generic kernel" + fi + fi + } +=20 ++build_initramfs() { ++ # genkernel could be merged already by build_kernel, check to make su= re ++ if [ -z $(command -v genkernel) ]; then ++ spawn_chroot "emerge genkernel" || die "could not emerge genkernel" ++ fi ++ spawn_chroot "genkernel initramfs" || die "could not build initramfs" ++} ++ + install_logging_daemon() { + if [ "${logging_daemon}" =3D "none" ]; then + debug install_logging_daemon "logging_daemon is 'none'...skipping" diff --git a/sys-apps/quickstart/files/quickstart-20101128-quickstart.pat= ch b/sys-apps/quickstart/files/quickstart-20101128-quickstart.patch new file mode 100644 index 0000000..2c90f93 --- /dev/null +++ b/sys-apps/quickstart/files/quickstart-20101128-quickstart.patch @@ -0,0 +1,10 @@ +--- quickstart.orig 2010-12-08 21:12:36.693127505 +0100 ++++ quickstart 2010-12-08 21:13:05.176043770 +0100 +@@ -157,6 +157,7 @@ + runstep set_timezone "Setting timezone" + runstep setup_fstab "Setting up /etc/fstab" + runstep build_kernel "Building kernel" ++ runstep build_initramfs "Building initramfs" + runstep install_logging_daemon "Installing logging daemon" + runstep install_cron_daemon "Installing cron daemon" + runstep setup_network_post "Setting up post-install networking" diff --git a/sys-apps/quickstart/quickstart-9999.ebuild b/sys-apps/quicks= tart/quickstart-20101128-r2.ebuild similarity index 68% rename from sys-apps/quickstart/quickstart-9999.ebuild rename to sys-apps/quickstart/quickstart-20101128-r2.ebuild index 219389c..bdceefc 100644 --- a/sys-apps/quickstart/quickstart-9999.ebuild +++ b/sys-apps/quickstart/quickstart-20101128-r2.ebuild @@ -2,16 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 +EAPI=3D"2" inherit eutils git =20 EGIT_REPO_URI=3D"git://git.agaffney.org/quickstart.git" +EGIT_COMMIT=3D"4ce0bbd11acff6c3b09634b1b46a0887e966f7a3" =20 DESCRIPTION=3D"Quickstart automated installer" HOMEPAGE=3D"http://agaffney.org/quickstart.php" LICENSE=3D"GPL-2" SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"doc" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"doc tftp" +RDEPEND=3D"tftp? ( net-misc/curl )" + +src_prepare() { + epatch "${FILESDIR}/${P}-fetcher.patch" + epatch "${FILESDIR}/${P}-quickstart.patch" + epatch "${FILESDIR}/${P}-installsteps.patch" +} =20 src_install() { qsdir=3D/usr/share/quickstart