[Pkg-voip-commits] r6108 - in /tools/builder: ./ Makefile builder local_distributions sources
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Wed Aug 27 15:40:10 UTC 2008
Author: tzafrir-guest
Date: Wed Aug 27 15:40:10 2008
New Revision: 6108
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6108
Log:
Builder now works.
Added:
tools/builder/local_distributions
Modified:
tools/builder/ (props changed)
tools/builder/Makefile
tools/builder/builder
tools/builder/sources
Propchange: tools/builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 27 15:40:10 2008
@@ -1,0 +1,4 @@
+repo
+build-area
+tarballs
+pbuilderrc
Modified: tools/builder/Makefile
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/Makefile?rev=6108&op=diff
==============================================================================
--- tools/builder/Makefile (original)
+++ tools/builder/Makefile Wed Aug 27 15:40:10 2008
@@ -7,11 +7,15 @@
#
# Requirements:
#
-# reprepro pbuilder svn-buildpackage
+# reprepro pbuilder svn-buildpackage cdebootstrap
#
# If building with pbuilder (the recommended way. building asterisk and
# such without it on Etch is hopeless) pbuilder should be able to run
# with 'sudo pbuilder'
+#
+# E.g: the following line in /etc/sudoers:
+#
+# your_user ALL = NOPASSWD:/usr/sbin/pbuilder
#
# Usage:
#
@@ -30,12 +34,9 @@
export LOCAL_DISTRO = unstable
export LOCAL_REPO = $(PWD)/repo
+export TARBALLS_DIR = $(PWD)/tarballs
export BUILD_AREA = build-area
-export PACKAGE = $(shell head -n 1 package/debian/changelog | awk '{print $$1}')
-export DEBVERSION = $(shell head -n 1 package/debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/' -e 's/^[^:]*://')
-export CHANGES_FILE = $(BUILD_AREA)/$(PACKAGE)_$(DEBVERSION)_${ARCH}.changes
-export CD_DIR = debian-cd
MIRROR_HTTP = http://ftp.de.debian.org/debian
PBUILDER_CMD = sudo pbuilder
@@ -58,13 +59,16 @@
DEST_PACKAGES_LISTS = $(PACKAGE_LISTS:%=$(PACKAGE_DIR)/packages_%)
PACKAGE_CONFIGS = $(DEST_PACKAGES_LISTS) $(PACKAGE_DIR)/versions
-all:
- @echo "make build_sources: Rebuild local repository"
- @echo "make build_repo: Rebuild local repository (no pbuilder)"
- @echo " add PACKS=\"list of packages\" for a partial build".
- @echo "make list: List content of local repository ($(LOCAL_REPO)"
- @echo "make rm-zaptel: Remove zaptel packages from local repo."
- @echo "make update_buildroot Manually update the pbuilder's root tarball."
+all: help
+
+help:
+ @echo "Command missing. Try one of:"
+ @echo " make build_sources #Rebuild local repository"
+ @echo " make build_repo #Rebuild local repository (no pbuilder)"
+ @echo " add PACKS=\"list of packages\" for a partial build".
+ @echo " make list #List content of local repository ($(LOCAL_REPO)"
+ @#echo " make rm-zaptel #Remove zaptel packages from local repo."
+ @echo " make update_buildroot #Manually update the pbuilder's root tarball."
everything: clean build merge cdrom
@@ -108,11 +112,16 @@
mkdir -p $(@D)
touch $@
+tarballs_dir: $(TARBALLS_DIR)/stamp
+$(TARBALLS_DIR)/stamp:
+ mkdir -p $(TARBALLS_DIR)
+ touch $@
+
localrepo: $(LOCAL_REPO)/stamp
$(LOCAL_REPO)/stamp: $(LOCAL_REPO)/conf/updates $(LOCAL_REPO)/conf/distributions
# TODO: this target should provide an up-to-date repository.
# Currently it only guarantees a valid (possibly empty) one
- reprepro -b $(LOCAL_REPO) update
+ reprepro -b $(LOCAL_REPO) export
touch $@
$(BUILDROOT_TGZ): pbuilderrc $(LOCAL_REPO)/stamp
@@ -124,10 +133,10 @@
pbuilder_login: $(BUILDROOT_TGZ)
$(PBUILDER_CMD) login $(PBUILDER_PARAMS)
-build_sources: $(BUILDROOT_TGZ)
+build_sources: $(BUILDROOT_TGZ) tarballs_dir
USE_PBUILDER=yes $(BUILDER) $(PACKS)
-build_repo: localrepo
+build_repo: localrepo tarballs_dir
$(BUILDER) $(PACKS)
rm-zaptel:
@@ -153,11 +162,6 @@
echo DEBBUILDOPTS=\"-sa -uc -us\" >>$@
echo HOOKDIR=\"$(PWD)/tools/hooks\" >>$@
-createlocalrepo:
- #@echo "Updating $(PACKAGE) version $(DEBVERSION) into distro $(LOCAL_DISTRO)... '$(CHANGES_FILE)'"
- #reprepro -b $(LOCAL_REPO) --ignore=wrongdistribution include $(LOCAL_DISTRO) $(CHANGES_FILE)
-
-
list:
@reprepro -b $(LOCAL_REPO) listfilter $(LOCAL_DISTRO) 'Package'
@@ -167,4 +171,4 @@
distclean: clean
rm -rf $(LOCAL_REPO)
-.PHONY: clean distclean buildconf all listlocal update_buildroot localrepo
+.PHONY: clean distclean buildconf all listlocal update_buildroot localrepo tarballs_dir
Modified: tools/builder/builder
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/builder?rev=6108&op=diff
==============================================================================
--- tools/builder/builder (original)
+++ tools/builder/builder Wed Aug 27 15:40:10 2008
@@ -7,7 +7,6 @@
# we keep a place (on shared NFS) where all the tarballs are saved.
# may be a useful optimization
-TARBALLS_DIR=/home/svn/tarballs
BUILD_AREA=build-area
# Variables set in the Makefile:
@@ -15,6 +14,7 @@
# ARCH
# LOCAL_REPO
# LOCAL_DISTRO
+# TARBALLS_DIR
REPREPRO="reprepro -b $LOCAL_REPO"
say() {
Added: tools/builder/local_distributions
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/local_distributions?rev=6108&op=file
==============================================================================
--- tools/builder/local_distributions (added)
+++ tools/builder/local_distributions Wed Aug 27 15:40:10 2008
@@ -1,0 +1,10 @@
+Origin: PkgVoip
+# Label: PkgVoip
+Suite: unstable
+Codename: unstable
+# Version: 1.0
+Architectures: @ARCH@ source
+Components: main
+UDebComponents: main
+Description: pkg-voip team test repository
+Tracking: all includechanges
Modified: tools/builder/sources
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/sources?rev=6108&op=diff
==============================================================================
--- tools/builder/sources (original)
+++ tools/builder/sources Wed Aug 27 15:40:10 2008
@@ -51,7 +51,7 @@
# This little hack will be included separately. Anyway, there must be
# better ways to rebuild modules. Half the complexity of the script is
# special cases for building it.
-# zaptel-modules local branches/etch
+#tools/builder/zaptel-modules debian-pkg-voip ./
ari debian-pkg-voip trunk
op-panel debian-pkg-voip trunk
More information about the Pkg-voip-commits
mailing list