You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/11/01 19:37:37 UTC
git commit: ACCUMULO-210 Make native it tests and rat check pass
Updated Branches:
refs/heads/master 16115f000 -> 8f6f67018
ACCUMULO-210 Make native it tests and rat check pass
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f6f6701
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f6f6701
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f6f6701
Branch: refs/heads/master
Commit: 8f6f6701822edca9b04802497c7566be887d5448
Parents: 16115f0
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Nov 1 14:36:56 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Nov 1 14:36:56 2013 -0400
----------------------------------------------------------------------
core/pom.xml | 3 +--
core/src/main/packaging/preinstall.sh | 3 ---
server/native/src/main/resources/Makefile | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f6f6701/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1a35c53..8b4706b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -258,8 +258,7 @@
<require>accumulo-start = %{version}-%{release}</require>
</requires>
<preinstallScriptlet>
- <scriptFile>src/main/packaging/preinstall.sh</scriptFile>
- <fileEncoding>${project.build.sourceEncoding}</fileEncoding>
+ <script>getent group accumulo >/dev/null || groupadd -r accumulo; getent passwd accumulo >/dev/null || useradd -r -g accumulo -d %{_datadir}/accumulo -s /sbin/nologin -c "Apache Accumulo" accumulo; exit 0</script>
</preinstallScriptlet>
<postinstallScriptlet>
<script>sysctl -q -p %{_sysconfdir}/sysctl.d/accumulo; ln -s %{_sysconfdir}/accumulo %{_datadir}/accumulo/conf</script>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f6f6701/core/src/main/packaging/preinstall.sh
----------------------------------------------------------------------
diff --git a/core/src/main/packaging/preinstall.sh b/core/src/main/packaging/preinstall.sh
deleted file mode 100644
index 178995d..0000000
--- a/core/src/main/packaging/preinstall.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-getent group accumulo >/dev/null || groupadd -r accumulo
-getent passwd accumulo >/dev/null || useradd -r -g accumulo -d %{_datadir}/accumulo -s /sbin/nologin -c "Apache Accumulo" accumulo
-exit 0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f6f6701/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index 63c9b16..1c1f872 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -43,7 +43,7 @@ test : $(NATIVE_LIB) testJavaHome runTests
testJavaHome :
@echo JAVA_HOME is $(JAVA_HOME)
-runTests : clean $(TESTSRCS) $(NATIVE_LIB)
+runTests : $(NATIVE_LIB) $(TESTSRCS)
$(CXX) -g -Wall -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB)
LD_LIBRARY_PATH=./ ./$@ 20 20 20 20 20 20 20 20 true