Author: rvs
Date: Thu Sep 8 21:19:24 2011
New Revision: 1166910
URL: http://svn.apache.org/viewvc?rev=1166910&view=rev
Log:
BIGTOP-87. The following packages don't remove alternatives: flume, hadoop-pig,
hadoop-hive, hadoop-hbase
Added:
incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm
- copied, changed from r1166447,
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm
- copied, changed from r1166447,
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.postinst
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.preinst
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm (from
r1166447,
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm&r1=1166447&r2=1166910&rev=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm Thu Sep 8
21:19:24 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# prerm script for hbase
+# prerm script for hadoop
#
# see: dh_installdeb(1)
@@ -35,7 +35,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- unlink /usr/lib/hbase/logs
+ update-alternatives --remove flume-conf /etc/flume/conf.empty
;;
failed-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs Thu
Sep 8 21:19:24 2011
@@ -1,3 +1,4 @@
/usr/bin
/var/log/hbase
+/var/run/hbase
/etc/default
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
Thu Sep 8 21:19:24 2011
@@ -21,15 +21,7 @@ set -e
case "$1" in
configure)
- install -d -m 0755 -o hbase -g hbase /var/log/hbase
- install -d -m 0755 -o hbase -g hbase /var/run/hbase
- rm -f /usr/lib/hbase/logs || :
- rm -f /usr/lib/hbase/pids || :
-
chown hbase:hbase -R /var/run/hbase /var/log/hbase
- ln -s /var/log/hbase /usr/lib/hbase/logs
- ln -s /var/run/hbase /usr/lib/hbase/pids
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Thu Sep 8
21:19:24 2011
@@ -54,6 +54,8 @@ install: build
rm debian/tmp/usr/lib/hbase/lib/hadoop-*.jar
ln -s /usr/lib/zookeeper/zookeeper.jar
debian/tmp/usr/lib/hbase/lib/zookeeper.jar
ln -s /usr/lib/hadoop/hadoop-core.jar
debian/tmp/usr/lib/hbase/lib/hadoop-core.jar
+ ln -s /var/log/hbase debian/tmp/usr/lib/hbase/logs
+ ln -s /var/run/hbase debian/tmp/usr/lib/hbase/pids
# Wage war on "executable-not-elf-or-script" warnings:
### ruby scripts should not be executable - they require
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.dirs?rev=1166910&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.dirs Thu
Sep 8 21:19:24 2011
@@ -0,0 +1,2 @@
+/var/log/hive
+/var/run/hive
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.postinst
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.postinst?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.postinst
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.postinst
Thu Sep 8 21:19:24 2011
@@ -21,6 +21,8 @@ set -e
case "$1" in
configure)
+ chown hive:hive -R /var/run/hive /var/log/hive
+
# Install config alternatives
update-alternatives --install /etc/hive/conf hive-conf
/etc/hive/conf.dist 30
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.preinst
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.preinst?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.preinst
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.preinst Thu
Sep 8 21:19:24 2011
@@ -33,10 +33,6 @@ case "$1" in
--shell /bin/false \
hive >/dev/null
fi
-
- install -d -m 0755 -o hive -g hive /var/log/hive
- install -d -m 0755 -o hive -g hive /var/run/hive
-
;;
abort-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm Thu
Sep 8 21:19:24 2011
@@ -23,8 +23,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- rmdir /var/log/hive 2>/dev/null || :
- rmdir /var/run/hive 2>/dev/null || :
+ update-alternatives --remove hive-conf /etc/hive/conf.dist
;;
failed-upgrade)
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm
(from r1166447,
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm&r1=1166447&r2=1166910&rev=1166910&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm Thu Sep
8 21:19:24 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# prerm script for hbase
+# prerm script for hadoop
#
# see: dh_installdeb(1)
@@ -35,7 +35,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- unlink /usr/lib/hbase/logs
+ update-alternatives --remove pig-conf /etc/pig/conf.dist
;;
failed-upgrade)
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml?rev=1166910&r1=1166909&r2=1166910&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
Thu Sep 8 21:19:24 2011
@@ -1445,7 +1445,6 @@ also on potential use cases. Come to the
<file name="/etc/oozie/oozie-log4j.properties" owners="1"
perm="-rw-r--r--" user="root" group="root"/>
<file name="/etc/oozie/oozie-site.xml" owners="1" perm="-rw-r--r--"
user="root" group="root"/>
<file name="/etc/rc.d/init.d/oozie" owners="1" perm="-rwxr-xr-x"
user="root" group="root"/>
- <file name="/usr/lib/oozie/bin" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
<file name="/usr/lib/oozie/bin/addtowar.sh" owners="1" perm="-rwxr-xr-x"
user="root" group="root"/>
<file name="/usr/lib/oozie/bin/oozie-env.sh" owners="1" perm="-rwxr-xr-x"
user="root" group="root"/>
<file name="/usr/lib/oozie/bin/oozie-run.sh" owners="1" perm="-rwxr-xr-x"
user="root" group="root"/>
@@ -1551,6 +1550,7 @@ also on potential use cases. Come to the
</deps>
<content>
<file name="/usr/bin/oozie" owners="1" perm="-rwxr-xr-x" user="root"
group="root"/>
+ <file name="/usr/lib/oozie/bin" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
<file name="/usr/lib/oozie/bin/oozie" owners="1" perm="-rwxr-xr-x"
user="root" group="root"/>
<file name="/usr/lib/oozie/bin/oozie-examples.sh" owners="1"
perm="-rwxr-xr-x" user="root" group="root"/>
<file name="/usr/lib/oozie/lib" owners="1" perm="drwxr-xr-x" user="root"
group="root"/>
