Skip to content

Commit 5b6a4a6

Browse files
widowido
committed
debian: Use some more variables in the rules file
Makes changes easier and it less hard coded.
1 parent 9e02ed1 commit 5b6a4a6

1 file changed

Lines changed: 69 additions & 68 deletions

File tree

‎debian/rules‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
1414
VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
1515
PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
1616
SYSCONFDIR = "/etc"
17+
DESTDIR = "debian/tmp"
1718

1819
# Uncomment this to turn on verbose mode.
1920
export DH_VERBOSE=1
@@ -50,86 +51,86 @@ install:
5051
dh_prep -s
5152

5253
# Common packages
53-
mkdir -p debian/tmp$(SYSCONFDIR)/$(PACKAGE)
54-
mkdir -p debian/tmp$(SYSCONFDIR)/init.d
55-
mkdir -p debian/tmp/var/cache/$(PACKAGE)
56-
mkdir -p debian/tmp/var/log/$(PACKAGE)
57-
mkdir -p debian/tmp/var/lib/$(PACKAGE)
58-
mkdir -p debian/tmp/usr/bin
59-
mkdir -p debian/tmp/usr/share
54+
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)
55+
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/init.d
56+
mkdir -p $(DESTDIR)/var/cache/$(PACKAGE)
57+
mkdir -p $(DESTDIR)/var/log/$(PACKAGE)
58+
mkdir -p $(DESTDIR)/var/lib/$(PACKAGE)
59+
mkdir -p $(DESTDIR)/usr/bin
60+
mkdir -p $(DESTDIR)/usr/share
6061

6162
# cloudstack-agent
62-
mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
63-
mkdir debian/tmp/var/log/$(PACKAGE)/agent
64-
mkdir debian/tmp/usr/share/$(PACKAGE)-agent
65-
mkdir debian/tmp/usr/share/$(PACKAGE)-agent/plugins
66-
install -D agent/target/cloud-agent-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
67-
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-agent/lib/
68-
install -D plugins/hypervisors/kvm/target/dependencies/* debian/tmp/usr/share/$(PACKAGE)-agent/lib/
69-
install -D packaging/debian/init/cloud-agent debian/tmp$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
70-
install -D agent/bindir/cloud-setup-agent.in debian/tmp/usr/bin/cloud-setup-agent
71-
install -D agent/bindir/cloud-ssh.in debian/tmp/usr/bin/cloud-ssh
72-
install -D agent/target/transformed/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
63+
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
64+
mkdir $(DESTDIR)/var/log/$(PACKAGE)/agent
65+
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent
66+
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins
67+
install -D agent/target/cloud-agent-4.2.0-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
68+
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.2.0-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
69+
install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
70+
install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
71+
install -D agent/bindir/cloud-setup-agent.in $(DESTDIR)/usr/bin/cloud-setup-agent
72+
install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloud-ssh
73+
install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
7374

7475
# cloudstack-management
75-
mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/server
76-
mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management
77-
mkdir -p debian/tmp/usr/share/$(PACKAGE)-management
78-
mkdir -p debian/tmp/usr/share/$(PACKAGE)-management/webapps/client
79-
mkdir debian/tmp/usr/share/$(PACKAGE)-management/setup
80-
mkdir debian/tmp/var/log/$(PACKAGE)/management
81-
mkdir debian/tmp/var/cache/$(PACKAGE)/management
82-
mkdir debian/tmp/var/cache/$(PACKAGE)/management/work
83-
mkdir debian/tmp/var/cache/$(PACKAGE)/management/temp
84-
mkdir debian/tmp/var/log/$(PACKAGE)/ipallocator
85-
mkdir debian/tmp/var/lib/$(PACKAGE)/management
86-
mkdir debian/tmp/var/lib/$(PACKAGE)/mnt
87-
cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/$(PACKAGE)-management/setup/
88-
cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* debian/tmp/usr/share/$(PACKAGE)-management/webapps/client/
89-
cp server/target/conf/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/server/
90-
cp client/target/conf/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management/
91-
ln -s tomcat6-nonssl.conf debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
92-
mkdir -p debian/tmp$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client
93-
install -D packaging/debian/init/cloud-management debian/tmp$(SYSCONFDIR)/init.d/$(PACKAGE)-management
94-
install -D client/bindir/cloud-update-xenserver-licenses.in debian/tmp/usr/bin/cloud-update-xenserver-licenses
95-
install -D server/target/cloud-server-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-management/lib/$(PACKAGE)-server.jar
96-
ln -s /usr/share/tomcat6/bin debian/tmp/usr/share/$(PACKAGE)-management/bin
97-
ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management debian/tmp/usr/share/$(PACKAGE)-management/conf
98-
ln -s /usr/share/tomcat6/lib debian/tmp/usr/share/$(PACKAGE)-management/lib
99-
ln -s ../../../var/log/$(PACKAGE)/management debian/tmp/usr/share/$(PACKAGE)-management/logs
100-
ln -s ../../../var/cache/$(PACKAGE)/management/temp debian/tmp/usr/share/$(PACKAGE)-management/temp
101-
ln -s ../../../var/cache/$(PACKAGE)/management/work debian/tmp/usr/share/$(PACKAGE)-management/work
76+
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server
77+
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management
78+
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management
79+
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client
80+
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
81+
mkdir $(DESTDIR)/var/log/$(PACKAGE)/management
82+
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management
83+
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management/work
84+
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management/temp
85+
mkdir $(DESTDIR)/var/log/$(PACKAGE)/ipallocator
86+
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management
87+
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt
88+
cp -r client/target/utilities/scripts/db/* $(DESTDIR)/usr/share/$(PACKAGE)-management/setup/
89+
cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/
90+
cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
91+
cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
92+
ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
93+
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client
94+
install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
95+
install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
96+
install -D server/target/cloud-server-4.2.0-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/$(PACKAGE)-server.jar
97+
ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
98+
ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf
99+
ln -s /usr/share/tomcat6/lib $(DESTDIR)/usr/share/$(PACKAGE)-management/lib
100+
ln -s ../../../var/log/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/logs
101+
ln -s ../../../var/cache/$(PACKAGE)/management/temp $(DESTDIR)/usr/share/$(PACKAGE)-management/temp
102+
ln -s ../../../var/cache/$(PACKAGE)/management/work $(DESTDIR)/usr/share/$(PACKAGE)-management/work
102103

103104
# cloudstack-common
104-
mkdir -p debian/tmp/usr/share/$(PACKAGE)-common
105-
mkdir debian/tmp/usr/share/$(PACKAGE)-common/scripts
106-
mkdir debian/tmp/usr/share/$(PACKAGE)-common/setup
107-
cp -r scripts/installer debian/tmp/usr/share/$(PACKAGE)-common/scripts
108-
cp -r scripts/network debian/tmp/usr/share/$(PACKAGE)-common/scripts
109-
cp -r scripts/storage debian/tmp/usr/share/$(PACKAGE)-common/scripts
110-
cp -r scripts/util debian/tmp/usr/share/$(PACKAGE)-common/scripts
111-
cp -r scripts/vm debian/tmp/usr/share/$(PACKAGE)-common/scripts
112-
install -D client/target/utilities/bin/cloud-migrate-databases debian/tmp/usr/bin
113-
install -D client/target/utilities/bin/cloud-set-guest-password debian/tmp/usr/bin
114-
install -D client/target/utilities/bin/cloud-set-guest-sshkey debian/tmp/usr/bin
115-
install -D client/target/utilities/bin/cloud-setup-databases debian/tmp/usr/bin
116-
install -D client/target/utilities/bin/cloud-setup-management debian/tmp/usr/bin
117-
install -D services/console-proxy/server/dist/systemvm.iso debian/tmp/usr/share/$(PACKAGE)-common/vms/systemvm.iso
105+
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common
106+
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
107+
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/setup
108+
cp -r scripts/installer $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
109+
cp -r scripts/network $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
110+
cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
111+
cp -r scripts/util $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
112+
cp -r scripts/vm $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
113+
install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin
114+
install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin
115+
install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin
116+
install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin
117+
install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin
118+
install -D services/console-proxy/server/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
118119

119120
# cloudstack-python
120-
mkdir -p debian/tmp/usr/lib/python2.7/dist-packages
121-
cp -r python/lib/cloud* debian/tmp/usr/lib/python2.7/dist-packages
121+
mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages
122+
cp -r python/lib/cloud* $(DESTDIR)/usr/lib/python2.7/dist-packages
122123

123124
# cloudstack-usage
124-
mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/usage
125-
mkdir debian/tmp/var/log/$(PACKAGE)/usage
126-
install -D usage/target/cloud-usage-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
127-
cp usage/target/transformed/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/usage/
128-
ln -s ../management/db.properties debian/tmp$(SYSCONFDIR)/$(PACKAGE)/usage/db.properties
129-
install -D packaging/debian/init/cloud-usage debian/tmp$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
125+
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage
126+
mkdir $(DESTDIR)/var/log/$(PACKAGE)/usage
127+
install -D usage/target/cloud-usage-4.2.0-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
128+
cp usage/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
129+
ln -s ../management/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/db.properties
130+
install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
130131

131132
# cloudstack-awsapi
132-
mkdir debian/tmp/var/log/$(PACKAGE)/awsapi
133+
mkdir $(DESTDIR)/var/log/$(PACKAGE)/awsapi
133134

134135
dh_installdirs
135136
dh_install

0 commit comments

Comments
 (0)