summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Fri, 29 Mar 2013 12:20:15 +0000 (08:20 -0400)]
fsscript.sh: Make a ~swc/.fluxbox/ directory for fluxbox-generate_menu
And make sure everything under ~swc/ is owned by swc.users.
This fixes:
Running fsscript.sh in chroot /.../livecd-stage2-i686-2013.1/
touch: cannot touch '/home/swc/.fluxbox/menuconfig':
No such file or directory
Warning: I couldn't create /home/swc/.fluxbox/menuconfig
Fatal error: can't create or write to /home/swc/.fluxbox/menu
W. Trevor King [Thu, 28 Mar 2013 11:43:10 +0000 (07:43 -0400)]
spec: Update snapshot from
20130320 to
20130328
This gets us app-text/poppler-0.22.2-r2, which closes some CVE issues
(with 0.22.1) and works with evince (with 0.22.2-r2). For details,
see #459866 [1].
[1]: https://bugs.gentoo.org/show_bug.cgi?id=459866
W. Trevor King [Wed, 20 Mar 2013 16:50:28 +0000 (12:50 -0400)]
portage-conf/default: Don't bring in wxpython 2.9.4.1
Limit the number of testing (~x86) packages.
I'm not quite sure why wxpython 2.9 is being drawn in, but disabling
these use flags seems to fix it.
W. Trevor King [Wed, 20 Mar 2013 12:57:27 +0000 (08:57 -0400)]
spec: Update snapshot from
20130308 to
20130320
W. Trevor King [Wed, 20 Mar 2013 10:49:38 +0000 (06:49 -0400)]
default-livecd-stage1-i686-2013.1.spec: Remove x11-misc/slim
I have the following patches in my build version of catalyst:
* livecdfs-update.sh: Use `bash --login` to spawn startx
* livecd-bashrc: Avoid a startx race by restricting to tty1
which allow me to boot directly into startx without needing a login
manager.
W. Trevor King [Wed, 20 Mar 2013 10:23:06 +0000 (06:23 -0400)]
fsscript.sh: Call fluxbox-generate_menu to pickup Firefox, etc.
Nothing installed after Fluxbox shows up in the Fluxbox menu unless
you regenerate the menu. There's not much on this livecd, but having
a menu entry for Firefox is important, and before this commit it was
missing (as reported by Jon Pipitone).
W. Trevor King [Tue, 12 Mar 2013 17:22:49 +0000 (13:22 -0400)]
portage-conf: Move package.keywords to package.accept_keywords
This brings me up to date with Portage's
39020a6 (Add support for
/etc/portage/package.accept_keywords, 2010-08-15) [1].
Thanks to Chí-Thanh Christopher Nguyễn (chithead) and Ben Kohler
(iamben) for pointing this out to me on #gentoo.
[1]: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=
39020a6a418c0910b372e04a8f4959ce258d1989
W. Trevor King [Sun, 10 Mar 2013 01:37:48 +0000 (20:37 -0500)]
spec: Convert /mnt/d/... to /var/tmp/catalyst
It's easier to reuse these spec files if I stick to a standard
location and:
# mount --bind /mnt/d/... /var/tmp/catalyst
to attach my extra space to the standard location.
W. Trevor King [Sun, 10 Mar 2013 01:19:15 +0000 (20:19 -0500)]
package.keywords: Add additional ~x86 keywords
As directed by emerge in order to emerge our target packages.
W. Trevor King [Sun, 10 Mar 2013 01:15:50 +0000 (20:15 -0500)]
spec: Update snapshot from
20130208 to
20130308
W. Trevor King [Sun, 10 Mar 2013 01:14:49 +0000 (20:14 -0500)]
default-stage1-i686-2013.1.spec: Add 'update_seed=yes'
The 2012-12-13 stage3 uses libmpc.so.2, but the 2013-03-08 Portage
snapshot installes libmpc.so.3.
W. Trevor King [Sun, 10 Mar 2013 01:06:32 +0000 (20:06 -0500)]
overlays/default: Add README and equery-licenses
The packages distributed in the release ISOs are distributed under a
range of licenses, but in the ISO we distribute them without their
source. Since many licenses (e.g. the GPLv2, section 3) require you
to also distribute or provide access to the corresponding source code,
it's good to be clear about the licensing of the bundled binaries.
The large list of installed packages and licenses can also serve as a
teaching tool for explaining how open source development works, and
emphasizing why using a standard license is a good idea ;).
W. Trevor King [Sat, 9 Mar 2013 17:36:39 +0000 (12:36 -0500)]
default-livecd-stage1-i686-2013.1.spec: Add bindist to livecd/use
Firefox doesn't allow branded binary distribution by third parties,
and there may be other packages with binary distribution restrictions.
Enabling this USE flag ensures that we don't run afoul of these
restrictions.
W. Trevor King [Sat, 9 Mar 2013 16:55:42 +0000 (11:55 -0500)]
package.keywords/ipython: Fix '~amd64' -> '~x86' typos
Oops, sloppy me.
W. Trevor King [Sat, 9 Mar 2013 12:45:05 +0000 (07:45 -0500)]
portage-conf/default/package.use/x: Re-break pambase <-> consolekit loop
I's disabled consolekit for pambase in package.use/circular, but this
was re-enabling it (and package.use/x is parsed after
package.use/circular). This dependency cycle broke the stage3 build,
but was, apparently, needed for some later stage. If this fix doesn't
work, we can transition to using different portage-conf subdirectories
for different stages.
W. Trevor King [Fri, 8 Mar 2013 14:31:52 +0000 (09:31 -0500)]
default-livecd-stage1-i686-2013.1.spec: Add Firefox package
The previous ISO weighed in at 665 MB, so there should be room for
Firefox to still fit on a 737 MB CD. We need *something* with fairly
modern CSS and JavaScript support for IPython.
W. Trevor King [Fri, 8 Mar 2013 03:57:13 +0000 (22:57 -0500)]
default-livecd-stage1-i686-2013.1.spec: Add python to livecd/use
This is required in VTK 5.10.1 by MayaVi 4.2.0, but SWC likes Python,
so we enable this globally.
W. Trevor King [Fri, 8 Mar 2013 03:49:17 +0000 (22:49 -0500)]
default-livecd-stage1-i686-2013.1.spec: Add livecd/use with gtk & ipython
These are used by SymPy, but we want to enable them globally in case
other packages use them too.
W. Trevor King [Fri, 8 Mar 2013 03:48:34 +0000 (22:48 -0500)]
package.keywords: Add ~x86 where necessary for new packages
W. Trevor King [Fri, 8 Mar 2013 03:25:28 +0000 (22:25 -0500)]
default-livecd-stage1-i686-2013.1.spec: Add Mercurial and other packages
With these packages we'll be closer to passing the full
swc-installation-test-2.py suite.
W. Trevor King [Tue, 5 Mar 2013 21:38:13 +0000 (16:38 -0500)]
.gitignore: Ignore build directories
This is what we're ignoring:
$ tree
.
|-- builds # compiled and seed stages
| `-- default
| |-- stage1-i686-2013.1.tar.bz2
| ...
| `-- stage3-i686-2013.1.tar.bz2.DIGESTS
|-- iso # compiled ISOs
| |-- swc-x86.iso
| |-- swc-x86.iso.CONTENTS
| `-- swc-x86.iso.DIGESTS
|-- kerncache # cached kernel compilation
| `-- default
| |-- livecd-stage1-i686-2013.1 # empty (no kernel in livecd-stage1)
| |-- livecd-stage2-i686-2013.1 # lots of kernel compilation stuff
| ...
|-- packages # binary packages from per-stage emerges
| `-- default
| |-- livecd-stage1-i686-2013.1 # emerged during livecd-stage1
| ...
| `-- stage3-i686-2013.1 # emerged during stage3
...
|-- snapshot_cache # unpacked portage snapshots
| `--
20130208
|-- snapshots # packed portage snapshots
| |-- portage-
20130208.tar.bz2
| |-- portage-
20130208.tar.bz2.CONTENTS
| `-- portage-
20130208.tar.bz2.DIGESTS
...
`-- tmp # unpacked stage chroots
|-- default
| |-- livecd-stage1-i686-2013.1
| |-- livecd-stage2-i686-2013.1
| |-- stage1-i686-2013.1
| |-- stage2-i686-2013.1
| `-- stage3-i686-2013.1
`-- portage
`-- portage # unpacked portage snapshot
W. Trevor King [Tue, 5 Mar 2013 21:03:48 +0000 (16:03 -0500)]
Initial SWC (Gentoo) Linux 2013.1 x86 configuration
This is the catalyst stuff for building a Gentoo live CD ISO for
Software Carpentry students [1]. It's pretty bare-bones at the
moment, since I tried to keep any non-specfile stuff to a minimum. It
also requires a few patches on top of the current catalyst master
(
37540ff):
livecdfs-update.sh: Assign users to per-user groups
livecd-bashrc: Avoid a startx race by restricting to tty1
livecdfs-update.sh: Use `bash --login` to spawn startx
livecdfs-update.sh: Escape ampersands in STARTX sed expression
fixup: env-update
livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession
chmod +x all sh scripts so they can run from the git checkout
This is not the most elegant patch series, and some of these patches
will probably be squashed/tweaked before inclusion in upstream
catalyst. I'm not even sure if the per-user group patch is a good
idea (but it shouldn't hurt).
My catalyst.conf file looked like:
digests="md5 sha1 sha512 whirlpool"
contents="auto"
distdir="/usr/portage/distfiles"
envscript="/etc/catalyst/catalystrc"
hash_function="crc32"
options="autoresume kerncache pkgcache seedcache snapcache"
portdir="/usr/portage"
sharedir="/home/wking/src/catalyst"
snapshot_cache="/tmp/catalyst/snapshot_cache"
storedir="/tmp/catalyst"
This repository was checked out into $storedir.
The spec files should be fairly stable (modulo snapshot/version
bumps), but you may need to update the Portage configuration as stable
packages evolve and assorted bugs and incompatibilities are fixed
upstream.
[1]: http://lists.software-carpentry.org/pipermail/discuss-software-carpentry.org/2013-March/000210.html