Updated Branches: refs/heads/master 36e7a7884 -> a24ec2bdc
debian: Initial work to get the Debian packaging working again Right now it isn't working yet, but this is the way it should start working like the RPM package building is. This commit is to clean up the rules file a bit and lay the groundwork for the Debian packaging Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a24ec2bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a24ec2bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a24ec2bd Branch: refs/heads/master Commit: a24ec2bdcc625393eafee9b9aa40282bd727311a Parents: 36e7a78 Author: Wido den Hollander <[email protected]> Authored: Tue Nov 6 12:02:39 2012 +0100 Committer: Wido den Hollander <[email protected]> Committed: Tue Nov 6 16:19:07 2012 +0100 ---------------------------------------------------------------------- debian/rules | 106 ++++++++--------------------- packaging/debian/replace.properties | 62 +++++++++++++++++ 2 files changed, 91 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a24ec2bd/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index daacaf9..36b611d 100755 --- a/debian/rules +++ b/debian/rules @@ -16,77 +16,55 @@ export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS - - - - - configure: configure-stamp configure-stamp: dh_testdir - # 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 showconfig + cp packaging/debian/replace.properties build/replace.properties + echo VERSION=$VERSION >> build/replace.properties touch configure-stamp - -#Architecture -# build: build-arch build-indep build: build-arch build-arch: build-arch-stamp build-arch-stamp: configure-stamp - - # Add here commands to compile the arch part of the package. - ./waf build + mvn package -Dsystemvm touch $@ -# build-indep: build-indep-stamp -# build-indep-stamp: configure-stamp -# -# # Add here commands to compile the indep part of the package. -# #$(MAKE) doc -# touch $@ -# clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp configure-stamp - - # Add here commands to clean up after the build process. - ./waf distclean - dh_clean -install: install-arch -# install: install-indep install-arch -# install-indep: -# dh_testdir -# dh_testroot -# dh_prep -i -# dh_installdirs -i -# -# # Add here commands to install the indep part of the package into -# # debian/<package>-doc. -# #INSTALLDOC# -# -# dh_install -i - -install-arch: +install: dh_testdir dh_testroot - dh_prep -s + dh_prep -s + mkdir -p debian/tmp/usr/bin + mkdir -p debian/tmp/usr/share/cloud/management + mkdir -p debian/tmp/var/log/cloud + mkdir debian/tmp/var/log/cloud/managament + mkdir debian/tmp/var/log/cloud/awsapi + mkdir debian/tmp/var/log/cloud/agent + mkdir debian/tmp/var/log/cloud/ipallocator + mkdir debian/tmp/var/log/cloud/usage + mkdir -p debian/tmp/etc/cloud + mkdir debian/tmp/etc/cloud/agent + mkdir debian/tmp/etc/cloud/server + mkdir debian/tmp/etc/cloud/management + mkdir debian/tmp/etc/cloud/usage + mkdir -p debian/tmp/var/cache/cloud + mkdir debian/tmp/var/cache/cloud/management + mkdir -p debian/tmp/usr/share/cloud + mkdir debian/tmp/usr/share/cloud/setup + mkdir -p debian/tmp/usr/share/cloud/management/webapps/client + + cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/cloud/setup/ + cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* debian/tmp/usr/share/cloud/management/webapps/client/ dh_installdirs -s - - # Add here commands to install the arch part of the package into - # debian/tmp. - # we put the build number again here, otherwise state checking will cause an almost-full recompile - ./waf install --destdir=$(CURDIR)/debian/tmp install --nochown --build-number=$(BUILDNUMBER) - dh_install -s -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. + +binary: binary-common binary-common: dh_testdir dh_testroot @@ -95,39 +73,13 @@ binary-common: dh_installdocs DISCLAIMER dh_installdocs NOTICE dh_installdocs INSTALL.md -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl dh_makeshlibs dh_installdeb -# dh_shlibdeps dh_gencontrol dh_md5sums - mkdir -p ./artifacts/debs - dh_builddeb --destdir=$(CURDIR)/artifacts/debs -# Build architecture independant packages using the common target. -# binary-indep: build-indep install-indep -# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common - -# binary: binary-arch binary-indep -binary: binary-arch -# .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure -.PHONY: build clean binary-arch binary install install-arch configure + dh_builddeb http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a24ec2bd/packaging/debian/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties new file mode 100644 index 0000000..6520f63 --- /dev/null +++ b/packaging/debian/replace.properties @@ -0,0 +1,62 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +DBUSER=cloud +DBPW=cloud +DBROOTPW= +MSLOG=vmops.log +APISERVERLOG=api.log +DBHOST=localhost +MSMNTDIR=/mnt +COMPONENTS-SPEC=components-premium.xml +AWSAPILOG=awsapi.log +REMOTEHOST=localhost +AGENTCLASSPATH= +AGENTLOG=/var/log/cloud/agent/agent.log +AGENTLOGDIR=/var/log/cloud/agent/ +AGENTSYSCONFDIR=/etc/cloud/agent +APISERVERLOG=/var/log/cloud/management/apilog.log +AWSAPILOG=/var/log/cloud/awsapi/awsapi.log +BINDIR=/usr/bin +COMMONLIBDIR=/usr/share/java +CONFIGUREVARS= +DEPSCLASSPATH= +DOCDIR= +IPALOCATORLOG=/var/log/cloud/management/ipallocator.log +JAVADIR=/usr/share/java +LIBEXECDIR=/usr/libexec +LOCKDIR=/var/lock +MSCLASSPATH= +MSCONF=/etc/cloud/management +MSENVIRON=/usr/share/cloud/management +MSLOG=/var/log/cloud/management/management-server.log +MSLOGDIR=/var/log/cloud/management/ +MSMNTDIR=/var/lib/cloud/mnt +MSUSER=cloud +PIDDIR=/var/run +PLUGINJAVADIR= +PREMIUMJAVADIR= +PYTHONDIR=/usr/lib/python2.6/site-packages/ +SERVERSYSCONFDIR=/etc/cloud/server +SETUPDATADIR=/usr/share/cloud/setup +SYSCONFDIR=/etc +SYSTEMCLASSPATH= +SYSTEMJARS= +USAGECLASSPATH= +USAGELOG=/var/log/cloud/usage +USAGESYSCONFDIR=/etc/cloud/usage +PACKAGE=cloud
