From 69cb4abe8957158d2a1c396119eba0385350e58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Rodr=C3=ADguez?= Date: Wed, 15 Nov 2017 17:19:08 +0100 Subject: [PATCH] deb: install build dependencies at build time Else they need to be declared twice, in the control and in the dockerfile Closes #58 --- debs/trusty/archivematica-storage-service/build.sh | 1 + debs/trusty/archivematica/build.sh | 1 + debs/xenial/archivematica-storage-service/build.sh | 2 ++ debs/xenial/archivematica/build.sh | 1 + 4 files changed, 5 insertions(+) diff --git a/debs/trusty/archivematica-storage-service/build.sh b/debs/trusty/archivematica-storage-service/build.sh index 18b63e65..b4898af1 100755 --- a/debs/trusty/archivematica-storage-service/build.sh +++ b/debs/trusty/archivematica-storage-service/build.sh @@ -9,6 +9,7 @@ cd $SOURCE BRANCH="$(git branch | cut -d\ -f2-)" COMMIT=$(git rev-parse HEAD) cp -rf ${BASE}/debian-storage-service/* debian/ +yes | mk-build-deps -i debian/control pip download -d lib --no-binary :all: -r requirements.txt dch -v 1:${VERSION}${RELEASE} commit: $(echo $COMMIT) dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) diff --git a/debs/trusty/archivematica/build.sh b/debs/trusty/archivematica/build.sh index a70d4b31..787284bc 100755 --- a/debs/trusty/archivematica/build.sh +++ b/debs/trusty/archivematica/build.sh @@ -25,6 +25,7 @@ for i in dashboard MCPClient MCPServer archivematicaCommon do cd "${SOURCE}/$i/" cp -rf $BASE/debian-$i/* debian/ + yes | mk-build-deps -i debian/control dch -v 1:${VERSION}${RELEASE} commit: $(echo $COMMIT) dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) dch -r --distribution trusty --urgency high ignored diff --git a/debs/xenial/archivematica-storage-service/build.sh b/debs/xenial/archivematica-storage-service/build.sh index bb4342be..887242f9 100755 --- a/debs/xenial/archivematica-storage-service/build.sh +++ b/debs/xenial/archivematica-storage-service/build.sh @@ -9,7 +9,9 @@ cd $SOURCE BRANCH="$(git branch | cut -d\ -f2-)" COMMIT=$(git rev-parse HEAD) cp -rf ${BASE}/debian-storage-service/* debian/ +QUILT_PATCHES="debian/patches" quilt push -a || true pip download -d lib --no-binary :all: -r requirements.txt +yes | mk-build-deps -i debian/control dch -v 1:${VERSION}${RELEASE} commit: $(echo $COMMIT) dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) dch -r --distribution xenial --urgency high ignored diff --git a/debs/xenial/archivematica/build.sh b/debs/xenial/archivematica/build.sh index 61dfc5a8..68db09b5 100755 --- a/debs/xenial/archivematica/build.sh +++ b/debs/xenial/archivematica/build.sh @@ -20,6 +20,7 @@ for i in dashboard MCPClient MCPServer archivematicaCommon do cd "${SOURCE}/$i/" cp -rf $BASE/debian-$i/* debian/ + yes | mk-build-deps -i debian/control dch -v 1:${VERSION}${RELEASE} commit: $(echo $COMMIT) dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) dch -r --distribution xenial --urgency high ignored