Author: rieggepp
Date: Mon Jun 23 08:12:26 2008
New Revision: 118

Added:
   trunk/tools/rebuild_stages/i386-uclibc/
   trunk/tools/rebuild_stages/i386-uclibc/Makefile
   trunk/tools/rebuild_stages/i386-uclibc/catalyst.conf
   trunk/tools/rebuild_stages/i386-uclibc/catalystrc
Modified:
   trunk/tools/rebuild_stages/Makefile

Log:
Changed Makefile to a more modular approach.

Modified: trunk/tools/rebuild_stages/Makefile
==============================================================================
--- trunk/tools/rebuild_stages/Makefile	(original)
+++ trunk/tools/rebuild_stages/Makefile	Mon Jun 23 08:12:26 2008
@@ -1,42 +1,3 @@
-SUBARCH   = x86
-VERSION   = latest
-RELTYPE   = default
-CHOST     = i386-unknown-linux-uclibc
-CFLAGS    = -Os -pipe
-CXXFLAGS  = $(CFLAGS)
-LDFLAGS   =
-
-
-STAGE1_PROFILE   = uclibc/x86
-STAGE2_PROFILE   = $(STAGE1_PROFILE)
-STAGE3_PROFILE   = $(STAGE2_PROFILE)
-
-#STAGE4_PROFILE   = $(STAGE3_PROFILE)
-#STAGE4_PACKAGES = gnome hardened-sources
-#STAGE4_USE = gnome gtk X
-
-TINDERBOX_PROFILE = $(STAGE3_PROFILE)
-TINDERBOX_USE =
-TINDERBOX_PACKAGES = vim cups samba ntp apache
-
-MIRROR_DIR = /home/stoile/public_html/gentoo
-PORTAGE_VERSION = $(VERSION)
-#STAGE3_TARBALL = ../experimental/x86/embedded/stages/stage3-x86-uclibc-2006.1.tar.bz2
-CATALYST_BIN = /usr/bin/catalyst
-CATALYST_CONF = /root/work/catalyst/i386-unknown-linux-uclibc/catalyst.conf
-
-CATALYST_DIR = /var/tmp/catalyst_i386-unknown-linux-uclibc
-PACKAGE_FILE = packages.conf
-LIVECD_FILE  = livecd.conf
-FS_SCRIPT    = fsscript
-ROOT_OVERLAY = root_overlay
-
-SEEDSTAGE = seedstage-$(SUBARCH)-$(VERSION).tar.bz2
-
-PORTAGE_SNAPSHOT = portage-${PORTAGE_VERSION}.tar.bz2
-PORTAGE_CONFDIR = /root/work/catalyst/i386-unknown-linux-uclibc/portage
-
-
 STAGE1_SPEC = stage1.spec
 STAGE2_SPEC = stage2.spec
 STAGE3_SPEC = stage3.spec

Added: trunk/tools/rebuild_stages/i386-uclibc/Makefile
==============================================================================
--- (empty file)
+++ trunk/tools/rebuild_stages/i386-uclibc/Makefile	Mon Jun 23 08:12:26 2008
@@ -0,0 +1,48 @@
+# Basic Configuration
+SUBARCH   = x86
+VERSION   = latest
+RELTYPE   = default
+CHOST     = i386-unknown-linux-uclibc
+CFLAGS    = -Os -pipe
+CXXFLAGS  = $(CFLAGS)
+LDFLAGS   =
+
+# Profile Configuration
+STAGE1_PROFILE   = uclibc/x86
+STAGE2_PROFILE   = $(STAGE1_PROFILE)
+STAGE3_PROFILE   = $(STAGE2_PROFILE)
+STAGE4_PROFILE   = $(STAGE3_PROFILE)
+TINDERBOX_PROFILE = $(STAGE3_PROFILE)
+
+# Stage4 Configuration
+STAGE4_USE = gnome gtk X
+STAGE4_PACKAGES = gnome hardened-sources
+
+# Tinderbox Configuration
+TINDERBOX_USE =
+TINDERBOX_PACKAGES = vim cups samba ntp apache
+
+# Portage Snapshot Configuration
+PORTAGE_VERSION = $(VERSION)
+PORTAGE_SNAPSHOT = portage-${PORTAGE_VERSION}.tar.bz2
+
+# Directory Configuration
+WORK_DIR = /root/work/catalyst/i386-uclibc
+MIRROR_DIR = /home/stoile/public_html/gentoo
+
+#STAGE3_TARBALL = releases/experimental/x86/embedded/stages/stage3-x86-uclibc-2006.1.tar.bz2
+CATALYST_BIN = /usr/bin/catalyst
+CATALYST_CONF = $(WORK_DIR)/catalyst.conf
+
+CATALYST_DIR = /var/tmp/catalyst_i386-uclibc
+PACKAGE_FILE = packages.conf
+LIVECD_FILE  = livecd.conf
+FS_SCRIPT    = fsscript
+ROOT_OVERLAY = root_overlay
+
+SEEDSTAGE = seedstage-x86-latest-r2.tar.bz2
+#SEEDSTAGE = stage3-x86-uclibc-2008.0_beta2.tar.bz2
+
+PORTAGE_CONFDIR = $(WORK_DIR)/portage
+
+include ../Makefile

Added: trunk/tools/rebuild_stages/i386-uclibc/catalyst.conf
==============================================================================
--- (empty file)
+++ trunk/tools/rebuild_stages/i386-uclibc/catalyst.conf	Mon Jun 23 
08:12:26 2008
@@ -0,0 +1,65 @@
+# /etc/catalyst/catalyst.conf
+
+# Simple desriptions of catalyst settings. Please refer to the online
+# documentation for more information.
+
+# Creates a .DIGESTS file containing the hash output from any of the supported
+# options below.  Adding them all may take a long time.
+# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32,
+#	ripemd256, sha256, sha512, ripemd160, md5
+digests="md5 sha1"
+
+# distdir specifies where your distfiles are located. This setting should
+# work fine for most default installations.
+distdir="/usr/portage/distfiles"
+
+# envscript allows users to set options such as http proxies, MAKEOPTS,
+# GENTOO_MIRRORS, or any other environment variables needed for building.
+# The envscript file sets environment variables like so:
+# export FOO="bar"
+envscript="/root/work/catalyst/i386-uclibc/catalystrc"
+
+# Internal hash function catalyst should use for things like autoresume,
+# seedcache, etc.  The default and fastest is crc32.  You should not 
ever need
+# to change this unless your OS does not support it.
+# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32,
+#	ripemd256, sha256, sha512, ripemd160, md5
+hash_function="crc32"
+
+# options set different build-time options for catalyst. Some examples are:
+# autoresume = Attempt to resume a failed build, clear the autoresume 
flags with
+#	the -a option to the catalyst cmdline.  -p will clear the autoresume flags
+#	as well as your pkgcache and kerncache
+#	( This option is not fully tested, bug reports welcome )
+# ccache = enables build time ccache support (highly recommended)
+# distcc = enable distcc support for building. You have to set 
distcc_hosts in
+# 	your spec file.
+# kerncache = keeps a tbz2 of your built kernel and modules (useful if your
+#	build stops in livecd-stage2)
+# pkgcache = keeps a tbz2 of every built package (useful if your build stops
+#	prematurely)
+# seedcache = use the build output of a previous target if it exists 
to speed up
+#	the copy
+# snapcache = cache the snapshot so that it can be bind-mounted into 
the chroot.
+#	WARNING: moving parts of the portage tree from within fsscript 
*will* break
+#	your cache. The cache is unlinked before any empty or rm processing, though.
+#
+# (These options can be used together)
+#options="autoresume kerncache pkgcache seedcache snapcache"
+options="kerncache pkgcache seedcache snapcache"
+
+# portdir specifies the source portage tree used by the snapshot target.
+portdir="/usr/portage"
+
+# sharedir specifies where all of the catalyst runtime executables 
are. Most
+# users do not need to change this.
+sharedir="/usr/lib/catalyst"
+
+# snapshot_cache specifies where the snapshots will be cached to if 
snapcache is
+# enabled in the options.
+snapshot_cache="/var/tmp/catalyst/snapshot_cache"
+
+# storedir specifies where catalyst will store everything that it 
builds, and
+# also where it will put its temporary files and caches.
+storedir="/var/tmp/catalyst_i386-uclibc"
+

Added: trunk/tools/rebuild_stages/i386-uclibc/catalystrc
==============================================================================
--- (empty file)
+++ trunk/tools/rebuild_stages/i386-uclibc/catalystrc	Mon Jun 23 
08:12:26 2008
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This is an example catalystrc. As such, it doesn't actually *do* anything.
+
+# Uncomment the following to increase the number of threads used to compile.
+# export MAKEOPTS="-j16"
+
+export MAKEOPTS="-j1"
-- 
gnap-dev@g.o mailing list