apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 10343 - 2.2.5 > 2.2.6 upgrade not working on Ubuntu 10.04 builds

Browse Source 
resolved fixed
This commit is contained in:
Frank 2011-06-20 10:11:16 -07:00
parent 336235e5e3
commit 8be80cf909
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/rules vendored
View File

@ -25,7 +25,7 @@ configure: configure-stamp
configure-stamp: configure-stamp:
dh_testdir dh_testdir
# Add here commands to configure the package. # Add here commands to configure the package.
./waf configure --prefix=/usr --libdir=/usr/lib --bindir=/usr/bin --javadir=/usr/share/java --sharedstatedir=/var/lib --localstatedir=/var --sysconfdir=/etc --mandir=/usr/share/man --libexecdir=/usr/bin --with-tomcat=/usr/share/tomcat6 --tomcat-user=cloud --fast ./waf configure --prefix=/usr --libdir=/usr/lib --bindir=/usr/bin --javadir=/usr/share/java --sharedstatedir=/var/lib --localstatedir=/var --sysconfdir=/etc --mandir=/usr/share/man --libexecdir=/usr/bin --with-tomcat=/usr/share/tomcat6 --tomcat-user=cloud --fast --package-version=$(PACKAGEVERSION)
./waf showconfig ./waf showconfig
touch configure-stamp touch configure-stamp
@ -38,7 +38,7 @@ build-arch: build-arch-stamp
build-arch-stamp: configure-stamp build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package. # Add here commands to compile the arch part of the package.
./waf build --build-number=$(BUILDNUMBER) ./waf build --build-number=$(BUILDNUMBER) --package-version=$(PACKAGEVERSION)
touch $@ touch $@
# build-indep: build-indep-stamp # build-indep: build-indep-stamp

6
wscript
View File

@ -610,6 +610,10 @@ def deb(context):
if Options.options.VERNUM: if Options.options.VERNUM:
VERSION = Options.options.VERNUM VERSION = Options.options.VERNUM
else:
VERSION = "2.2"
version = ["--set-envvar=PACKAGEVERSION=%s"%VERSION]
if Options.options.PRERELEASE: if Options.options.PRERELEASE:
if not buildnumber: if not buildnumber:
@ -658,7 +662,7 @@ def deb(context):
f.close() f.close()
checkdeps = lambda: c(["dpkg-checkbuilddeps"],srcdir) checkdeps = lambda: c(["dpkg-checkbuilddeps"],srcdir)
dodeb = lambda: c(["debuild",'-e','WAFCACHE','--no-lintian', '--no-tgz-check']+buildnumber+["-us","-uc"],srcdir) dodeb = lambda: c(["debuild",'-e','WAFCACHE','--no-lintian', '--no-tgz-check']+buildnumber+version+["-us","-uc"],srcdir)
try: checkdeps() try: checkdeps()
except (CalledProcessError,OSError),e: except (CalledProcessError,OSError),e:
Utils.pprint("YELLOW","Dependencies might be missing. Trying to auto-install them...") Utils.pprint("YELLOW","Dependencies might be missing. Trying to auto-install them...")