Patchwork UBUNTU: [packaging] do not use ../.$(series)-env file

login
register
mail settings
Submitter Kamal Mostafa
Date March 13, 2013, 10:20 p.m.
Message ID <1363213204-5176-1-git-send-email-kamal@canonical.com>
Download mbox | patch
Permalink /patch/227358/
State New
Headers show

Comments

Kamal Mostafa - March 13, 2013, 10:20 p.m.
Trying to use a file from ../ outside the tree seems like a bad idea, and
the series="oneiric" value here is stale by three releases now.  Kill this
apparently unused "feature".

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 debian/rules.d/0-common-vars.mk |   11 -----------
 1 file changed, 11 deletions(-)
Tim Gardner - March 14, 2013, 12:38 p.m.
Raring master-next and unstable-3.9

Remember the good ole days when we didn't have these giant servers to do 
our builds ? We tried to squeak out every last cycle from our under 
powered desktops using distcc and ccache. Even so Hardy would take 90 
minutes or so to build.

rtg
Andy Whitcroft - March 28, 2013, 9:49 a.m.
On Thu, Mar 14, 2013 at 06:38:35AM -0600, Tim Gardner wrote:
> Raring master-next and unstable-3.9
> 
> Remember the good ole days when we didn't have these giant servers
> to do our builds ? We tried to squeak out every last cycle from our
> under powered desktops using distcc and ccache. Even so Hardy would
> take 90 minutes or so to build.

Ahh those were the days.  For fun we should try and build raring on that
same box ... from the size of the .orig.gz these days I assume it would
take about 4x as long.

-apw

Patch

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 65c5562..c2dfe6c 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -4,7 +4,6 @@ 
 src_pkg_name=$(shell sed -n '1s/^\(.*\) (.*).*$$/\1/p' $(DEBIAN)/changelog)
 
 # Get some version info
-series := oneiric
 release := $(shell sed -n '1s/^$(src_pkg_name).*(\(.*\)-.*).*$$/\1/p' $(DEBIAN)/changelog)
 revisions := $(shell sed -n 's/^$(src_pkg_name)\ .*($(release)-\(.*\)).*$$/\1/p' $(DEBIAN)/changelog | tac)
 revision ?= $(word $(words $(revisions)),$(revisions))
@@ -25,16 +24,6 @@  family=ubuntu
 # or configs.
 AUTOBUILD=
 
-#
-# This is a way to support some external variables. A good example is
-# a local setup for ccache and distcc See LOCAL_ENV_CC and
-# LOCAL_ENV_DISTCC_HOSTS in the definition of kmake.
-# For example:
-#      LOCAL_ENV_CC="ccache distcc"
-#      LOCAL_ENV_DISTCC_HOSTS="localhost 10.0.2.5 10.0.2.221"
-#
--include $(CURDIR)/../.$(series)-env
-
 ifneq ($(AUTOBUILD),)
 skipabi		= true
 skipmodule	= true