You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/05/24 05:15:17 UTC

bigtop git commit: BIGTOP-2439: flink: fix adduser and register init.d scripts on DEB systemes

Repository: bigtop
Updated Branches:
  refs/heads/master 413347c97 -> b6f50e60a


BIGTOP-2439: flink: fix adduser and register init.d scripts on DEB systemes


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b6f50e60
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b6f50e60
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b6f50e60

Branch: refs/heads/master
Commit: b6f50e60a353d6cf92231f772eb19d8d49c147e7
Parents: 413347c
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Thu May 19 23:03:06 2016 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Tue May 24 07:14:04 2016 +0200

----------------------------------------------------------------------
 bigtop-packages/src/deb/flink/control |  2 +-
 bigtop-packages/src/deb/flink/rules   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6f50e60/bigtop-packages/src/deb/flink/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/flink/control b/bigtop-packages/src/deb/flink/control
index 7e3a2ae..a98bddc 100644
--- a/bigtop-packages/src/deb/flink/control
+++ b/bigtop-packages/src/deb/flink/control
@@ -23,7 +23,7 @@ Homepage: http://flink.apache.org
 
 Package: flink
 Architecture: all
-Depends: bigtop-utils (>= 0.7)
+Depends: bigtop-utils (>= 0.7), adduser
 Description: Flink\u2019s core is a streaming dataflow engine that provides data
              distribution, communication, and fault tolerance for distributed
              computations over data streams.

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6f50e60/bigtop-packages/src/deb/flink/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/flink/rules b/bigtop-packages/src/deb/flink/rules
index 95284bf..53a62fd 100644
--- a/bigtop-packages/src/deb/flink/rules
+++ b/bigtop-packages/src/deb/flink/rules
@@ -28,15 +28,19 @@ export DH_OPTIONS
 override_dh_auto_build:
 	bash debian/do-component-build
 
-svcs=flink-jobmanager flink-taskmanager
 
-$(svcs): debian/init.d.tmpl
-	mkdir -p debian/flink/etc/init.d/
-	sh $< debian/$@.svc deb debian/flink/etc/init.d/$@
-	touch $@
+.PHONY: jobmanager
+.PHONY: taskmanager
+jobmanager taskmanager:
+	bash debian/init.d.tmpl debian/flink-$@.svc deb debian/flink-$@.init
 
-override_dh_auto_install: $(svcs)
+override_dh_auto_install: jobmanager taskmanager
 	bash -x debian/install_flink.sh \
 	--build-dir=`pwd`/build-target \
 	--source-dir=debian \
 	--prefix=debian/tmp
+
+# This should be fixed. Split flink in three packages: flink, flink-taskmanager, flink-jobmanager
+override_dh_installinit: jobmanager taskmanager
+	dh_installinit --name=flink-taskmanager
+	dh_installinit --name=flink-jobmanager