BIGTOP-1827. Tachyon package name conflict on Debian/Ubuntu Signed-off-by: Konstantin Boudnik <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f69e8f3d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f69e8f3d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f69e8f3d Branch: refs/heads/master Commit: f69e8f3d2b2972e7501f6b78275d8b07c20ef425 Parents: 8239a3a Author: Evans Ye <[email protected]> Authored: Thu Apr 30 20:07:28 2015 +0000 Committer: Konstantin Boudnik <[email protected]> Committed: Fri May 1 16:14:36 2015 -0700 ---------------------------------------------------------------------- .../puppet/modules/tachyon/manifests/init.pp | 12 +++---- bigtop-packages/src/deb/tachyon/control | 4 +-- bigtop-packages/src/deb/tachyon/rules | 3 ++ .../src/deb/tachyon/tachyon-tfs.dirs | 4 +++ .../src/deb/tachyon/tachyon-tfs.install | 3 ++ .../src/deb/tachyon/tachyon-tfs.postinst | 32 +++++++++++++++++ .../src/deb/tachyon/tachyon-tfs.prerm | 37 ++++++++++++++++++++ bigtop-packages/src/deb/tachyon/tachyon.dirs | 3 -- bigtop-packages/src/deb/tachyon/tachyon.install | 3 -- .../src/deb/tachyon/tachyon.postinst | 32 ----------------- bigtop-packages/src/deb/tachyon/tachyon.prerm | 37 -------------------- .../src/rpm/tachyon/SPECS/tachyon.spec | 35 +++++++++--------- bigtop.mk | 4 +-- 13 files changed, 107 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp index 2e525fe..8d53b25 100644 --- a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp @@ -11,7 +11,7 @@ # limitations under the License. class tachyon { class common ($master_host){ - package { "tachyon": + package { "tachyon-tfs": ensure => latest, } @@ -19,13 +19,13 @@ class tachyon { file { "/etc/tachyon/conf/log4j.properties": content => template("tachyon/log4j.properties"), - require => [Package["tachyon"]] + require => [Package["tachyon-tfs"]] } # add tachyon-env.sh to point to tachyon master file { "/etc/tachyon/conf/tachyon-env.sh": content => template("tachyon/tachyon-env.sh"), - require => [Package["tachyon"]] + require => [Package["tachyon-tfs"]] } } @@ -35,13 +35,13 @@ class tachyon { exec { "tachyon formatting": command => "/usr/lib/tachyon/bin/tachyon format", - require => [ Package["tachyon"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ] + require => [ Package["tachyon-tfs"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ] } if ( $fqdn == $tachyon::common::master_host ) { service { "tachyon-master": ensure => running, - require => [ Package["tachyon"], Exec["tachyon formatting"] ], + require => [ Package["tachyon-tfs"], Exec["tachyon formatting"] ], hasrestart => true, hasstatus => true, } @@ -60,7 +60,7 @@ class tachyon { service { "tachyon-worker": ensure => running, - require => [ Package["tachyon"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ], + require => [ Package["tachyon-tfs"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ], hasrestart => true, hasstatus => true, } http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/control b/bigtop-packages/src/deb/tachyon/control index 38a5198..061239b 100644 --- a/bigtop-packages/src/deb/tachyon/control +++ b/bigtop-packages/src/deb/tachyon/control @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -Source: tachyon +Source: tachyon-tfs Section: misc Priority: extra Maintainer: Huamin Chen <[email protected]> @@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.9.4 Homepage: http://tachyon-project.org -Package: tachyon +Package: tachyon-tfs Architecture: all Depends: bigtop-utils (>= 0.7) Description: Reliable file sharing at memory speed across cluster frameworks http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/rules b/bigtop-packages/src/deb/tachyon/rules index 2b0cb04..6611f7d 100755 --- a/bigtop-packages/src/deb/tachyon/rules +++ b/bigtop-packages/src/deb/tachyon/rules @@ -38,3 +38,6 @@ override_dh_auto_install: --libexec-dir=/usr/lib/tachyon/libexec \ --var-dir= /var/ \ --prefix=debian/tmp + mkdir -p debian/tachyon-tfs/etc/init.d/ + bash debian/init.d.tmpl debian/tachyon-master.svc deb debian/tachyon-tfs/etc/init.d/tachyon-master + bash debian/init.d.tmpl debian/tachyon-worker.svc deb debian/tachyon-tfs/etc/init.d/tachyon-worker http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon-tfs.dirs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon-tfs.dirs b/bigtop-packages/src/deb/tachyon/tachyon-tfs.dirs new file mode 100644 index 0000000..b05374b --- /dev/null +++ b/bigtop-packages/src/deb/tachyon/tachyon-tfs.dirs @@ -0,0 +1,4 @@ +/etc/tachyon/conf +/usr/lib/tachyon +/usr/bin +/var/run/tachyon http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon-tfs.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon-tfs.install b/bigtop-packages/src/deb/tachyon/tachyon-tfs.install new file mode 100644 index 0000000..473e2f5 --- /dev/null +++ b/bigtop-packages/src/deb/tachyon/tachyon-tfs.install @@ -0,0 +1,3 @@ +/etc/tachyon/conf +/usr/lib/tachyon +/usr/bin/tachyon http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon-tfs.postinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon-tfs.postinst b/bigtop-packages/src/deb/tachyon/tachyon-tfs.postinst new file mode 100644 index 0000000..a2078db --- /dev/null +++ b/bigtop-packages/src/deb/tachyon/tachyon-tfs.postinst @@ -0,0 +1,32 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -e + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon-tfs.prerm ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon-tfs.prerm b/bigtop-packages/src/deb/tachyon/tachyon-tfs.prerm new file mode 100644 index 0000000..4ba1a94 --- /dev/null +++ b/bigtop-packages/src/deb/tachyon/tachyon-tfs.prerm @@ -0,0 +1,37 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -e + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon.dirs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon.dirs b/bigtop-packages/src/deb/tachyon/tachyon.dirs deleted file mode 100644 index fc644d3..0000000 --- a/bigtop-packages/src/deb/tachyon/tachyon.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/etc/tachyon/conf -/usr/lib/tachyon -/usr/bin http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon.install b/bigtop-packages/src/deb/tachyon/tachyon.install deleted file mode 100644 index 473e2f5..0000000 --- a/bigtop-packages/src/deb/tachyon/tachyon.install +++ /dev/null @@ -1,3 +0,0 @@ -/etc/tachyon/conf -/usr/lib/tachyon -/usr/bin/tachyon http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon.postinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon.postinst b/bigtop-packages/src/deb/tachyon/tachyon.postinst deleted file mode 100644 index a2078db..0000000 --- a/bigtop-packages/src/deb/tachyon/tachyon.postinst +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/deb/tachyon/tachyon.prerm ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/tachyon/tachyon.prerm b/bigtop-packages/src/deb/tachyon/tachyon.prerm deleted file mode 100644 index 4ba1a94..0000000 --- a/bigtop-packages/src/deb/tachyon/tachyon.prerm +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec b/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec index 5878f93..f5ee435 100644 --- a/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec +++ b/bigtop-packages/src/rpm/tachyon/SPECS/tachyon.spec @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -Name: tachyon +Name: tachyon-tfs Version: %{tachyon_version} Release: %{tachyon_release} Summary: Reliable file sharing at memory speed across cluster frameworks @@ -22,17 +22,18 @@ URL: http://tachyon-project.org/ Group: Development/Libraries BuildArch: noarch -Source0: %{name}-%{tachyon_base_version}.tar.gz +Source0: %{tachyon_name}-%{tachyon_base_version}.tar.gz Source1: do-component-build Source2: install_tachyon.sh Source3: init.d.tmpl Source4: tachyon-master.svc Source5: tachyon-worker.svc -%define tachyon_home /usr/lib/%{name} +%define tachyon_name tachyon +%define tachyon_home /usr/lib/%{tachyon_name} %define tachyon_services master worker -%define var_lib /var/lib/%{name} -%define var_run /var/run/%{name} -%define var_log /var/log/%{name} +%define var_lib /var/lib/%{tachyon_name} +%define var_run /var/run/%{tachyon_name} +%define var_log /var/log/%{tachyon_name} %global initd_dir %{_sysconfdir}/init.d @@ -67,7 +68,7 @@ avoids going to disk to load data-sets that are frequently read. %prep -%setup -n %{name}-%{tachyon_base_version} +%setup -n %{tachyon_name}-%{tachyon_base_version} %build bash $RPM_SOURCE_DIR/do-component-build @@ -88,15 +89,15 @@ bash %{SOURCE2} \ for service in %{tachyon_services} do # Install init script - init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service} + init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{tachyon_name}-${service} bash $RPM_SOURCE_DIR/init.d.tmpl $RPM_SOURCE_DIR/tachyon-${service}.svc rpm $init_file done %preun for service in %{tachyon_services}; do - /sbin/service %{name}-${service} status > /dev/null 2>&1 + /sbin/service %{tachyon_name}-${service} status > /dev/null 2>&1 if [ $? -eq 0 ]; then - /sbin/service %{name}-${service} stop > /dev/null 2>&1 + /sbin/service %{tachyon_name}-${service} stop > /dev/null 2>&1 fi done @@ -104,12 +105,12 @@ done %files %defattr(-,root,root,-) %doc LICENSE README.md -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/conf/log4j.properties -%config(noreplace) %{_sysconfdir}/%{name}/conf/workers -%config(noreplace) %{initd_dir}/%{name}-master -%config(noreplace) %{initd_dir}/%{name}-worker -%config(noreplace) %{_sysconfdir}/%{name}/conf/tachyon-env.sh +%dir %{_sysconfdir}/%{tachyon_name} +%config(noreplace) %{_sysconfdir}/%{tachyon_name}/conf/log4j.properties +%config(noreplace) %{_sysconfdir}/%{tachyon_name}/conf/workers +%config(noreplace) %{initd_dir}/%{tachyon_name}-master +%config(noreplace) %{initd_dir}/%{tachyon_name}-worker +%config(noreplace) %{_sysconfdir}/%{tachyon_name}/conf/tachyon-env.sh %config(noreplace) %{tachyon_home}/libexec/tachyon-layout.sh %attr(0755,root,root) %{var_lib} %attr(0755,root,root) %{var_run} @@ -117,7 +118,7 @@ done %{tachyon_home}/tachyon* %{tachyon_home}/bin/tachyon* %{tachyon_home}/libexec/tachyon* -%{_datadir}/%{name} +%{_datadir}/%{tachyon_name} /usr/bin/tachyon %{tachyon_home}/share http://git-wip-us.apache.org/repos/asf/bigtop/blob/f69e8f3d/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 870d8f6..8866a05 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -336,9 +336,9 @@ BIGTOP_TOMCAT_ARCHIVE=$(APACHE_ARCHIVE)/tomcat/tomcat-6/v$(BIGTOP_TOMCAT_BASE_VE $(eval $(call PACKAGE,bigtop-tomcat,BIGTOP_TOMCAT)) # Tachyon -TACHYON_NAME=tachyon +TACHYON_NAME=tachyon-tfs TACHYON_RELNOTES_NAME=Tachyon: a memory-centric distributed file system -TACHYON_PKG_NAME=tachyon +TACHYON_PKG_NAME=tachyon-tfs TACHYON_BASE_VERSION=0.6.0 TACHYON_PKG_VERSION=0.6.0 TACHYON_RELEASE_VERSION=1
