Brian Dolbec [Mon, 14 Jan 2013 03:32:29 +0000 (19:32 -0800)]
Fix undefined variable: RLIMIT_NOFILE
It was not imported from resource, it was also not used correctly.
Brian Dolbec [Fri, 3 Jan 2014 18:48:31 +0000 (10:48 -0800)]
main.py: print the output of an ImportError to help in debugging.
Brian Dolbec [Fri, 3 Jan 2014 18:46:55 +0000 (10:46 -0800)]
Initial separation and creation of contents.py
Brian Dolbec [Fri, 3 Jan 2014 18:42:26 +0000 (10:42 -0800)]
Initial separation and creation of a hash_utils.py module
Brian Dolbec [Fri, 3 Jan 2014 18:28:12 +0000 (10:28 -0800)]
files/catalyst.conf: Whitespace cleanup
Mike Frysinger [Wed, 22 Jan 2014 04:38:43 +0000 (23:38 -0500)]
Add arm64 support
Brian Dolbec: Modify patch for the new directory structure and apply.
Cleanup the imports.
W. Trevor King [Fri, 27 Dec 2013 02:40:10 +0000 (18:40 -0800)]
catalyst/targets/generic_target.py: Pass TERM through to the chroot
Avoid:
Running stage1-chroot.sh in chroot /var/tmp/catalyst/tmp/default/...
tput: No value for $TERM and no -T specified
by passing the caller's TERM environment variable [1] through to the
chroot. If the caller does not supply TERM, default to 'dumb' which
disables color etc., but should be the most portable. On Gentoo, the
dumb terminfo (/usr/share/terminfo/d/dumb) is distributed as part of
ncurses [2]. You can list supported terminals with toe, which is also
distributed with ncurses [2]:
$ toe
ansi ansi/pc-term compatible with color
dumb 80-column dumb tty
linux linux console
...
[1]: http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/V1_chap08.html#tag_08_03
[2]: http://www.gnu.org/software/ncurses/
Brian Dolbec [Sat, 11 Jan 2014 00:13:06 +0000 (16:13 -0800)]
generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror
Brian Dolbec [Mon, 30 Dec 2013 06:14:48 +0000 (22:14 -0800)]
Fix autoresume file paths to only be configured once.
Use: pjoin as a shorter alias to os.path.join()
Brian Dolbec [Fri, 25 Jan 2013 04:26:38 +0000 (20:26 -0800)]
Commit a testpath file to source with instructions on it's use.
Make testpath automagic via dwfeed's tweak
Update HOWTO on how to run the git checkout code directly without being installed.
Brian Dolbec [Sun, 2 Mar 2014 16:43:16 +0000 (08:43 -0800)]
catalyst/support.py: Update for snakeoil API change.
Brian Dolbec [Sun, 2 Mar 2014 16:13:43 +0000 (08:13 -0800)]
catalyst/arch/m68k.py: fix missed import cleanup during move/rebase.
W. Trevor King [Sat, 22 Feb 2014 19:37:36 +0000 (11:37 -0800)]
Makefile: Fix PACKAGE_VERSION extraction
The old method grepped for __version__ in catalyst. That broke with
24c5352 (Initial rearrangement of the python directories, 2013-01-10),
which moved catalyst to bin/catalyst, kept the __version__ in
bin/catalyst, and added a new __version__ in catalyst/main.py. Then
46b261e (setup.py: Add disutils-based packaging, 2013-06-05)
consolidated the __version__ definitions in catalyst/__init__.py,
removing them from bin/catalyst and catalyst/main.py. This patch
adjusts the Makefile, invoking Python to extract catalyst.__version__
instead of grepping through the file that defines it.
W. Trevor King [Wed, 5 Jun 2013 17:13:43 +0000 (13:13 -0400)]
setup.py: Add disutils-based packaging
Package catalyst in the usual manner for Python projects. Now it is
ready for PyPI :).
I also expose the version string in catalyst.__version__ and the
maintainer string in catalyst.__maintainer__, since those are more
traditional locations.
I dropped official Python 2.6 support following:
19:31 <@jmbsvicetto> I don't see a need to make catalyst
incompatible with 2.6, but I think it's time we drop it as a
"requirement". So feel free to do any changes that improve the
code, even if they drop 2.6 compatibility
I kept the explicit indexes in the string formatting, since Python 2.6
doesn't support:
'{}'.format(value)
Brian Dolbec [Sat, 11 Jan 2014 20:57:17 +0000 (12:57 -0800)]
Move catalyst.conf and catalystrc to an etc/ directory
Brian Dolbec [Sat, 12 Jan 2013 07:43:36 +0000 (23:43 -0800)]
Rename the modules subpkg to targets, to better reflect what it contains.
Brian Dolbec [Sat, 12 Jan 2013 07:32:41 +0000 (23:32 -0800)]
Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst namespace.
Brian Dolbec [Fri, 11 Jan 2013 02:56:28 +0000 (18:56 -0800)]
Initial rearrangement of the python directories
New minimal start script, moving the original catalyst script to catalyst/main.py.
Add __init__.py's to modules and arch sub-pkgs.
skip __init__.py when loading the modules.
Update the module loading paths for the new locations.
Fix catalyst_support import to new location and specify imported modules.
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Tue, 11 Feb 2014 02:54:36 +0000 (01:54 -0100)]
Update AUTHORS to review credit and split the list of people in original authors, significant contributors and contributors.
Brian Dolbec [Tue, 17 Dec 2013 14:56:04 +0000 (06:56 -0800)]
Remove an extra slash in the path.
Brian Dolbec [Sun, 12 Jan 2014 04:53:12 +0000 (20:53 -0800)]
Remove some troublesome trailing slashes from paths
Change the docstring to warn to use a proper path join function.
Modify the functions.sh output to display the actual command it
is about to run.
Brian Dolbec [Tue, 17 Dec 2013 15:22:41 +0000 (07:22 -0800)]
chmod +x targets/stage1/build.py
Brian Dolbec [Mon, 21 Jan 2013 23:58:58 +0000 (15:58 -0800)]
chmod +x all sh scripts so they can run from the git checkout
Anthony G. Basile [Mon, 30 Dec 2013 23:57:28 +0000 (15:57 -0800)]
catalyst/targets/generic_stage_target.py: mount /dev/shm on linux
Add shm targets defaults. Anthony G. Basile <blueness@gentoo.org>
Some build systems require /dev/shm to be mounted, like python's
build system. We make sure that on Linux systems, /dev/shm is
mounted in the stage chroots. See bug #496328.
Douglas Freed <dwfreed@mtu.edu> :
Mount /dev/shm in the chroot with the right options
Bind mounting /dev/shm into the chroot isn't a good idea, as there may
be collisions and result in weird side effects. Instead, we can just
mount a new tmpfs there, with the right options to ensure security.
(Forward ported to pending branch from 2.X Brian Dolbec)
Conflicts:
catalyst/targets/generic_stage_target.py
Brian Dolbec [Mon, 30 Dec 2013 23:56:02 +0000 (15:56 -0800)]
modules/generic_stage_target.py, Create SOURCE_MOUNTS_DEFAULTS
Similarly to TARGET_MOUNTS_DEFAULTS this is a temporary location.
This will simplify the migration to being fully configurable.
It also simplifies initialization somewhat.
W. Trevor King [Thu, 19 Dec 2013 23:38:48 +0000 (15:38 -0800)]
doc/HOWTO.txt: Fix stage descriptions, and add extra context
Thanks to Zero_Chaos, dwfreed, and jmbsvicetto for clarification and
review on #gentoo-releng.
Brian Dolbec [Fri, 20 Dec 2013 00:07:15 +0000 (16:07 -0800)]
Set mountmap["icecream"] from settings for now.
“mountmap” is for source paths. “mounts” is for path-agnostic keys.
I plan to add a source_mounts to settings later to compliment the target_mounts paths.
Brian Dolbec [Tue, 17 Dec 2013 06:22:05 +0000 (22:22 -0800)]
modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary
Temporary location to define TARGET_MOUNTS_DEFAULTS.
It will be moved to a new defaults.py file in a later commit.
I also plan to make them configurable.
Also:
* Clean up all self.mounts, self.mountmap usage.
* Replace multiple path additions with one instance at the
beginning of the function, reuse the result multiple times.
* Add some extra debug prints (to be converted to logging later)
Brian Dolbec [Sun, 29 Dec 2013 09:03:14 +0000 (01:03 -0800)]
Fix mounts and mountmap port_logdir code block.
Brian Dolbec [Thu, 19 Dec 2013 05:04:24 +0000 (21:04 -0800)]
Add "local_overlay" to configdefaults.
Fixes commit
463d98f
(modules/generic_stage_target.py: Use a 'local_overlay'
setting instead of hard-coding '/usr/local/portage',
2012-12-19)
Brian Dolbec [Thu, 19 Dec 2013 04:27:04 +0000 (20:27 -0800)]
Fix a missed self.settings["repo_name"] migration
Use normpath() on it as well.
Fix the coding style in the lines touched.
Brian Dolbec [Sun, 15 Dec 2013 22:53:32 +0000 (14:53 -0800)]
modules/generic_stage_target.py: Use portdir, distdir, ... instead of paths for keys
If snapcache is enabled, self.mounts and self.mountmap had not been
modified like they were if it was not enabled.
Added a print statement for debugging to be converted to logging in
the future.
Matt Turner [Sun, 15 Dec 2013 20:31:20 +0000 (12:31 -0800)]
modules/generic_stage_target.py: Use 'devpts' as mountmap key.
Missed in
0c68d30b. Would cause catalyst to fail if snapcache were
enabled.
Tested-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Wed, 9 Jan 2013 08:32:41 +0000 (00:32 -0800)]
catalst: improve usage() output formatting slightly
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'ccache' instead of '/var/tmp/ccache' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'kerncache' instead of '/tmp/kerncache' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'packagedir' instead of '/usr/portage/packages' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'devpts' instead of '/dev/pts' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'port_tmpdir' instead of '/var/tmp/portage' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'distdir' instead of '/usr/portage/distfiles' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'dev' instead of '/dev' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'proc' instead of '/proc' as the mountmap key
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Don't use paths as mountmap keys
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages'
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Tue, 8 Jan 2013 07:17:22 +0000 (23:17 -0800)]
catalyst: Add 'snapshot_name' default
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Tue, 8 Jan 2013 07:17:22 +0000 (23:17 -0800)]
catalyst: Add 'repo_name' default
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Tue, 8 Jan 2013 07:17:22 +0000 (23:17 -0800)]
catalyst: Split confdefaults into line-per-entry
This makes it easy to find the key you're looking for. Future
additions and removals will also have cleaner diffs.
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage'
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Fri, 22 Nov 2013 04:51:13 +0000 (20:51 -0800)]
modules/generic_stage_target.py: Use 'distdir' instead of hard-coding '${PORTAGE}/distfiles'
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Fri, 22 Nov 2013 04:51:13 +0000 (20:51 -0800)]
modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage'
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Thu, 20 Dec 2012 02:56:04 +0000 (18:56 -0800)]
modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage'
W. Trevor King: Refactored Git history for Brian Dolbec's content changes.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Brian Dolbec [Tue, 8 Jan 2013 07:17:22 +0000 (23:17 -0800)]
modules/tinderbox_target.py: Use 'portdir' instead of hard-coding '/usr/portage'
W. Trevor King: Refactored Git history for Brian Dolbec's content
changes with additional whitespace cleanups.
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
Matt Turner [Wed, 13 Nov 2013 21:59:25 +0000 (13:59 -0800)]
catalyst 2.0.15
W. Trevor King [Wed, 6 Mar 2013 17:02:59 +0000 (12:02 -0500)]
livecdfs-update.sh: Use `bash --login` to spawn startx
Starting a "login" version of Bash via `su` is tricky. The naive:
su - ${first_user} -c startx
fails because `su - ...` clears a number of environment variables (so
the prefixed `source /etc/profile` doesn't accomplish anything), but
Bash isn't started with the `--login` option, so it doesn't source
/etc/profile internally. From bash(1):
A login shell is one whose first character of argument zero is a -,
or one started with the --login option.
...
An interactive shell is one started without non-option arguments and
without the -c option whose standard input and error are both
connected to terminals (as determined by isatty(3)), or one started
with the -i option...
...
When bash is invoked as an interactive login shell, or as a
non-interactive shell with the --login option, it first reads and
executes commands from the file /etc/profile, if that file exists.
After reading that file, it looks for ~/.bash_profile,
~/.bash_login, and ~/.profile, in that order, and reads and executes
commands from the first one that exists and is readable. The
--noprofile option may be used when the shell is started to inhibit
this behavior.
In order to get the login-style profile loading with a non-interactive
`su` invocation, you need to use something like:
echo "${command}" | su - "${user}"
This starts a login shell and pipes the command in via stdin, which
seems to fake Bash into thinking its running from an interactive
terminal. Not the most elegant, but the other implementations I can
think of are even worse:
su - "${user}" -c "bash --login -c ${command}"
su - "${user}" -c 'source /etc/profile &&
(source .bash_profile || ...) && ${command}"
The old expression was broken anyway due to unescaped ampersands in
the sed expression. From sed(1):
s/regexp/replacement/
Attempt to match regexp against the pattern space. If successful,
replace that portion matched with replacement. The replacement
may contain the special character & to refer to that portion of
the pattern space which matched, and the special escapes \1
through \9 to refer to the corresponding matching sub-expressions
in the regexp.
This means that the old expression (with unescaped ampersands) lead
to:
source /etc/profile ##STARTX##STARTX su - ${first_user} -c startx
with ${first_user} expanded. This commented out startx, so it was
never run.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Wed, 25 Sep 2013 22:26:06 +0000 (15:26 -0700)]
livecd-bashrc: Avoid a startx race by restricting to tty1
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236
Reviewed-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Fri, 11 Oct 2013 22:06:14 +0000 (15:06 -0700)]
Revert "livecdfs-update.sh: Escape ampersands in STARTX sed expression"
This reverts commit
ed4d1623c3dac22ed008f518b79deecde1f33c26.
The commit was a v1 commit that was supposed to be replaced.
Dylan Baker [Sun, 13 Oct 2013 09:07:38 +0000 (02:07 -0700)]
catalyst: Remove commented sections of code
Code in the upstream tree should either run or it shouldn't be there.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Dylan Baker [Sun, 13 Oct 2013 09:07:37 +0000 (02:07 -0700)]
catalyst: split combined import
Combining multiple modules into a single import is discouraged in
python's PEP8 style guide:
"""
Imports should usually be on separate lines, e.g.:
Yes: import os
import sys
No: import sys, os
"""
Reviewed-by: Matt Turner <mattst88@gmail.com>
Dylan Baker [Sun, 13 Oct 2013 09:07:36 +0000 (02:07 -0700)]
catalyst: use a more pythonic method to import modules
Rather than appending a directory to the system path, this patch adds a
__init__.py file to modules, which allows python to search it, and it's
children for python modules. This also requires changes to a few of the
module files to make them happy.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Dylan Baker [Sun, 13 Oct 2013 09:07:35 +0000 (02:07 -0700)]
catalyst: Specify python2 rather than the generic python
This allows catalyst to work regardless of whether a user prefers that
usr/bin/python be python 2.x or 3.x.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Thu, 8 Aug 2013 02:40:03 +0000 (19:40 -0700)]
catalyst 2.0.14
Zac Medico [Wed, 31 Jul 2013 04:46:48 +0000 (21:46 -0700)]
generic_stage_target: default {PORT,PKG,DIST}DIR
This provides forward compatiblity so that stage builds do not break
in the future when portage changes the default PORTDIR, PKGDIR, and
DISTDIR locations (bug #378603).
Also, it provides backward compatibility for various tools that require
PORTDIR to be defined in make.conf, such as the following:
gentoo-bashcomp - bug #478444
euse - bug #474574
euses and ufed - bug #478318
X-Gentoo-Bug: 479062
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=479062
Reviewed-by: Matt Turner <mattst88@gmail.com>
Rick Farina (Zero_Chaos) [Tue, 6 Aug 2013 00:39:06 +0000 (20:39 -0400)]
stop tarballing firmware
I can't find a reason why firmware is tarballed in the first
place, and now things are messing up because of missing firmware.
Remove tarballing and tmpfs mount for /lib/firmware and just leave
it alone. Bug 479456
Rick Farina (Zero_Chaos) [Fri, 2 Aug 2013 06:13:16 +0000 (02:13 -0400)]
kerncache improperly sets --nodeps
It makes no sense to set --nodeps just because kerncache is being
used, the kernel still must be built at least once
Brian Dolbec [Fri, 2 Aug 2013 05:59:10 +0000 (22:59 -0700)]
Fix incorrect type for livecd/modblacklist.
Bug reported by tstellar.
Rick Farina (Zero_Chaos) [Fri, 2 Aug 2013 04:49:11 +0000 (00:49 -0400)]
correctly remove USE=build
c0fcbf027169da8b6f0d5e3c80c1526642c6c672 indavertantly dropped all
livecd-stage2 use flags, rewrite to just drop undesired build.
Rick Farina (Zero_Chaos) [Fri, 2 Aug 2013 04:46:51 +0000 (00:46 -0400)]
Revert "kmerge.sh: Don't set USE=build for emerging kernels."
This appears to inadvertantly drop livecd-stage2 use flags entirely.
This reverts commit
c0fcbf027169da8b6f0d5e3c80c1526642c6c672.
Matt Turner [Wed, 31 Jul 2013 03:49:20 +0000 (20:49 -0700)]
catalyst 2.0.13
Brian Dolbec [Tue, 30 Jul 2013 08:06:05 +0000 (01:06 -0700)]
Fix a py3 syntax error, use print()
Bug reported by Michael Weber <xmw>
Matt Turner [Tue, 30 Jul 2013 07:04:51 +0000 (00:04 -0700)]
kmerge.sh: Don't set USE=build for emerging kernels.
USE=build for kernels means that they're not going to be built and that
we just want to install the sources. In catalyst, we do also want to
build the kernels, so settings the (badly named) USE flag prevents
installing sys-devel/bc, ultimately leading to the kernel build failing.
Remove USE=build from kmerge.sh and let it install dependencies
necessary for actually building the kernel. Fixes Live CD builds with
kernels that require bc (>= 3.9, I believe). See bug 478244.
Tested-by: Ben Kohler <bkohler@gmail.com>
Matt Turner [Thu, 25 Jul 2013 05:45:48 +0000 (22:45 -0700)]
Remove ChangeLog.
git tells us the same information, but better.
Matt Turner [Thu, 25 Jul 2013 05:32:16 +0000 (22:32 -0700)]
chroot-functions: Give variables more appropriate names.
Matt Turner [Thu, 25 Jul 2013 05:26:28 +0000 (22:26 -0700)]
Replace 'system' with '@system' where applicable, to be more greppable.
Douglas Freed [Tue, 28 May 2013 20:20:30 +0000 (16:20 -0400)]
Fixes a bug inadvertently caused by
6c0a577 where setting update_seed
to no would result in dropping the use and making of binpkgs while
building stage1, which is undesirable. The conditional was getting a
bit unwieldly, so I added a comment explaining when it matches, which is
especially helpful to those who don't know every single test flag.
Tested-By: Rick Farina <zerochaos@gentoo.org>
Tested-By: Brian Dolbec <dolsen@gentoo.org>
Rick Farina (Zero_Chaos) [Mon, 27 May 2013 20:25:03 +0000 (16:25 -0400)]
proper lbzip2 decompression of stages
use lbzip2 to decompress stages ONLY, snapshots can be bz2 or xz.
This provides me a 6x increase and likely more if you have fast IO
Rick Farina (Zero_Chaos) [Mon, 27 May 2013 20:23:12 +0000 (16:23 -0400)]
Revert "use lbzip2 to unpack the stages"
This reverts commit
978c02e6fa04ab7ed1a40003fa0eb4cfce952ca2, missed a
test
Rick Farina (Zero_Chaos) [Mon, 27 May 2013 20:13:28 +0000 (16:13 -0400)]
use lbzip2 to unpack the stages
Since we already use lbzip2 to compress everthing,
it makes a significant performance difference to
also unpack the stages using lbzip2. When the stage
compression is selectable this should be enhanced to use
other decompressors as well (although xz doesn't seem to
need a multi-threaded decompressor).
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Wed, 24 Apr 2013 11:27:13 +0000 (11:27 +0000)]
Drop addpatches from the livecd-stage2 example spec as well.
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Wed, 24 Apr 2013 11:23:50 +0000 (11:23 +0000)]
Drop addpatches from the stage4 example spec.
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Mon, 15 Apr 2013 03:22:34 +0000 (03:22 +0000)]
Fix broken "preserve_libs" commit - ";" is not ":".
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Sun, 31 Mar 2013 02:23:11 +0000 (02:23 +0000)]
Make the use of preserved_libs optional by setting the options variable.
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Mon, 4 Mar 2013 03:13:11 +0000 (03:13 +0000)]
Fix bugs 407051 and 458536 by using FEATURES="preserve-libs" on the unmerge step of livecd-stage2 target.
Jorge Manuel B. S. Vicetto (jmbsvicetto) [Mon, 4 Mar 2013 03:12:18 +0000 (03:12 +0000)]
Fix update_seed use by not using nor building binary packages during the seed update.
Raúl Porcel [Sat, 6 Apr 2013 17:07:00 +0000 (17:07 +0000)]
Add support for m68k
W. Trevor King [Sun, 3 Mar 2013 16:53:18 +0000 (11:53 -0500)]
livecdfs-update.sh: Escape ampersands in STARTX sed expression
From sed(1):
s/regexp/replacement/
Attempt to match regexp against the pattern space. If successful,
replace that portion matched with replacement. The replacement
may contain the special character & to refer to that portion of
the pattern space which matched, and the special escapes \1
through \9 to refer to the corresponding matching sub-expressions
in the regexp.
This means that the old expression (with unescaped ampersands) lead
to:
source /etc/profile ##STARTX##STARTX su - ${first_user} -c startx
when we want:
source /etc/profile && su - ${first_user} -c startx
with ${first_user} expanded in both cases.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:40:33 +0000 (15:40 -0500)]
doc/HOWTO.txt: Explain how to run catalyst without installing
Thanks to Chris White for explaining this to me.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:40:32 +0000 (15:40 -0500)]
files/.gitignore: Ignore $(DOCS) and $(DOC_SIDE_EFFECTS)
These are generated by the Makefile from sources in doc/.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:40:31 +0000 (15:40 -0500)]
Makefile: Add DOCS for building files/HOWTO.html
The rules are more general though; any new *.txt file in doc/ that
doesn't match *.?.txt or one of the explicitly-listed *.generated.txt
files will be automatically built and distributed.
The generated `files/docbook-xsl.css` is a side effect of the xhtml
target.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:40:30 +0000 (15:40 -0500)]
doc/HOWTO: First pass at a gentle Catalyst introduction
Reviewed-by: Matt Turner <mattst88@gmail.com>
Brian Dolbec [Thu, 28 Feb 2013 01:46:58 +0000 (17:46 -0800)]
Whitespace cleanup.
Run the following command to cleanup whitespace.
for FILE in $(git ls-tree -r --name-only HEAD | grep -v 'bz2$'); do
sed -i 's/[[:space:]]*$//' "$FILE"
done
git checkout COPYING ChangeLog
Reviewed-by: Matt Turner <mattst88@gmail.com>
Ben Kohler [Wed, 6 Mar 2013 01:08:07 +0000 (17:08 -0800)]
create-iso.sh: add usb boot via isohybrid
Add an isohybrid call to create-iso.sh for isolinux targets so the resulting
images are usb/hdd bootable.
W. Trevor King [Fri, 1 Mar 2013 05:57:39 +0000 (00:57 -0500)]
kmerge.sh: Fix line wrapping typo from
9ceebbf
In
9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional,
2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two
clauses in the test to avoid a very long line. Unfortunately,
newlines do not appear to be legal in this position. For example:
$ if [ -n "a" -a
> -n "b" ]; then echo "c"; fi
bash: [: missing `]'
bash: -n: command not found
This commit fixes the error by explicitly wrapping the line with a
backslash.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:45:38 +0000 (15:45 -0500)]
kmerge.sh: Make /var/tmp/${clst_kname}.config optional
For users that don't want to specify a seed config.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:45:37 +0000 (15:45 -0500)]
generic_stage_target: Handle unspecified boot/kernel/<kname>/config
If boot/kernel/<kname>/config is not set, make _copy_kernel_config a
no-op.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:45:36 +0000 (15:45 -0500)]
generic_stage_target: Split ._copy_initramfs_overlay() from ._build_kernel()
_copy_initramfs_overlay() is long enough that it makes reading
_build_kernel() difficult.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:45:35 +0000 (15:45 -0500)]
generic_stage_target.py: Dedent the bulk of ._build_kernel()
At the beginning of the function, we check for an autoresume point.
If we find it, just return. This allows us to dedent the `else` block
that had been handling the no-autoresume-found case.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:45:34 +0000 (15:45 -0500)]
generic_stage_target: Split ._copy_kernel_config() from ._build_kernel()
_copy_kernel_config() is one idea with a bunch of error handling.
Isolating it in its own function makes _build_kernel() easier to read.
Reviewed-by: Matt Turner <mattst88@gmail.com>
W. Trevor King [Sat, 9 Feb 2013 20:45:33 +0000 (15:45 -0500)]
generic_stage_target: Split ._build_kernel() out of .build_kernel()
The indentation was getting too deep ;). This also makes the
single-kernel-building code more digestible, by removing the
multiple-kernel looping and error handling from the function you're
reading.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Guy Martin [Tue, 5 Feb 2013 08:31:09 +0000 (00:31 -0800)]
Make sure shutil.rmtree() isn't passed a symlink
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=455022
Reviewed-by: Matt Turner <mattst88@gentoo.org>
Guy Martin [Tue, 5 Feb 2013 08:29:19 +0000 (00:29 -0800)]
Add hppa support for netboot 2 target
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=455018
Reviewed-by: Matt Turner <mattst88@gentoo.org>