dist/ubuntu: fix build error on Ubuntu 16.04
This commit is contained in:
parent
72aae6bf3b
commit
19a0e72752
Notes:
Pekka Enberg
2016-05-04 13:20:31 +03:00
backport: 1.1
6
dist/ubuntu/build_deb.sh
vendored
6
dist/ubuntu/build_deb.sh
vendored
@ -24,9 +24,15 @@ echo $VERSION > version
|
||||
|
||||
cp -a dist/ubuntu/debian debian
|
||||
cp dist/ubuntu/changelog.in debian/changelog
|
||||
cp dist/ubuntu/rules.in debian/rules
|
||||
sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog
|
||||
sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog
|
||||
sed -i -e "s/@@CODENAME@@/$CODENAME/g" debian/changelog
|
||||
if [ "$RELEASE" = "14.04" ]; then
|
||||
sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules
|
||||
else
|
||||
sed -i -e "s/@@DH_INSTALLINIT@@//g" debian/rules
|
||||
fi
|
||||
|
||||
echo Y | sudo mk-build-deps -i -r
|
||||
debuild -r fakeroot -us -uc
|
||||
|
4
dist/ubuntu/debian/control
vendored
4
dist/ubuntu/debian/control
vendored
@ -4,11 +4,11 @@ Homepage: http://scylladb.com
|
||||
Section: database
|
||||
Priority: optional
|
||||
Standards-Version: 3.9.5
|
||||
Build-Depends: debhelper (>= 9), maven, openjdk-7-jdk | java7-jdk | openjdk-8-jdk | java8-jdk
|
||||
Build-Depends: debhelper (>= 9), maven, default-jdk | java7-jdk | java8-jdk
|
||||
|
||||
Package: scylla-jmx
|
||||
Architecture: all
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-7-jre-headless | openjdk-8-jre-headless | java-runtime-headless, scylla-server
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java-runtime-headless, scylla-server
|
||||
Description: Scylla JMX server binaries
|
||||
Scylla is a highly scalable, eventually consistent, distributed,
|
||||
partitioned row DB.
|
||||
|
@ -24,7 +24,7 @@ override_dh_auto_install:
|
||||
cp $(CURDIR)/target/scylla-jmx-1.0.jar $(DEST)
|
||||
|
||||
override_dh_installinit:
|
||||
dh_installinit --no-start --upstart-only
|
||||
dh_installinit --no-start @@DH_INSTALLINIT@@
|
||||
|
||||
%:
|
||||
dh $@
|
Loading…
Reference in New Issue
Block a user