From 486f91cf77560070354354fa87ed2bfb132ef829 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Fri, 19 Feb 2016 10:28:02 +0100 Subject: [PATCH] Fix generate_doc_index.sh execution when running in sandboxed build Closes-Bug: #1547494 Change-Id: Ic2c8ce352bfacab5144cc0d09e84e6e7d1233397 --- debian/contrail/debian/rules | 4 ++-- packages.make | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/contrail/debian/rules b/debian/contrail/debian/rules index 2d47a8fb..390c44d4 100644 --- a/debian/contrail/debian/rules +++ b/debian/contrail/debian/rules @@ -49,9 +49,9 @@ override_dh_auto_build: # contrail-docs # Index files for file in ${INSTALL_ROOT}/usr/share/doc/contrail-docs/html/messages/*; do \ - ${SB_TOP}/tools/packages/utils/generate_doc_index.sh $$file; \ + debian/utils/generate_doc_index.sh $$file; \ done - ${SB_TOP}/tools/packages/utils/generate_doc_index.sh ${INSTALL_ROOT}/usr/share/doc/contrail-docs/html/messages + debian/utils/generate_doc_index.sh ${INSTALL_ROOT}/usr/share/doc/contrail-docs/html/messages override_dh_auto_clean: dh_auto_clean diff --git a/packages.make b/packages.make index 9d2ae962..1690cd8e 100644 --- a/packages.make +++ b/packages.make @@ -202,6 +202,7 @@ debian-%: $(eval PACKAGE := $(patsubst debian-%,%,$@)) mkdir -p build/packages/$(PACKAGE) cp -R tools/packages/debian/$(PACKAGE)/debian build/packages/$(PACKAGE) + cp -R tools/packages/utils build/packages/$(PACKAGE)/debian/ chmod u+x build/packages/$(PACKAGE)/debian/rules clean-%: