[evolvis-commits] r15079: Make mirrors a possible env var↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:38:59 CET 2011


Author: mirabilos
Date: 2011-02-28 23:38:59 +0100 (Mon, 28 Feb 2011)
New Revision: 15079

Modified:
   trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile
Log:
Make mirrors a possible env var


Modified: trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile	2011-02-28 22:38:55 UTC (rev 15078)
+++ trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile	2011-02-28 22:38:59 UTC (rev 15079)
@@ -2,6 +2,18 @@
 DIST=lenny
 DIST=squeeze
 
+ifeq (,$(shell echo "$$DEBMIRROR"))
+DEBMIRROR=http://ftp.fr.debian.org/debian
+else
+DEBMIRROR=$(shell echo $$DEBMIRROR)
+endif
+
+ifeq (,$(shell echo "$$DEBSECMIRROR"))
+DEBSECMIRROR=http://ftp.fr.debian.org/debian
+else
+DEBSECMIRROR=$(shell echo $$DEBSECMIRROR)
+endif
+
 in_svn_repo:= $(wildcard .svn/)
 ifeq ($(strip $(in_svn_repo)),)
 in_bzr_repo:= $(wildcard ../../.bzr/)
@@ -17,13 +29,16 @@
 default: fusionforgemulti
 
 fusionforge: passsetup /usr/bin/build-simple-cdd 
-	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) 
+	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge \
+	--profiles-udeb-dist $(DIST) --debian-mirror $(DEBMIRROR) --security-mirror $(DEBSECMIRROR) --dist $(DIST) 
 
 fusionforgemulti: passsetup /usr/bin/build-simple-cdd
-	build-simple-cdd -g --profiles fusionforge,x-basic,x-gnome,autopart --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) --conf profiles/fusionforge.conf
+	build-simple-cdd -g --profiles fusionforge,x-basic,x-gnome,autopart \
+	--profiles-udeb-dist $(DIST) --debian-mirror $(DEBMIRROR) --security-mirror $(DEBSECMIRROR) --dist $(DIST) --conf profiles/fusionforge.conf
 
 fusionforgefr: clean /usr/bin/build-simple-cdd
-	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) --locale fr_FR --force-preseed --keyboard fr-latin9
+	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge \
+	--profiles-udeb-dist $(DIST) --debian-mirror $(DEBMIRROR) --security-mirror $(DEBSECMIRROR) --dist $(DIST) --locale fr_FR --force-preseed --keyboard fr-latin9
 
 passsetup:
 	[ ! -r /var/cache/debconf/passwords.dat ] && ( sudo chgrp $(USRGRP) /var/cache/debconf/passwords.dat ; sudo chmod g+r /var/cache/debconf/passwords.dat ) || true



More information about the evolvis-commits mailing list