Gentoo Logo

About | Projects | Docs | Forums | Lists | Bugs | Get Gentoo! | Support | Planet | Wiki

Gentoo Spaceship
Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gnap-dev
Navigation:
Lists: gnap-dev: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gnap-dev@g.o
From: codesite-noreply@...
Subject: [gnap-dev commit] r119 - in trunk/tools/rebuild_stages: . i386-uclibc
Date: Mon, 23 Jun 2008 08:55:14 -0700 
Author: rieggepp
Date: Mon Jun 23 08:54:35 2008
New Revision: 119

Modified:
   trunk/tools/rebuild_stages/Makefile
   trunk/tools/rebuild_stages/i386-uclibc/Makefile

Log:
Added autogeneration of catalyst.conf and catalystrc.

Modified: trunk/tools/rebuild_stages/Makefile
==============================================================================
--- trunk/tools/rebuild_stages/Makefile	(original)
+++ trunk/tools/rebuild_stages/Makefile	Mon Jun 23 08:54:35 2008
@@ -1,27 +1,33 @@
+# Autogenerated Stage/Tinderbox/Livecd Specifications
 STAGE1_SPEC = stage1.spec
 STAGE2_SPEC = stage2.spec
 STAGE3_SPEC = stage3.spec
 STAGE4_SPEC = stage4.spec
-
 TINDERBOX_SPEC = tinderbox.spec
-
 LIVECD_STAGE1_SPEC = livecd-stage1.spec
 LIVECD_STAGE2_SPEC = livecd-stage2.spec

-STAGEDIR  = $(CATALYST_DIR)/builds/$(RELTYPE)
+# Autogenerated Configuration Files
+CATALYST_CONF = catalyst.conf
+CATALYST_RC = catalyst.rc

+# Stage Target Filenames
 STAGE1    = stage1-$(SUBARCH)-$(VERSION).tar.bz2
 STAGE2    = stage2-$(SUBARCH)-$(VERSION).tar.bz2
 STAGE3    = stage3-$(SUBARCH)-$(VERSION).tar.bz2
 STAGE4    = stage4-$(SUBARCH)-$(VERSION).tar.bz2

+STAGEDIR  = $(CATALYST_STORE_DIR)/builds/$(RELTYPE)
+
 .PHONY: all

 all: $(STAGE1) $(STAGE2) $(STAGE3)
-#all: $(STAGE1) $(STAGE2) $(STAGE3) tinderbox

 fetch: $(PORTAGE_SNAPSHOT) $(SEEDSTAGE)

+clean:
+	@rm -fr $(STAGE1_SPEC) $(STAGE2_SPEC) $(STAGE3_SPEC) $(STAGE4_SPEC) 
$(TINDERBOX_SPEC) $(LIVECD_STAGE1_SPEC) $(LIVECD_STAGE2_SPEC) 
$(CATALYST_CONF) $(CATALYST_RC)
+
 $(PORTAGE_SNAPSHOT): $(MIRROR_DIR)/snapshots/$(PORTAGE_SNAPSHOT)
 	cp $? $@

@@ -38,8 +44,8 @@
 	@echo "snapshot: $(VERSION)" >> $@
 	@echo "source_subpath: $(RELTYPE)/$(SEEDSTAGE:.tar.bz2=)" >> $@
 	# no distcc
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi
 	@echo "chost: $(CHOST)" >> $@
 	@echo "cflags: $(CFLAGS)" >> $@
 	@echo "cxxflags: $(CXXFLAGS)" >> $@
@@ -56,8 +62,8 @@
 	@echo "snapshot: $(VERSION)" >> $@
 	@echo "source_subpath: $(RELTYPE)/$(STAGE1:.tar.bz2=)" >> $@
 	# no distcc
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi
 	@echo "chost: $(CHOST)" >> $@
 	@echo "cflags: $(CFLAGS)" >> $@
 	@echo "cxxflags: $(CXXFLAGS)" >> $@
@@ -73,8 +79,8 @@
 	@echo "snapshot: $(VERSION)" >> $@
 	@echo "source_subpath: $(RELTYPE)/$(STAGE2:.tar.bz2=)" >> $@
 	# no distcc
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi

 $(TINDERBOX_SPEC): Makefile
 	@rm -f $@
@@ -86,8 +92,8 @@
 	@echo "snapshot: $(VERSION)" >> $@
 	@echo "source_subpath: $(RELTYPE)/$(STAGE3:.tar.bz2=)" >> $@
 	# no distcc_hosts
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi
 	# default pkgcache_path
 	@echo "tinderbox/use: $(TINDERBOX_USE)" >> $@
 	@echo "tinderbox/packages: $(TINDERBOX_PACKAGES)" >> $@
@@ -103,8 +109,8 @@
 	@echo "snapshot: $(VERSION)" >> $@
 	@echo "source_subpath: $(RELTYPE)/$(STAGE3:.tar.bz2=)" >> $@
 	# no distcc
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi
 	# no overlay
 	# default pkgcache
 	# default kerncache
@@ -143,9 +149,9 @@
 	@echo "profile: $(STAGE2_PROFILE)" >> $@
 	@echo "snapshot: $(VERSION)" >> $@
 	@echo "source_subpath: $(RELTYPE)/$(STAGE3:.tar.bz2=)" >> $@
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
-	@cat "$(PACKAGE_FILE)" >> $@
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi
+	@cat "$(PACKAGE_CONF)" >> $@

 $(LIVECD_STAGE2_SPEC): Makefile
 	@rm -f $@
@@ -162,48 +168,62 @@
 	@echo "livecd/iso: $(RELTYPE)-$(VERSION).iso" >> $@
 	@echo "livecd/fsscript: $(FS_SCRIPT)" >> $@
 	@echo "livecd/root_overlay: $(ROOT_OVERLAY)" >> $@
-	@if [ -d "$(PORTAGE_CONFDIR)" ] ; then \
-		echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi
-	@cat "$(LIVECD_FILE)" >> $@
+	@if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \
+		echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi
+	@cat "$(LIVECD_CONF)" >> $@
+
+$(CATALYST_RC): Makefile
+	@touch $@
+
+$(CATALYST_CONF): Makefile $(CATALYST_RC)
+	@rm -fr $@
+	@echo "digests=\"$(CATALYST_DIGESTS)\"" >> $@
+	@echo "distdir=\"$(CATALYST_DIST_DIR)\"" >> $@
+	@echo "envscript=\"$(WORK_DIR)/$(CATALYST_RC)\"" >> $@
+	@echo "hash_function=\"$(CATALYST_HASH)\"" >> $@
+	@echo "options=\"$(CATALYST_OPTIONS)\"" >> $@
+	@echo "portdir=\"$(CATALYST_PORT_DIR)\"" >> $@
+	@echo "sharedir=\"$(CATALYST_SHARE_DIR)\"" >> $@
+	@echo "snapshot_cache=\"$(TMP_DIR)/catalyst/snapshot_cache\"" >> $@
+	@echo "storedir=\"$(CATALYST_STORE_DIR)\"" >> $@

 $(STAGEDIR)/$(SEEDSTAGE): $(SEEDSTAGE)
 	mkdir -p $(STAGEDIR)
 	cp "$(SEEDSTAGE)" "$(STAGEDIR)/$(SEEDSTAGE)"

+$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2: $(PORTAGE_SNAPSHOT)
+	mkdir -p $(CATALYST_STORE_DIR)/snapshots
+	cp "$(PORTAGE_SNAPSHOT)" "$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2"

-$(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2: $(PORTAGE_SNAPSHOT)
-	mkdir -p $(CATALYST_DIR)/snapshots
-	cp "$(PORTAGE_SNAPSHOT)" "$(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2"
-
-$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE1_SPEC)
+$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE1_SPEC)

 $(STAGE1): $(STAGEDIR)/$(STAGE1)
 	cp "$(STAGEDIR)/$(STAGE1)" $@

-$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE2_SPEC)
+$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE2_SPEC)

 $(STAGE2): $(STAGEDIR)/$(STAGE2)
 	cp "$(STAGEDIR)/$(STAGE2)" $@

-$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE3_SPEC)
+$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE3_SPEC)

 $(STAGE3): $(STAGEDIR)/$(STAGE3)
 	cp "$(STAGEDIR)/$(STAGE3)" $@

-$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE4_SPEC)
+$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE4_SPEC)

 $(STAGE4): $(STAGEDIR)/$(STAGE4)
 	cp "$(STAGEDIR)/$(STAGE4)" $@

-livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(LIVECD_STAGE1_SPEC)
+livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE1_SPEC)

-livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(LIVECD_STAGE2_SPEC)
+livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE2_SPEC)

-tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2
-	$(CATALYST_BIN) -c $(CATALYST_CONF) -f $(TINDERBOX_SPEC)
+tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2
+	$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(TINDERBOX_SPEC)

Modified: trunk/tools/rebuild_stages/i386-uclibc/Makefile
==============================================================================
--- trunk/tools/rebuild_stages/i386-uclibc/Makefile	(original)
+++ trunk/tools/rebuild_stages/i386-uclibc/Makefile	Mon Jun 23 08:54:35 2008
@@ -22,27 +22,37 @@
 TINDERBOX_USE =
 TINDERBOX_PACKAGES = vim cups samba ntp apache

+# LiveCD Configuration
+PACKAGE_CONF = packages.conf
+LIVECD_CONF  = livecd.conf
+FS_SCRIPT    = fsscript
+ROOT_OVERLAY = root_overlay
+
 # Portage Snapshot Configuration
 PORTAGE_VERSION = $(VERSION)
 PORTAGE_SNAPSHOT = portage-${PORTAGE_VERSION}.tar.bz2

+# Catalyst Configuration
+CATALYST_BIN = /usr/bin/catalyst
+CATALYST_SHARE_DIR = /usr/lib/catalyst
+CATALYST_STORE_DIR = $(TMP_DIR)/catalyst_i386-uclibc
+CATALYST_DIGESTS = md5 sha1
+CATALYST_HASH = crc32
+CATALYST_OPTIONS = kerncache pkgcache seedcache snapcache
+CATALYST_PORT_DIR = /usr/portage
+CATALYST_DIST_DIR = $(CATALYST_PORT_DIR)/distfiles
+
 # Directory Configuration
 WORK_DIR = /root/work/catalyst/i386-uclibc
+TMP_DIR = /var/tmp
 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
+PORTAGE_CONF_DIR = $(WORK_DIR)/portage

 include ../Makefile
-- 
gnap-dev@g.o mailing list
Navigation:
Lists: gnap-dev: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
[gnap-dev commit] r118 - in trunk/tools/rebuild_stages: . i386-uclibc
Next by thread:
[gnap-dev commit] r120 - trunk/tools/rebuild_stages/i386-uclibc
Previous by date:
[gnap-dev commit] r118 - in trunk/tools/rebuild_stages: . i386-uclibc
Next by date:
[gnap-dev commit] r120 - trunk/tools/rebuild_stages/i386-uclibc


Updated Jun 17, 2009

Summary: Archive of the gnap-dev mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.