From 90666cf558f0548ca21fa3761029d72e9939ecb4 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Mon, 19 Oct 2015 04:32:33 +0000 Subject: [PATCH] dist: add scylla-env package for CentOS, to use /opt/scylladb as prefix Signed-off-by: Takuya ASADA --- dist/redhat/build_rpm.sh | 1 + dist/redhat/centos_dep/build_dependency.sh | 8 ++++ .../ld.so.conf.d/scylla.x86_64.conf | 1 + .../scylla-env-1.0/profile.d/scylla.csh | 2 + .../scylla-env-1.0/profile.d/scylla.sh | 1 + dist/redhat/centos_dep/scylla-env.spec | 40 +++++++++++++++++++ 6 files changed, 53 insertions(+) create mode 100644 dist/redhat/centos_dep/scylla-env-1.0/ld.so.conf.d/scylla.x86_64.conf create mode 100644 dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.csh create mode 100644 dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.sh create mode 100644 dist/redhat/centos_dep/scylla-env.spec diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh index 6f3f5c9d00..af24c45fe2 100755 --- a/dist/redhat/build_rpm.sh +++ b/dist/redhat/build_rpm.sh @@ -37,6 +37,7 @@ if [ "$OS" = "Fedora" ]; then rpmbuild -bs --define "_topdir $RPMBUILD" $RPMBUILD/SPECS/scylla-server.spec mock rebuild --resultdir=`pwd`/build/rpms $RPMBUILD/SRPMS/scylla-server-$VERSION*.src.rpm else + . /etc/profile.d/scylla.sh sudo yum-builddep -y $RPMBUILD/SPECS/scylla-server.spec rpmbuild -ba --define "_topdir $RPMBUILD" $RPMBUILD/SPECS/scylla-server.spec fi diff --git a/dist/redhat/centos_dep/build_dependency.sh b/dist/redhat/centos_dep/build_dependency.sh index 5efd317a09..10221f3969 100755 --- a/dist/redhat/centos_dep/build_dependency.sh +++ b/dist/redhat/centos_dep/build_dependency.sh @@ -51,6 +51,14 @@ sudo yum install -y flex bison dejagnu zlib-static glibc-static sharutils bc lib sudo yum install -y gcc-objc sudo yum install -y asciidoc +if [ ! -f $RPMBUILD/RPMS/noarch/scylla-env-1.0-1.el7.centos.noarch.rpm ]; then + cd dist/redhat/centos_dep + tar cpf $RPMBUILD/SOURCES/scylla-env-1.0.tar scylla-env-1.0 + cd - + rpmbuild --define "_topdir $RPMBUILD" --ba dist/redhat/centos_dep/scylla-env.spec +fi +do_install scylla-env-1.0-1.el7.centos.noarch.rpm + if [ ! -f $RPMBUILD/RPMS/x86_64/binutils-2.25-5.el7.centos.x86_64.rpm ]; then rpmbuild --define "_topdir $RPMBUILD" --rebuild build/srpms/binutils-2.25-5.fc22.src.rpm fi diff --git a/dist/redhat/centos_dep/scylla-env-1.0/ld.so.conf.d/scylla.x86_64.conf b/dist/redhat/centos_dep/scylla-env-1.0/ld.so.conf.d/scylla.x86_64.conf new file mode 100644 index 0000000000..4add5ec642 --- /dev/null +++ b/dist/redhat/centos_dep/scylla-env-1.0/ld.so.conf.d/scylla.x86_64.conf @@ -0,0 +1 @@ +/opt/scylladb/lib64 diff --git a/dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.csh b/dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.csh new file mode 100644 index 0000000000..a4aa717bbf --- /dev/null +++ b/dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.csh @@ -0,0 +1,2 @@ +set path = ($PATH /opt/scylladb/bin /opt/scylladb/sbin) + diff --git a/dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.sh b/dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.sh new file mode 100644 index 0000000000..7b5870e353 --- /dev/null +++ b/dist/redhat/centos_dep/scylla-env-1.0/profile.d/scylla.sh @@ -0,0 +1 @@ +export PATH=$PATH:/opt/scylladb/bin:/opt/scylladb/sbin diff --git a/dist/redhat/centos_dep/scylla-env.spec b/dist/redhat/centos_dep/scylla-env.spec new file mode 100644 index 0000000000..3c11e4163b --- /dev/null +++ b/dist/redhat/centos_dep/scylla-env.spec @@ -0,0 +1,40 @@ +Name: scylla-env +Version: 1.0 +Release: 1%{?dist} +Summary: Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB. + +Group: Applications/Databases +License: AGPLv3 +URL: http://www.scylladb.com/ +Source0: scylla-env-1.0.tar +BuildArch: noarch + +%description + + +%prep +%setup -q + + +%build + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d +install -m 644 profile.d/* $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 644 ld.so.conf.d/* $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d + +%post +%{_sbindir}/ldconfig + +%files +%doc +%{_sysconfdir}/profile.d/scylla.sh +%{_sysconfdir}/profile.d/scylla.csh +%{_sysconfdir}/ld.so.conf.d/scylla.x86_64.conf + + +%changelog +