BIGTOP-4151: Add pkgSuffix and parentDir build arguments to Zookeeper…

… deb

bigtop-packages/src/deb/zookeeper/control

@@ -20,27 +20,27 @@ Build-Depends: debhelper (>= 7.0.50~), autoconf, automake
 Standards-Version: 3.9.6
 Homepage: http://zookeeper.apache.org/
 
-Package: zookeeper
+Package: zookeeper-pkgsuffix
 Architecture: all
 Depends: adduser, bigtop-utils (>= 0.7)
 Description: A high-performance coordination service for distributed applications.
  ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.  All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
 
-Package: zookeeper-server
+Package: zookeeper-pkgsuffix-server
 Architecture: all
-Depends: zookeeper (= ${source:Version})
+Depends: zookeeper-pkgsuffix (= ${source:Version})
 Description: The Hadoop Zookeeper server
  This package starts the zookeeper server on startup
 
-Package: zookeeper-rest
+Package: zookeeper-pkgsuffix-rest
 Architecture: all
-Depends: zookeeper (= ${source:Version}), lsb-base
+Depends: zookeeper-pkgsuffix (= ${source:Version}), lsb-base
 Description: The Zookeeper REST server
  This package starts the zookeeper REST server on startup
 
-Package: zookeeper-native
+Package: zookeeper-pkgsuffix-native
 Architecture: any
-Depends: zookeeper (= ${source:Version}),  ${shlibs:Depends} 
+Depends: zookeeper-pkgsuffix (= ${source:Version}),  ${shlibs:Depends}
 Description: C bindings for ZooKeeper clients
  Provides native libraries and development headers for C / C++ ZooKeeper clients. Consists of both single-threaded and multi-threaded implementations.
 

bigtop-packages/src/deb/zookeeper/rules

@@ -28,24 +28,71 @@ zookeeper_pkg_name=zookeeper
 %:
 	dh $@
 
+parent_dir=${PARENT_DIR}
+pkg_name_suffix=${PKG_NAME_SUFFIX}
+
+zookeeper_name=zookeeper
+doc_zookeeper=${parent_dir}/usr/share/doc/${zookeeper_name}
+usr_lib_zookeeper=${parent_dir}/usr/lib/${zookeeper_name}
+var_lib_zookeeper=${parent_dir}/var/lib/${zookeeper_name}
+bin_dir=${parent_dir}/usr/bin
+man_dir=${parent_dir}/usr/share/man
+etc_zookeeper=${parent_dir}/etc/${zookeeper_name}
+etc_zookeeper_conf_dist=${parent_dir}/etc/${zookeeper_name}/conf.dist
+etc_default=${parent_dir}/etc/default
+include_dir=${parent_dir}/usr/include
+lib_dir=${parent_dir}/usr/lib/
+
+define gen_rule
+    $(foreach item,postinst preinst prerm,\
+        if [ -f debian/zookeeper$(1).$(item) ]; then \
+            sed -i -e 's:@etc_zookeeper@:${etc_zookeeper}:g' -e 's:@var_lib_zookeeper@:${var_lib_zookeeper}:g' debian/zookeeper$(1).$(item); \
+            if [ "${pkg_name_suffix}" != "" ] ;then mv debian/zookeeper$(1).$(item) debian/zookeeper${pkg_name_suffix}$(1).$(item);fi \
+        fi; \
+    )
+endef
+
+.PHONY: update_control
+.PHONY: gen_files
+
+update_control:
+	sed -i 's/-pkgsuffix/${pkg_name_suffix}/g' debian/control
+
+gen_files:
+	$(call gen_rule,)
+
+override_dh_auto_clean: update_control
+	dh_auto_clean
+
 override_dh_auto_build:
 	bash debian/do-component-build -Divy.home=${HOME}/.ivy2
 	mkdir -p debian/tmp
 	tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
 
-override_dh_auto_install:
+override_dh_auto_install: gen_files
 	cp debian/zookeeper.1 debian/zoo.cfg debian/zookeeper.default .
 	bash -x debian/install_zookeeper.sh \
-	  --build-dir=build \
-	  --prefix=debian/$(zookeeper_pkg_name)
+		--build-dir=build \
+		--prefix=debian/$(zookeeper_pkg_name)${pkg_name_suffix} \
+		--doc-dir=${doc_zookeeper} \
+		--lib-dir=${usr_lib_zookeeper} \
+		--bin-dir=${bin_dir} \
+		--man-dir=${man_dir} \
+		--conf-dist-dir=${etc_zookeeper_conf_dist} \
+		--etc-default=${etc_default} \
+		--system-include-dir=${include_dir} \
+		--system-lib-dir=${lib_dir}
 	   # Move native files to a dedicated package
-	   mkdir -p debian/zookeeper-native/usr/bin
-	   mkdir -p debian/zookeeper-native/usr/lib
-	   mv debian/zookeeper/usr/bin/cli_* debian/zookeeper/usr/bin/load_gen debian/zookeeper-native/usr/bin/
-	   mv debian/zookeeper/usr/lib/libzookeeper* debian/zookeeper-native/usr/lib/
-	   mv debian/zookeeper/usr/lib/zookeeper-native debian/zookeeper-native/usr/lib/
-	   mv debian/zookeeper/usr/include debian/zookeeper-native/usr/include
+	   mkdir -p debian/zookeeper${pkg_name_suffix}-native/${bin_dir}
+	   mkdir -p debian/zookeeper${pkg_name_suffix}-native/${lib_dir}
+	   mv debian/zookeeper${pkg_name_suffix}/${bin_dir}/cli_* debian/zookeeper${pkg_name_suffix}/${bin_dir}/load_gen debian/zookeeper${pkg_name_suffix}-native/${bin_dir}
+	   mv debian/zookeeper${pkg_name_suffix}/${lib_dir}/libzookeeper* debian/zookeeper${pkg_name_suffix}-native/${lib_dir}
+	   mv debian/zookeeper${pkg_name_suffix}/${lib_dir}/zookeeper-native debian/zookeeper${pkg_name_suffix}-native/${lib_dir}
+	   mv debian/zookeeper${pkg_name_suffix}/${include_dir} debian/zookeeper${pkg_name_suffix}-native/${include_dir}
 	bash debian/init.d.tmpl debian/zookeeper-rest.svc deb debian/zookeeper-rest.init
 
 override_dh_strip:
 	dh_strip --no-automatic-dbgsym
+
+
+override_dh_strip_nondeterminism:

bigtop-packages/src/deb/zookeeper/zookeeper.postinst

@@ -25,7 +25,7 @@ case "$1" in
     configure)
         # Install config alternatives
         chown -R zookeeper:zookeeper /var/log/zookeeper
-        update-alternatives  --install /etc/${zookeeper_pkg_name}/conf ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist 30
+        update-alternatives  --install /etc/${zookeeper_pkg_name}/conf ${zookeeper_pkg_name}-conf @etc_zookeeper@/conf.dist 30
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

bigtop-packages/src/deb/zookeeper/zookeeper.preinst

@@ -38,13 +38,13 @@ case "$1" in
                 adduser \
                   --system \
                   --ingroup zookeeper \
-                  --home /var/lib/zookeeper \
+                  --home @var_lib_zookeeper@ \
                   --gecos "ZooKeeper User" \
                   --shell /bin/false \
                   zookeeper >/dev/null
         fi
         install -d -m 0755 -o zookeeper -g zookeeper /var/log/zookeeper
-        install -d -m 0755 -o zookeeper -g zookeeper /var/lib/zookeeper
+        install -d -m 0755 -o zookeeper -g zookeeper @var_lib_zookeeper@
     ;;
 
     abort-upgrade)

bigtop-packages/src/deb/zookeeper/zookeeper.prerm

@@ -25,7 +25,7 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-      update-alternatives --remove ${zookeeper_pkg_name}-conf /etc/${zookeeper_pkg_name}/conf.dist || :
+      update-alternatives --remove ${zookeeper_pkg_name}-conf @etc_zookeeper@/conf.dist || :
     ;;
 
     failed-upgrade)

bigtop.bom

@@ -136,6 +136,7 @@ bigtop {
       name    = 'zookeeper'
       pkg     = name
       rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
+      deb_pkg_suffix = "-" + bigtop.base_version.replace(".", "-")
       version {
         base  = '3.7.2'
         pkg   = base