From 4d2f86a1ebcfc952080386603354c4767d2c8825 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 18 Jan 2019 13:28:22 +0100
Subject: Rework of debian packaging

Change-Id: Ifede85d3af36f3ee6c6f8f92dcf5db0ed8f1bfeb
Signed-off-by: Damjan Marion <damarion@cisco.com>
Signed-off-by: Dave Barach <dave@barachs.net>
---
 build-data/packages/vpp.mk |  7 ++++
 build-data/platforms.mk    | 83 ----------------------------------------------
 2 files changed, 7 insertions(+), 83 deletions(-)

(limited to 'build-data')

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 2a1b9a77de9..9ce557a9946 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -44,3 +44,10 @@ vpp_configure = \
 #vpp_make_args = --no-print-directory
 vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR)
 vpp_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path'
+
+vpp-package-deb: vpp-install
+	@$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vpp -- package-deb
+	@find $(PACKAGE_BUILD_DIR) \
+          -maxdepth 1 \
+          \( -name '*.changes' -o -name '*.deb' -o -name '*.buildinfo' \) \
+          -exec mv {} $(CURDIR) \;
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index d06720272c6..bc794ff48eb 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -15,86 +15,3 @@
 $(foreach d,$(SOURCE_PATH_BUILD_DATA_DIRS),	\
   $(eval -include $(d)/platforms/*.mk))
 
-.PHONY: install-deb
-install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
-	@$(BUILD_ENV) ;							\
-	set -eu$(BUILD_DEBUG) ;						\
-	$(MAKE) -C $(MU_BUILD_ROOT_DIR)					\
-	    $(patsubst %,%-install,					\
-	      $(ROOT_PACKAGES))	|| exit 1;				\
-									\
-	: generate file manifests ;					\
-	find $(INSTALL_PREFIX)$(ARCH)/*/bin -type f -print		\
-	  | sed -e 's:.*:../& /usr/bin:' | grep -v vppapigen		\
-	    > deb/debian/vpp.install ;					\
-									\
-	: core api definitions ;					\
-	./scripts/find-api-core-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp.install ;					\
-									\
-	: need symbolic links in the lib pkg ; 				\
-	find $(INSTALL_PREFIX)$(ARCH)/*/lib* \( -type f -o  -type l \)  \
-	  -print | egrep -e '*\.so\.*\.*\.*'				\
-	  | grep -v plugins\/						\
-	  | sed -e 's:.*:../& /usr/lib/$(MACHINE)-linux-gnu:'		\
-	    > deb/debian/vpp-lib.install ;				\
-									\
-	: vnet api definitions ;					\
-	./scripts/find-api-lib-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-lib.install ;					\
-									\
-	: dev package ;							\
-	./scripts/find-dev-contents $(INSTALL_PREFIX)$(ARCH)		\
-	 deb/debian/vpp-dev.install ;					\
-									\
-	: plugins package ;						\
-	./scripts/find-plugins-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-plugins.install ;				\
-									\
-	: vpp-api-lua package ;						\
-	./scripts/find-vpp-api-lua-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-api-lua.install ;				\
-									\
-	: vpp-api-java package ;					\
-	./scripts/find-vpp-api-java-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-api-java.install ;				\
-									\
-	: bin package needs startup config ; 				\
-	echo ../../src/vpp/conf/startup.conf /etc/vpp 			\
-	   >> deb/debian/vpp.install ;					\
-									\
-	: and sysctl config ; 						\
-	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
-	   >> deb/debian/vpp.install ;					\
-									\
-	: bash completion for vppctl ;					\
-	echo ../../src/scripts/vppctl_completion /etc/bash_completion.d	\
-	   >> deb/debian/vpp.install ;					\
-									\
-	: add log directory ;						\
-	echo /var/log/vpp/						\
-	   >> deb/debian/vpp.dirs ;					\
-									\
-	: dev package needs a couple of additions ;			\
-	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/bin/vppapigen /usr/bin	\
-	   >> deb/debian/vpp-dev.install ;				\
-	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/vppapigen_c.py /usr/share/vpp  \
-	   >> deb/debian/vpp-dev.install ;				\
-	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/vppapigen_json.py /usr/share/vpp \
-	   >> deb/debian/vpp-dev.install ;				\
-	echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin	\
-	   >> deb/debian/vpp-dev.install ;				\
-	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
-	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
-	       >> deb/debian/vpp-dev.install;				\
-	done;								\
-									\
-	: generate changelog;						\
-	./scripts/generate-deb-changelog 				\
-									\
-	: Go fabricate the actual Debian packages ;			\
-	(								\
-	cd deb &&							\
-	dpkg-buildpackage -us -uc -b					\
-	)
-
-- 
cgit 1.2.3-korg