From 556cb97e6a05a0562ff15a42d7538aaca8814e46 Mon Sep 17 00:00:00 2001 From: Christian Bayle Date: Thu, 20 May 2010 12:00:49 +0000 Subject: [PATCH 1/1] Make mirrors a possible env var --- tools/simple-cdd/Makefile | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/simple-cdd/Makefile b/tools/simple-cdd/Makefile index 8316f9e1ab..cc264573aa 100644 --- a/tools/simple-cdd/Makefile +++ b/tools/simple-cdd/Makefile @@ -2,6 +2,18 @@ USRGRP=$(shell id -g) 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 @@ endif 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 -- 2.30.2