catalyst.git
16 years agoAdded a small patch from Tim Yamin <tim.yamin@zonbu.com> to fix make.conf parsing...
Chris Gianelloni [Sun, 6 Apr 2008 15:57:01 +0000 (15:57 +0000)]
Added a small patch from Tim Yamin <tim.yamin@zonbu.com> to fix make.conf parsing of variables with numbers in them.  This is catalyst 2.0.6_pre17 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1389 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange back to using sys-apps/baselayout. We'll need to come up with a better perman...
Chris Gianelloni [Sun, 6 Apr 2008 15:43:24 +0000 (15:43 +0000)]
Change back to using sys-apps/baselayout.  We'll need to come up with a better permanent solution now that virtual/baselayout is no more.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1388 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoUpdate the grub cdtar for grub-0.97-r5 and memtest86+-2.01
Andrew Gaffney [Sat, 5 Apr 2008 02:27:03 +0000 (02:27 +0000)]
Update the grub cdtar for grub-0.97-r5 and memtest86+-2.01

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1387 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoUse menu.lst for grub config, since 0.96 and higher won't use grub.conf for eltorito
Andrew Gaffney [Sat, 5 Apr 2008 02:17:56 +0000 (02:17 +0000)]
Use menu.lst for grub config, since 0.96 and higher won't use grub.conf for eltorito

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1386 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded TODO. Changed create_handbook_icon call to only be called if /docs/handbook...
Chris Gianelloni [Fri, 4 Apr 2008 00:53:17 +0000 (00:53 +0000)]
Added TODO.  Changed create_handbook_icon call to only be called if /docs/handbook/index.html exists on the disk or in livecd/overlay.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1385 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRun sed on KERNELVERSION to escape the slashes so we can use it in another sed
Andrew Gaffney [Sun, 30 Mar 2008 22:27:49 +0000 (22:27 +0000)]
Run sed on KERNELVERSION to escape the slashes so we can use it in another sed

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1384 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoModify test to run if package.provided exists instead of if it doesn't
Andrew Gaffney [Sun, 30 Mar 2008 21:47:23 +0000 (21:47 +0000)]
Modify test to run if package.provided exists instead of if it doesn't
Run sed on the correct file

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1383 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded --noreplace to setup_myfeatures merges so we don't blow away any packages which...
Chris Gianelloni [Thu, 27 Mar 2008 04:58:57 +0000 (04:58 +0000)]
Added --noreplace to setup_myfeatures merges so we don't blow away any packages which are already installed with the proper USE flags for the given target.  This is for bug #211654.  This is catalyst 2.0.6_pre16 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1382 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded dosshd, passwd=, and nonfs to README.txt, since they were missing.
Chris Gianelloni [Thu, 27 Mar 2008 04:51:24 +0000 (04:51 +0000)]
Added dosshd, passwd=, and nonfs to README.txt, since they were missing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1381 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded mdraid for baselayout-2 users.
Chris Gianelloni [Thu, 27 Mar 2008 03:59:53 +0000 (03:59 +0000)]
Added mdraid for baselayout-2 users.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1380 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoClean up package.provided after the kernel build
Andrew Gaffney [Fri, 14 Mar 2008 03:08:19 +0000 (03:08 +0000)]
Clean up package.provided after the kernel build

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1379 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoIt helps if I put things in the correct order so they'll actually execute, rather...
Chris Gianelloni [Thu, 13 Mar 2008 18:20:27 +0000 (18:20 +0000)]
It helps if I put things in the correct order so they'll actually execute, rather than getting a nice error from emerge.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1378 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange upgrade to update.
Chris Gianelloni [Thu, 13 Mar 2008 16:10:20 +0000 (16:10 +0000)]
Change upgrade to update.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1377 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdd back in the package.provided code that *should* skip the kernel sources merge...
Chris Gianelloni [Thu, 13 Mar 2008 14:48:19 +0000 (14:48 +0000)]
Add back in the package.provided code that *should* skip the kernel sources merge for call back and subsequent runs.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1376 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe don't really need to use binary packages for the kernel sources, since it doesn...
Chris Gianelloni [Thu, 13 Mar 2008 14:41:04 +0000 (14:41 +0000)]
We don't really need to use binary packages for the kernel sources, since it doesn't gain us anything.  Also, we need to delete the /usr/src/linux symlink when we're not using kerncache.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1375 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemove 'symlink' from USE, since it's not needed and screws up kerncache
Andrew Gaffney [Thu, 13 Mar 2008 05:18:32 +0000 (05:18 +0000)]
Remove 'symlink' from USE, since it's not needed and screws up kerncache

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1374 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoOK, we run our find outside the chroot, so we don't want to use absolute paths unless...
Chris Gianelloni [Thu, 13 Mar 2008 01:51:51 +0000 (01:51 +0000)]
OK, we run our find outside the chroot, so we don't want to use absolute paths unless we want to wipe out *.a *.la *.pyc and *.pyo from our host system.  Oops.  Due to this bug, I'm making this 2.0.6_pre15 for testing immediately.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1373 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoCleanup the clean section for stage1 and add an updated clean section for livecd...
Chris Gianelloni [Thu, 13 Mar 2008 00:41:16 +0000 (00:41 +0000)]
Cleanup the clean section for stage1 and add an updated clean section for livecd-stage2 when we're a minimal, universal, or game CD.  This is 2.0.6_pre14 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1372 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe should be using --newuse when merging our packages in callback.
Chris Gianelloni [Tue, 11 Mar 2008 20:32:56 +0000 (20:32 +0000)]
We should be using --newuse when merging our packages in callback.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1371 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe should only use --noreplace when building a pkgset, everything else should be...
Chris Gianelloni [Tue, 11 Mar 2008 17:41:45 +0000 (17:41 +0000)]
We should only use --noreplace when building a pkgset, everything else should be a fetch.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1370 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoApply additional patches from bug 207862 for CONTENTS generation
Andrew Gaffney [Tue, 11 Mar 2008 02:59:15 +0000 (02:59 +0000)]
Apply additional patches from bug 207862 for CONTENTS generation

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1369 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoCall setup_myemergeopts after changing clst_FETCH
Andrew Gaffney [Mon, 10 Mar 2008 20:50:24 +0000 (20:50 +0000)]
Call setup_myemergeopts after changing clst_FETCH

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1368 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemove a bit of unnecessary code
Andrew Gaffney [Mon, 10 Mar 2008 18:42:55 +0000 (18:42 +0000)]
Remove a bit of unnecessary code

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1367 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFix some spacing on the -* warning, revert Andrew's last change, since it didn't...
Chris Gianelloni [Mon, 10 Mar 2008 18:16:17 +0000 (18:16 +0000)]
Fix some spacing on the -* warning, revert Andrew's last change, since it didn't do anything, and clean up the GRP chroot code so it works smarter and set clst_FETCH when clst_grp_type is something other than pkgset.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1366 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoDon't set --usepkg and --buildpkg when fetching
Andrew Gaffney [Mon, 10 Mar 2008 18:06:59 +0000 (18:06 +0000)]
Don't set --usepkg and --buildpkg when fetching

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1365 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange the warning thrown into make.conf when someone uses LDFLAGS so it is less...
Chris Gianelloni [Fri, 7 Mar 2008 18:23:21 +0000 (18:23 +0000)]
Change the warning thrown into make.conf when someone uses LDFLAGS so it is less confusing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1364 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoMerged ChangeLog.old and ChangeLog and added a note for myself to fix up the boot...
Chris Gianelloni [Wed, 5 Mar 2008 22:03:42 +0000 (22:03 +0000)]
Merged ChangeLog.old and ChangeLog and added a note for myself to fix up the boot/kernel/${kname}/config copying code in generic_stage_target.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1363 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoMake sure we don't give genkernel a --kernel-config if it isn't set in the spec.
Chris Gianelloni [Wed, 5 Mar 2008 21:44:28 +0000 (21:44 +0000)]
Make sure we don't give genkernel a --kernel-config if it isn't set in the spec.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1362 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChanged boot/kernel/${kname}/config and boot/kernel/${kname}/sources to be valid...
Chris Gianelloni [Wed, 5 Mar 2008 21:34:53 +0000 (21:34 +0000)]
Changed boot/kernel/${kname}/config and boot/kernel/${kname}/sources to be valid, rather than required, changed clst_ksource to default to virtual/linux-sources if boot/kernel/${kname}/sources is unset, moved removal of USE to after the kernel build so the modules get the correct USE, and did some minor cleanup on pre-kmerge.  This is 2.0.6_pre13 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1361 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe should run the default functions for kmerge.sh, too.
Chris Gianelloni [Wed, 5 Mar 2008 20:35:49 +0000 (20:35 +0000)]
We should run the default functions for kmerge.sh, too.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1360 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoUpdated aboot cdtar with a newer version to support newer kernels.
Chris Gianelloni [Wed, 5 Mar 2008 20:17:18 +0000 (20:17 +0000)]
Updated aboot cdtar with a newer version to support newer kernels.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1359 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoUpdated make_destpath so it writes out to make.conf as well as exporting ROOT to...
Chris Gianelloni [Wed, 5 Mar 2008 18:45:46 +0000 (18:45 +0000)]
Updated make_destpath so it writes out to make.conf as well as exporting ROOT to the environment, added a make_destpath call to cleanup_stages, and adding make_destpath /tmp/stage1root to stage1.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1358 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoUpdated README a bit and rolling 2.0.6_pre12 for testing.
Chris Gianelloni [Wed, 5 Mar 2008 17:36:22 +0000 (17:36 +0000)]
Updated README a bit and rolling 2.0.6_pre12 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1357 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemoved any further checks for clst_fstype and making sure everybody is using ${mkiso...
Chris Gianelloni [Wed, 5 Mar 2008 17:29:47 +0000 (17:29 +0000)]
Removed any further checks for clst_fstype and making sure everybody is using ${mkisofs_zisofs_opts}.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1356 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoThe default theme for GNOME is now Clearlooks, so we can remove the theme code, but...
Chris Gianelloni [Wed, 5 Mar 2008 17:03:09 +0000 (17:03 +0000)]
The default theme for GNOME is now Clearlooks, so we can remove the theme code, but we still want to set the font size.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1355 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe need to put quotes around ${user_comment} or useradd gets confused.
Chris Gianelloni [Wed, 5 Mar 2008 16:59:33 +0000 (16:59 +0000)]
We need to put quotes around ${user_comment} or useradd gets confused.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1354 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChanged make_destpath to write out ROOT to make.conf, rather than (ab)using the envir...
Chris Gianelloni [Wed, 5 Mar 2008 16:54:45 +0000 (16:54 +0000)]
Changed make_destpath to write out ROOT to make.conf, rather than (ab)using the environment.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1353 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded an additional make_destpath call to kmerge.sh so it'll export ROOT=/ prior...
Chris Gianelloni [Wed, 5 Mar 2008 16:12:29 +0000 (16:12 +0000)]
Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/ prior to running genkernel.  This is catalyst 2.0.6_pre11 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1352 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoBash fscking sucks, so we have to compromise on this code reduction solution a bit...
Andrew Gaffney [Tue, 4 Mar 2008 02:37:23 +0000 (02:37 +0000)]
Bash fscking sucks, so we have to compromise on this code reduction solution a bit. It's still far better than it was

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1351 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoDon't escape quotes when actually running the command
Andrew Gaffney [Mon, 3 Mar 2008 04:08:25 +0000 (04:08 +0000)]
Don't escape quotes when actually running the command

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1350 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoPass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT
Andrew Gaffney [Sun, 2 Mar 2008 05:25:58 +0000 (05:25 +0000)]
Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1349 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoUse -L instead of -l in test for symlink
Andrew Gaffney [Fri, 29 Feb 2008 22:43:58 +0000 (22:43 +0000)]
Use -L instead of -l in test for symlink

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1348 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemove code for gcc-config/binutils-config since it should be getting done in the...
Chris Gianelloni [Fri, 29 Feb 2008 20:34:06 +0000 (20:34 +0000)]
Remove code for gcc-config/binutils-config since it should be getting done in the preclean script, anyway.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1347 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoI missed one place where HOSTUSE was being used incorrectly.
Chris Gianelloni [Fri, 29 Feb 2008 17:15:14 +0000 (17:15 +0000)]
I missed one place where HOSTUSE was being used incorrectly.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1346 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoEscape the correct quote
Andrew Gaffney [Fri, 29 Feb 2008 16:33:30 +0000 (16:33 +0000)]
Escape the correct quote

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1345 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange remaining instances of run_emerge to run_merge
Andrew Gaffney [Fri, 29 Feb 2008 15:57:27 +0000 (15:57 +0000)]
Change remaining instances of run_emerge to run_merge

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1344 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match, no matter...
Chris Gianelloni [Thu, 28 Feb 2008 17:59:42 +0000 (17:59 +0000)]
Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match, no matter what.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1343 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoLet's change our splash checking to a global check so it only needs to be done once...
Chris Gianelloni [Thu, 28 Feb 2008 17:33:29 +0000 (17:33 +0000)]
Let's change our splash checking to a global check so it only needs to be done once.  This makes much more sense than having all of those if ... else ... statements.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1342 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFix our USE invocation here so things work as expected.
Chris Gianelloni [Thu, 28 Feb 2008 17:24:31 +0000 (17:24 +0000)]
Fix our USE invocation here so things work as expected.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1341 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoForce-enable livecd/users for livecd/type gentoo-release-livecd and gentoo-gamecd.
Chris Gianelloni [Thu, 28 Feb 2008 17:10:37 +0000 (17:10 +0000)]
Force-enable livecd/users for livecd/type gentoo-release-livecd and gentoo-gamecd.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1340 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemove /etc/conf.d/domainname code, since /etc/conf.d/domainname is no longer used.
Chris Gianelloni [Thu, 28 Feb 2008 17:00:01 +0000 (17:00 +0000)]
Remove /etc/conf.d/domainname code, since /etc/conf.d/domainname is no longer used.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1339 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFixing the snapshot copying so it will only copy the correct snapshot for people...
Chris Gianelloni [Thu, 28 Feb 2008 16:32:57 +0000 (16:32 +0000)]
Fixing the snapshot copying so it will only copy the correct snapshot for people who don't know how to properly use wget.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1338 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFix HOSTUSE invocation on stage1, since we use -* at the beginning to disable profile...
Chris Gianelloni [Thu, 28 Feb 2008 04:47:29 +0000 (04:47 +0000)]
Fix HOSTUSE invocation on stage1, since we use -* at the beginning to disable profile USE.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1337 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoOK, we have to escape our quotes, rather than use single quotes, or we don't evaluate...
Chris Gianelloni [Thu, 28 Feb 2008 04:44:16 +0000 (04:44 +0000)]
OK, we have to escape our quotes, rather than use single quotes, or we don't evaluate the variables properly.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1336 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFixing echo/sed for make.conf writing.
Chris Gianelloni [Thu, 28 Feb 2008 04:33:14 +0000 (04:33 +0000)]
Fixing echo/sed for make.conf writing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1335 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRather than using the environment, we write out our USE to make.conf, then remove...
Chris Gianelloni [Thu, 28 Feb 2008 04:26:14 +0000 (04:26 +0000)]
Rather than using the environment, we write out our USE to make.conf, then remove it once we're done.  We don't bother adding clst_HOSTUSE, since it'll be written to make.conf, already.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1334 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChanging run_emerge to run_merge, changing both setup_portage and setup_myfeatures...
Chris Gianelloni [Thu, 28 Feb 2008 03:59:26 +0000 (03:59 +0000)]
Changing run_emerge to run_merge, changing both setup_portage and setup_myfeatures to add any USE changes to make.conf prior to merge, then removing the settings added, rather than (ab)using the environment.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1333 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRearrange some of the functions in chroot-functions.sh in preparation for some upcomi...
Chris Gianelloni [Thu, 28 Feb 2008 03:41:54 +0000 (03:41 +0000)]
Rearrange some of the functions in chroot-functions.sh in preparation for some upcoming changes and rename setup_portage to setup_pkgmgr.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1332 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemoving an extra env-update call from stage1's preclean.
Chris Gianelloni [Thu, 28 Feb 2008 03:25:59 +0000 (03:25 +0000)]
Removing an extra env-update call from stage1's preclean.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1331 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoSet default for grub to 0 and updated cdtar so we don't ship a half-broken help.msg...
Chris Gianelloni [Thu, 28 Feb 2008 03:16:24 +0000 (03:16 +0000)]
Set default for grub to 0 and updated cdtar so we don't ship a half-broken help.msg which we didn't even use.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1330 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoDon't write out out 'default 1' line when creating grub.conf, since the 'help' entry...
Andrew Gaffney [Thu, 28 Feb 2008 03:01:36 +0000 (03:01 +0000)]
Don't write out out 'default 1' line when creating grub.conf, since the 'help' entry is now at the bottom, and we want grub to default to the first entry

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1329 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemoved checks on livecd/splash_type, since we only support one type, removed remaini...
Chris Gianelloni [Wed, 27 Feb 2008 16:31:25 +0000 (16:31 +0000)]
Removed checks on livecd/splash_type, since we only support one type, removed remaining bootsplash code from bootloader-setup.sh, added automatic copying of splash.xpm.gz for Gentoo releases when using grub, and moved grub help to bottom of titles.  This is catalyst 2.0.6_pre10 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1328 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoLet's automatically copy in the snapshot if livecd/type is gentoo-release-livecd.
Chris Gianelloni [Wed, 27 Feb 2008 01:46:33 +0000 (01:46 +0000)]
Let's automatically copy in the snapshot if livecd/type is gentoo-release-livecd.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1327 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFix leading whitespace in empty() so it's only executed if there's something to execu...
Andrew Gaffney [Tue, 26 Feb 2008 03:11:14 +0000 (03:11 +0000)]
Fix leading whitespace in empty() so it's only executed if there's something to execute it on. Thanks to Justin Bronder <jsbronder@gentoo.org> in bug 211410 for pointing this out

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1326 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agolet's change the right timeout this time
Andrew Gaffney [Thu, 21 Feb 2008 21:53:36 +0000 (21:53 +0000)]
let's change the right timeout this time

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1325 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoQuote baselayout package atom
Andrew Gaffney [Thu, 21 Feb 2008 17:12:43 +0000 (17:12 +0000)]
Quote baselayout package atom

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1324 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoOK, we shouldn't use which to find env-update, since /usr/sbin isn't in the PATH...
Chris Gianelloni [Thu, 21 Feb 2008 17:04:45 +0000 (17:04 +0000)]
OK, we shouldn't use which to find env-update, since /usr/sbin isn't in the PATH by default.  Instead, simply check if it exists.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1323 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemove temporary package listing code, since --verbose is forced on with --debug
Andrew Gaffney [Thu, 21 Feb 2008 16:01:41 +0000 (16:01 +0000)]
Remove temporary package listing code, since --verbose is forced on with --debug

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1322 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoForce-enable --verbose when using --debug
Andrew Gaffney [Thu, 21 Feb 2008 15:34:14 +0000 (15:34 +0000)]
Force-enable --verbose when using --debug

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1321 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChanging modules-update to update-modules to quiet a warning and keep us from having...
Chris Gianelloni [Thu, 21 Feb 2008 08:30:26 +0000 (08:30 +0000)]
Changing modules-update to update-modules to quiet a warning and keep us from having it get removed out from under us.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1320 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdding a note to myself for better debug and moving run_default_funcs to the bottom...
Chris Gianelloni [Thu, 21 Feb 2008 06:33:29 +0000 (06:33 +0000)]
Adding a note to myself for better debug and moving run_default_funcs to the bottom of the script so it gets executed.  Since this can otherwise break pkgcache, I'm making this catalyst 2.0.6_pre9 for testing, immediately.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1319 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoMoved creating of stage1 package list to the beginning of stage1-chroot.sh so we...
Chris Gianelloni [Thu, 21 Feb 2008 02:03:30 +0000 (02:03 +0000)]
Moved creating of stage1 package list to the beginning of stage1-chroot.sh so we can get the output with --debug, added --newuse to the options for stage1, as we should always rebuild any package where the USE has changed, removed removal of portage logs from stage2-chroot.sh since it is being done by cleanup_stages, moved world removal in cleanup_stages into a check for stages 1 through 3, made update_env_settings check for the existence of env-update before running it since we now run update_env_settings by default everywhere chroot-functions.sh is sourced, and added a section to show_debug to list the packages, since we don't yet force-enable verbose with debug.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1318 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoSince my python sucks and I don't feel like troubleshooting it at the moment, comment...
Chris Gianelloni [Wed, 20 Feb 2008 20:24:08 +0000 (20:24 +0000)]
Since my python sucks and I don't feel like troubleshooting it at the moment, commenting out all the DEBUG code in catalyst_lock and rolling up 2.0.6_pre8 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1317 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded some extra debug output to catalyst_lock.py and added Stuart Longland to AUTHOR...
Chris Gianelloni [Wed, 20 Feb 2008 19:46:56 +0000 (19:46 +0000)]
Added some extra debug output to catalyst_lock.py and added Stuart Longland to AUTHORS.  This is catalyst 2.0.6_pre7 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1316 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agochange 'is' to == because python is grumpy
Andrew Gaffney [Wed, 20 Feb 2008 16:51:26 +0000 (16:51 +0000)]
change 'is' to == because python is grumpy

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1315 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemoving support for bootsplash, since it hasn't been in a supported kernel in a...
Chris Gianelloni [Wed, 20 Feb 2008 16:50:42 +0000 (16:50 +0000)]
Removing support for bootsplash, since it hasn't been in a supported kernel in a couple years and isn't accepted upstream.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1314 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFix up the sed for genkernel so it works on versions both before and after 3.4.10_pre...
Chris Gianelloni [Wed, 20 Feb 2008 16:23:58 +0000 (16:23 +0000)]
Fix up the sed for genkernel so it works on versions both before and after 3.4.10_pre2 and fixing a couple places where my sed for the . -> source change was a bit too aggressive.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1313 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange grub timeout to 15 seconds instead of 150
Andrew Gaffney [Wed, 20 Feb 2008 15:40:50 +0000 (15:40 +0000)]
Change grub timeout to 15 seconds instead of 150

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1312 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoComment out sed on genkernel executable as it appears to do nothing these days
Andrew Gaffney [Wed, 20 Feb 2008 15:22:23 +0000 (15:22 +0000)]
Comment out sed on genkernel executable as it appears to do nothing these days

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1311 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoOnly call find on libdirs that actually exist. Thanks to Kristoffer <krek6597@student...
Andrew Gaffney [Wed, 20 Feb 2008 15:18:08 +0000 (15:18 +0000)]
Only call find on libdirs that actually exist. Thanks to Kristoffer <krek6597@student.uu.se> in bug 210807

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1310 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdd warning about -* in foo/use in the spec
Andrew Gaffney [Wed, 20 Feb 2008 03:36:18 +0000 (03:36 +0000)]
Add warning about -* in foo/use in the spec

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1309 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChange all . to source.
Chris Gianelloni [Wed, 20 Feb 2008 02:01:17 +0000 (02:01 +0000)]
Change all . to source.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1308 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded a cleanup_stages function and added it to the appropriate places.
Chris Gianelloni [Wed, 20 Feb 2008 02:00:07 +0000 (02:00 +0000)]
Added a cleanup_stages function and added it to the appropriate places.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1307 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoRemoving any functions that we now call by default when we source chroot-functions...
Chris Gianelloni [Wed, 20 Feb 2008 01:45:39 +0000 (01:45 +0000)]
Removing any functions that we now call by default when we source chroot-functions.sh by default.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1306 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoClean up the debug code that I've added to stage1, move it to chroot_functions.sh...
Chris Gianelloni [Wed, 20 Feb 2008 01:27:45 +0000 (01:27 +0000)]
Clean up the debug code that I've added to stage1, move it to chroot_functions.sh, and call it from all of our main targets.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1305 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWow. I need to make sure that we actually comment comments in make.conf or we end...
Chris Gianelloni [Thu, 14 Feb 2008 18:57:09 +0000 (18:57 +0000)]
Wow.  I need to make sure that we actually comment comments in make.conf or we end up with a failed build.  Thanks to Christian Heim <phreak@gentoo.org> for pointing it out.  This is catalyst 2.0.6_pre6 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1304 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe need to be sure we clear out /var/log/portage/elog as well as /var/log/emerge...
Chris Gianelloni [Thu, 14 Feb 2008 18:30:05 +0000 (18:30 +0000)]
We need to be sure we clear out /var/log/portage/elog as well as /var/log/emerge.log for stages 1 through 3.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1303 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoClean up firmware code in livecdfs-update.sh, add beginnings of new firmware code...
Chris Gianelloni [Thu, 14 Feb 2008 16:51:33 +0000 (16:51 +0000)]
Clean up firmware code in livecdfs-update.sh, add beginnings of new firmware code in livecd-stage2-controller.sh, and fix output for USE in make.conf to 80 columns.  This is catalyst 2.0.6_pre5 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1302 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoApparently, python doesn't like it when you put a set of comments in front of an...
Chris Gianelloni [Thu, 14 Feb 2008 03:15:19 +0000 (03:15 +0000)]
Apparently, python doesn't like it when you put a set of comments in front of an elif.  Thanks to Robin Johnson <robbat2@gentoo.org> for pointing it out and the patch.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1301 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoHuge refactoring of modules/generic_stage_target.py to fix indentation and generally...
Chris Gianelloni [Wed, 13 Feb 2008 23:35:34 +0000 (23:35 +0000)]
Huge refactoring of modules/generic_stage_target.py to fix indentation and generally clean up the code so it's a bit easier to read/follow.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1300 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoSort and de-dupe myusevars
Andrew Gaffney [Wed, 13 Feb 2008 21:48:10 +0000 (21:48 +0000)]
Sort and de-dupe myusevars

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1299 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoModify stage1-chroot.sh to use the actual -d/--debug code already in catalyst.
Chris Gianelloni [Wed, 13 Feb 2008 06:41:32 +0000 (06:41 +0000)]
Modify stage1-chroot.sh to use the actual -d/--debug code already in catalyst.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1298 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoMove export of FEATURES to setup_myfeatures.
Chris Gianelloni [Wed, 13 Feb 2008 05:58:49 +0000 (05:58 +0000)]
Move export of FEATURES to setup_myfeatures.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1297 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoAdded some debug code to stage1 and fixed a nice bug where we weren't building with...
Chris Gianelloni [Tue, 12 Feb 2008 04:15:49 +0000 (04:15 +0000)]
Added some debug code to stage1 and fixed a nice bug where we weren't building with the correct USE.  Unfortunately, this invalidates any caches for stage1, since we were building with the entire USE from the profile.  This is 2.0.6_pre4 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1296 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe don't need to do the device building twice, so removing USE=build from first basel...
Chris Gianelloni [Mon, 11 Feb 2008 22:20:20 +0000 (22:20 +0000)]
We don't need to do the device building twice, so removing USE=build from first baselayout install.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1295 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoWe check for a plugdev group, add it if it doesn't exist, and make sure any users...
Chris Gianelloni [Sat, 9 Feb 2008 01:47:00 +0000 (01:47 +0000)]
We check for a plugdev group, add it if it doesn't exist, and make sure any users specified by livecd/users is in the group.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1294 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChanging cobalt_n32 to use mipsel4_n32 as its inheritance point. Thanks to Stuart...
Chris Gianelloni [Sat, 9 Feb 2008 01:23:31 +0000 (01:23 +0000)]
Changing cobalt_n32 to use mipsel4_n32 as its inheritance point.  Thanks to Stuart Longland <redhatter@gentoo.org> for pointing this change out.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1293 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoFix up calc_contents in contents_map. Thanks to Brent Baude <ranger@gentoo.org>...
Chris Gianelloni [Fri, 8 Feb 2008 23:11:37 +0000 (23:11 +0000)]
Fix up calc_contents in contents_map.  Thanks to Brent Baude <ranger@gentoo.org> for pointing it out.  This is catalyst 2.0.6_pre3 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1292 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoEnsure /etc/xml/catalog does not exist in stage1, since it will always be empty and...
Chris Gianelloni [Fri, 8 Feb 2008 19:18:09 +0000 (19:18 +0000)]
Ensure /etc/xml/catalog does not exist in stage1, since it will always be empty and will cause issues in stage3 and beyond.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1291 d1e1f19c-881f-0410-ab34-b69fee027534

16 years agoChanged some of the rc-update code so it should work with baselayout-2, also. This...
Chris Gianelloni [Fri, 8 Feb 2008 19:10:52 +0000 (19:10 +0000)]
Changed some of the rc-update code so it should work with baselayout-2, also.  This is 2.0.6_pre2 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1290 d1e1f19c-881f-0410-ab34-b69fee027534