andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Ubuntu 16.04 support" from Takuya

Browse Source
This commit is contained in:
Avi Kivity 2016-05-01 11:14:50 +03:00
commit 9f2f92c379
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/redhat/build_rpm.sh vendored
View File

@ -1,4 +1,4 @@
#!/bin/sh -e #!/bin/bash -e
RPMBUILD=`pwd`/build/rpmbuild RPMBUILD=`pwd`/build/rpmbuild

15
dist/ubuntu/build_deb.sh vendored
View File

@ -1,4 +1,4 @@
#!/bin/sh -e #!/bin/bash -e
if [ ! -e dist/ubuntu/build_deb.sh ]; then if [ ! -e dist/ubuntu/build_deb.sh ]; then
echo "run build_deb.sh in top of scylla dir" echo "run build_deb.sh in top of scylla dir"
@ -9,6 +9,10 @@ if [ -e debian ] || [ -e build ] || [ -e target ] || [ -e m2 ] || [ -e dependenc
rm -rf debian build target m2 dependency-reduced-pom.xml rm -rf debian build target m2 dependency-reduced-pom.xml
fi fi
DISTRIBUTION=`lsb_release -i|awk '{print $3}'`
RELEASE=`lsb_release -r|awk '{print $2}'`
CODENAME=`lsb_release -c|awk '{print $2}'`
VERSION=$(./SCYLLA-VERSION-GEN) VERSION=$(./SCYLLA-VERSION-GEN)
SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE | sed 's/\.rc/~rc/') SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE | sed 's/\.rc/~rc/')
SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE) SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
@ -20,8 +24,15 @@ echo $VERSION > version
cp -a dist/ubuntu/debian debian cp -a dist/ubuntu/debian debian
cp dist/ubuntu/changelog.in debian/changelog 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/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog
sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/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
sudo apt-get -y install debhelper maven openjdk-7-jdk devscripts echo Y | sudo mk-build-deps -i -r
debuild -r fakeroot -us -uc debuild -r fakeroot -us -uc

2
dist/ubuntu/changelog.in vendored
View File

@ -1,4 +1,4 @@
scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) trusty; urgency=medium scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) @@CODENAME@@; urgency=medium
* Initial release. * Initial release.

4
dist/ubuntu/debian/control vendored
View File

@ -4,11 +4,11 @@ Homepage: http://scylladb.com
Section: database Section: database
Priority: optional Priority: optional
Standards-Version: 3.9.5 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 Package: scylla-jmx
Architecture: all 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 Description: Scylla JMX server binaries
Scylla is a highly scalable, eventually consistent, distributed, Scylla is a highly scalable, eventually consistent, distributed,
partitioned row DB. partitioned row DB.

2
dist/ubuntu/debian/rules → dist/ubuntu/rules.in vendored
View File

@ -24,7 +24,7 @@ override_dh_auto_install:
cp $(CURDIR)/target/scylla-jmx-1.0.jar $(DEST) cp $(CURDIR)/target/scylla-jmx-1.0.jar $(DEST)
override_dh_installinit: override_dh_installinit:
dh_installinit --no-start --upstart-only dh_installinit --no-start @@DH_INSTALLINIT@@
%: %:
dh $@ dh $@