Merge "Fix PPA build failures"

packages.make

@@ -111,23 +111,22 @@ package-contrail: debian-contrail
 	(cd build/packages/$(PACKAGE)/debian; sed -i '/SUPERVISORDEP_SERIES/r supervisordep.$(SERIES)' control)
 	sed -i '/SUPERVISORDEP_SERIES/d' build/packages/$(PACKAGE)/debian/control
 	# Append series specific install files
-	$(eval CONTRAIL_INSTALL_SERIES := $(shell find $(SB_TOP)/build/packages/$(PACKAGE)/debian/ -name '*.install.$(SERIES)')
+	$(eval CONTRAIL_INSTALL_SERIES := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.install.$(SERIES)'))
 	$(foreach series_fname, $(CONTRAIL_INSTALL_SERIES), \
 			(cd build/packages/$(PACKAGE)/debian;\
 			sed -i '/INSTALL_SERIES/r $(series_fname)' $(patsubst %.$(SERIES),%,$(series_fname))); )
-			sed -i '/INSTALL_SERIES/d' $(patsubst %.$(SERIES),%,$(series_fname))); )
-	$(eval CONTRAIL_INSTALL := $(shell find $(SB_TOP)/build/packages/$(PACKAGE)/debian/ -name '*.install'))
+	$(eval CONTRAIL_INSTALL := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.install'))
 	$(foreach install_fname, $(CONTRAIL_INSTALL), \
-			(cd $(SB_TOP)/build/packages/$(PACKAGE)/debian;\
+			(cd build/packages/$(PACKAGE)/debian;\
 			sed -i '/INSTALL_SERIES/d' $(install_fname)); )
 	# Append series specific dirs
-	$(eval CONTRAIL_DIRS_SERIES := $(shell find $(SB_TOP)/build/packages/$(PACKAGE)/debian/ -name '*.dirs.$(SERIES)')
+	$(eval CONTRAIL_DIRS_SERIES := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.dirs.$(SERIES)'))
 	$(foreach series_dirname, $(CONTRAIL_DIRS_SERIES), \
 			(cd build/packages/$(PACKAGE)/debian;\
 			sed -i '/DIRS_SERIES/r $(series_dirname)' $(patsubst %.$(SERIES),%,$(series_dirname))); )
-	$(eval CONTRAIL_DIRS := $(shell find $(SB_TOP)/build/packages/$(PACKAGE)/debian/ -name '*.dirs'))
+	$(eval CONTRAIL_DIRS := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.dirs'))
 	$(foreach dir_fname, $(CONTRAIL_DIRS), \
-			(cd $(SB_TOP)/build/packages/$(PACKAGE)/debian;\
+			(cd build/packages/$(PACKAGE)/debian;\
 			sed -i '/DIRS_SERIES/d' $(dir_fname)); )
 	(cd build/packages/$(PACKAGE); dpkg-buildpackage -uc -us -b -rfakeroot)
 	chmod u+x build/packages/contrail/debian/rules.modules
@@ -141,18 +140,26 @@ source-package-contrail: clean-contrail debian-contrail
 	(cd build/packages/$(PACKAGE)/debian; sed -i '/BUILDDEP_SERIES/r builddep.$(SERIES)' control)
 	sed -i '/BUILDDEP_SERIES/d' build/packages/$(PACKAGE)/debian/control
 	# Append series specific depends
-	(cd build/packages/$(PACKAGE)/debian; sed -i '/SUPERVISORDEP_SERIES/r builddep.$(SERIES)' control)
+	(cd build/packages/$(PACKAGE)/debian; sed -i '/SUPERVISORDEP_SERIES/r supervisordep.$(SERIES)' control)
 	sed -i '/SUPERVISORDEP_SERIES/d' build/packages/$(PACKAGE)/debian/control
 	# Append series specific install files
-	$(eval CONTRAIL_INSTALL_SERIES := $(cd build/packages/$(PACKAGE)/debian/; ls *.install.$(SERIES)))
+	$(eval CONTRAIL_INSTALL_SERIES := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.install.$(SERIES)'))
 	$(foreach series_fname, $(CONTRAIL_INSTALL_SERIES), \
 			(cd build/packages/$(PACKAGE)/debian;\
 			sed -i '/INSTALL_SERIES/r $(series_fname)' $(patsubst %.$(SERIES),%,$(series_fname))); )
+	$(eval CONTRAIL_INSTALL := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.install'))
+	$(foreach install_fname, $(CONTRAIL_INSTALL), \
+			(cd build/packages/$(PACKAGE)/debian;\
+			sed -i '/INSTALL_SERIES/d' $(install_fname)); )
 	# Append series specific dirs
-	$(eval CONTRAIL_DIRS_SERIES := $(cd build/packages/$(PACKAGE)/debian/; ls *.install.$(SERIES)))
+	$(eval CONTRAIL_DIRS_SERIES := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.dirs.$(SERIES)'))
 	$(foreach series_dirname, $(CONTRAIL_DIRS_SERIES), \
 			(cd build/packages/$(PACKAGE)/debian;\
 			sed -i '/DIRS_SERIES/r $(series_dirname)' $(patsubst %.$(SERIES),%,$(series_dirname))); )
+	$(eval CONTRAIL_DIRS := $(shell cd build/packages/$(PACKAGE)/debian; find . -name '*.dirs'))
+	$(foreach dir_fname, $(CONTRAIL_DIRS), \
+			(cd build/packages/$(PACKAGE)/debian;\
+			sed -i '/DIRS_SERIES/d' $(dir_fname)); )
 	(cd vrouter; git clean -f -d)
 	tar zcf build/packages/contrail_$(CONTRAIL_VERSION).orig.tar.gz $(SOURCE_CONTRAIL_ARCHIVE)
 	@echo "Building source package $(PACKAGE)"