CASSANDRA-14712 - Cassandra 4.0 packaging support

apache · Mar 28, 2019 · bc5c8e4 · bc5c8e4
1 parent df8e068
commit bc5c8e4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/debian/cassandra.install b/debian/cassandra.install
@@ -21,6 +21,8 @@ bin/sstablescrub usr/bin
 bin/sstableupgrade usr/bin
 bin/sstableverify usr/bin
 tools/bin/cassandra-stress usr/bin
+tools/bin/fqltool usr/bin
+tools/bin/auditlogviewer usr/bin
 lib/*.jar usr/share/cassandra/lib
 lib/*.zip usr/share/cassandra/lib
 lib/sigar-bin/* usr/share/cassandra/lib/sigar-bin

diff --git a/debian/rules b/debian/rules
@@ -51,6 +51,10 @@ install: build
 	dh_install build/tools/lib/stress.jar \
 		usr/share/cassandra
 
+	# Copy fqltool jars
+	dh_install build/tools/lib/fqltool.jar \
+		usr/share/cassandra
+
 	dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \
 		usr/share/cassandra/apache-cassandra.jar
 

diff --git a/redhat/cassandra b/redhat/cassandra
@@ -34,7 +34,7 @@ lock_file=/var/lock/subsys/$NAME
 CASSANDRA_PROG=/usr/sbin/cassandra
 
 # The first existing directory is used for JAVA_HOME if needed.
-JVM_SEARCH_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/jre-1.7.* /usr/lib/jvm/java-1.7.*/jre"
+JVM_SEARCH_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/jre-1.8.* /usr/lib/jvm/java-1.8.*/jre"
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME

diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
@@ -76,7 +76,6 @@ sed -i 's/^# hints_directory:/hints_directory:/' conf/cassandra.yaml
 # remove batch, powershell, and other files not being installed
 rm conf/*.ps1
 rm bin/*.bat
-rm bin/*.orig
 rm bin/*.ps1
 rm bin/cassandra.in.sh
 rm lib/sigar-bin/*winnt*  # strip segfaults on dll..
@@ -98,6 +97,9 @@ cp -pr lib/* %{buildroot}/usr/share/%{username}/lib/
 # copy stress jar
 cp -p build/tools/lib/stress.jar %{buildroot}/usr/share/%{username}/
 
+# copy fqltool jar
+cp -p build/tools/lib/fqltool.jar %{buildroot}/usr/share/%{username}/
+
 # copy binaries
 mv bin/cassandra %{buildroot}/usr/sbin/
 cp -p bin/* %{buildroot}/usr/bin/
@@ -173,6 +175,8 @@ This package contains extra tools for working with Cassandra clusters.
 %attr(755,root,root) %{_bindir}/sstableofflinerelevel
 %attr(755,root,root) %{_bindir}/sstablerepairedset
 %attr(755,root,root) %{_bindir}/sstablesplit
+%attr(755,root,root) %{_bindir}/auditlogviewer
+%attr(755,root,root) %{_bindir}/fqltool
 
 
 %changelog