[Pkg-voip-commits] r6174 - in /tools/builder: ./ Makefile builder

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Sep  7 21:26:05 2008
New Revision: 6174

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6174
Log:
* Allow multiple archs/distros under the same directory 
  (and with the same tarballs directory)
* Set the default distribution to be lenny.

Modified:
    tools/builder/   (props changed)
    tools/builder/Makefile
    tools/builder/builder

Propchange: tools/builder/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep  7 21:26:05 2008
@@ -1,4 +1,4 @@
-repo
+repo-*
 build-area
 tarballs
-pbuilderrc
+pbuilderrc-*

Modified: tools/builder/Makefile
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/Makefile?rev=6174&op=diff
==============================================================================
--- tools/builder/Makefile (original)
+++ tools/builder/Makefile Sun Sep  7 21:26:05 2008
@@ -30,13 +30,14 @@
 # repository under repo/ .
 
 export ARCH		:= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-export BASE_DISTRO	= etch
+export DISTRO		= lenny
 export LOCAL_DISTRO	= unstable
 
-export LOCAL_REPO	= $(PWD)/repo
+export LOCAL_REPO	= $(PWD)/repo-$(ARCH)-$(DISTRO)
 export TARBALLS_DIR	= $(PWD)/tarballs
 
 export BUILD_AREA	= build-area
+PBUILDERRC		= pbuilderrc-$(ARCH)-$(DISTRO)
 
 MIRROR_HTTP		= http://ftp.de.debian.org/debian
 PBUILDER_CMD		= sudo pbuilder
@@ -44,7 +45,7 @@
 
 PBUILDER_DEBUG		=
 BUILDROOT_TGZ		= $(LOCAL_REPO)/buildroot.tgz
-export PBUILDER_PARAMS	= --configfile $(PWD)/pbuilderrc $(PBUILDER_DEBUG)
+export PBUILDER_PARAMS	= --configfile $(PWD)/$(PBUILDERRC) $(PBUILDER_DEBUG)
 # /home is bind-mounted in our current pbuilder configuration
 # thus files from it are also availble inside the chroot builder.
 # However if you're not on boole, you'll have to play tricks
@@ -124,7 +125,7 @@
 	reprepro -b $(LOCAL_REPO) export
 	touch $@
 
-$(BUILDROOT_TGZ): pbuilderrc $(LOCAL_REPO)/stamp
+$(BUILDROOT_TGZ): $(PBUILDERRC) $(LOCAL_REPO)/stamp
 	$(PBUILDER_CMD) create $(PBUILDER_PARAMS)
 
 update_buildroot: $(BUILDROOT_TGZ)
@@ -151,12 +152,12 @@
 # Should depend on Makefile. 
 # But I don't want to recreate the build root
 # on every little irrelevant Makefile change.
-pbuilderrc: 
+$(PBUILDERRC): 
 	#TODO: make this a templated file
 	echo '# generated file.Do not edit. Edit Makefile instead' >$@
 	echo BASETGZ=$(BUILDROOT_TGZ)          >>$@
 	echo BINDMOUNTS=$(LOCAL_REPO)          >>$@
-	echo DISTRIBUTION=$(BASE_DISTRO)       >>$@
+	echo DISTRIBUTION=$(DISTRO)            >>$@
 	echo MIRRORSITE=$(MIRROR_HTTP)         >>$@
 	echo "OTHERMIRROR=\"$(LOCAL_APT_SRC)\""  >>$@
 	echo DEBBUILDOPTS=\"-sa -uc -us\"      >>$@

Modified: tools/builder/builder
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/builder?rev=6174&op=diff
==============================================================================
--- tools/builder/builder (original)
+++ tools/builder/builder Sun Sep  7 21:26:05 2008
@@ -129,7 +129,7 @@
   version=`echo $full_version | cut -d- -f1`
 
   # A backporting script:
-  for hook_name in $BASE_DISTRO $BASE_DISTRO.xorcom; do
+  for hook_name in $DISTRO $DISTRO.xorcom; do
     hook=debian/backports/$hook_name
     if [ -x $hook ]; then
       $hook