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

Revert "dist: Rename package to scylla-enterprise-jmx"

Browse Source 
This reverts commit df65f40bcd. Committed on
wrong branch.
This commit is contained in:
Avi Kivity 2018-03-27 22:17:43 +03:00
parent df65f40bcd
commit 8d499401f0
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/debian/build_deb.sh vendored
View File

@ -92,7 +92,7 @@ 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)
echo $VERSION > version echo $VERSION > version
./scripts/git-archive-all --extra version --force-submodules --prefix scylla-enterprise-jmx ../scylla-enterprise-jmx_$SCYLLA_VERSION-$SCYLLA_RELEASE.orig.tar.gz ./scripts/git-archive-all --extra version --force-submodules --prefix scylla-jmx ../scylla-jmx_$SCYLLA_VERSION-$SCYLLA_RELEASE.orig.tar.gz
cp -a dist/debian/debian debian cp -a dist/debian/debian debian
cp dist/debian/changelog.in debian/changelog cp dist/debian/changelog.in debian/changelog

2
dist/debian/changelog.in vendored
View File

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

8
dist/debian/debian/control vendored
View File

@ -1,4 +1,4 @@
Source: scylla-enterprise-jmx Source: scylla-jmx
Maintainer: Takuya ASADA <syuu@scylladb.com> Maintainer: Takuya ASADA <syuu@scylladb.com>
Homepage: http://scylladb.com Homepage: http://scylladb.com
Section: database Section: database
@ -6,11 +6,9 @@ Priority: optional
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9), maven, openjdk-8-jdk-headless Build-Depends: debhelper (>= 9), maven, openjdk-8-jdk-headless
Package: scylla-enterprise-jmx Package: scylla-jmx
Architecture: all Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default, scylla-enterprise-server Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default, scylla-server
Conflicts: scylla-jmx (<< 2.2)
Replaces: scylla-jmx (<< 2.2)
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.

10
dist/debian/rules.in vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
DOC = $(CURDIR)/debian/scylla-enterprise-jmx/usr/share/doc/scylla-jmx DOC = $(CURDIR)/debian/scylla-jmx/usr/share/doc/scylla-jmx
DEST = $(CURDIR)/debian/scylla-enterprise-jmx/usr/lib/scylla/jmx DEST = $(CURDIR)/debian/scylla-jmx/usr/lib/scylla/jmx
M2_REPO= $(CURDIR)/m2 M2_REPO= $(CURDIR)/m2
override_dh_auto_build: override_dh_auto_build:
@ -11,9 +11,9 @@ override_dh_auto_clean:
rm -rf target m2 rm -rf target m2
override_dh_auto_install: override_dh_auto_install:
mkdir -p $(CURDIR)/debian/scylla-enterprise-jmx/etc/default/ && \ mkdir -p $(CURDIR)/debian/scylla-jmx/etc/default/ && \
cp $(CURDIR)/dist/common/sysconfig/scylla-jmx \ cp $(CURDIR)/dist/common/sysconfig/scylla-jmx \
$(CURDIR)/debian/scylla-enterprise-jmx/etc/default/ $(CURDIR)/debian/scylla-jmx/etc/default/
mkdir -p $(DOC) && \ mkdir -p $(DOC) && \
cp $(CURDIR)/*.md $(DOC) cp $(CURDIR)/*.md $(DOC)
@ -26,7 +26,7 @@ override_dh_auto_install:
ln -sf /usr/bin/java $(DEST)/symlinks/scylla-jmx ln -sf /usr/bin/java $(DEST)/symlinks/scylla-jmx
override_dh_installinit: override_dh_installinit:
dh_installinit --no-start --name scylla-jmx @@DH_INSTALLINIT@@ dh_installinit --no-start @@DH_INSTALLINIT@@
%: %:
dh $@ dh $@

12
dist/redhat/build_rpm.sh vendored
View File

@ -62,10 +62,10 @@ fi
VERSION=$(./SCYLLA-VERSION-GEN) VERSION=$(./SCYLLA-VERSION-GEN)
SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE) SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE)
SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE) SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
git archive --format=tar --prefix=scylla-enterprise-jmx-$SCYLLA_VERSION/ HEAD -o build/scylla-enterprise-jmx-$VERSION.tar git archive --format=tar --prefix=scylla-jmx-$SCYLLA_VERSION/ HEAD -o build/scylla-jmx-$VERSION.tar
cp dist/redhat/scylla-jmx.spec.in build/scylla-enterprise-jmx.spec cp dist/redhat/scylla-jmx.spec.in build/scylla-jmx.spec
sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" build/scylla-enterprise-jmx.spec sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" build/scylla-jmx.spec
sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" build/scylla-enterprise-jmx.spec sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" build/scylla-jmx.spec
sudo mock --buildsrpm --root=$TARGET --resultdir=`pwd`/build/srpms --spec=build/scylla-enterprise-jmx.spec --sources=build/scylla-enterprise-jmx-$VERSION.tar sudo mock --buildsrpm --root=$TARGET --resultdir=`pwd`/build/srpms --spec=build/scylla-jmx.spec --sources=build/scylla-jmx-$VERSION.tar
sudo mock --rebuild --root=$TARGET --resultdir=`pwd`/build/rpms build/srpms/scylla-enterprise-jmx-$VERSION*.src.rpm sudo mock --rebuild --root=$TARGET --resultdir=`pwd`/build/rpms build/srpms/scylla-jmx-$VERSION*.src.rpm

5
dist/redhat/scylla-jmx.spec.in vendored
View File

@ -1,4 +1,4 @@
Name: scylla-enterprise-jmx Name: scylla-jmx
Version: @@VERSION@@ Version: @@VERSION@@
Release: @@RELEASE@@%{?dist} Release: @@RELEASE@@%{?dist}
Summary: Scylla JMX Summary: Scylla JMX
@ -10,8 +10,7 @@ Source0: %{name}-@@VERSION@@-@@RELEASE@@.tar
BuildArch: noarch BuildArch: noarch
BuildRequires: maven systemd-units java-1.8.0-openjdk-devel BuildRequires: maven systemd-units java-1.8.0-openjdk-devel
Requires: scylla-enterprise-server java-1.8.0-openjdk-headless Requires: scylla-server java-1.8.0-openjdk-headless
Obsoletes: scylla-jmx < 2.2
%description %description