development/bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

merged changes

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-12-14 12:35:19 +00:00
parent 7e6e11e5ac
commit b6cc8c1acc
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/build-in-docker.sh
View File

@@ -113,7 +113,6 @@ function traperror() {
fi fi
echo echo
fi fi
echo "**** Entering docker container ${DOCKER_ID}, exit with Ctrl-D"
echo -n " ... cleanup docker: " echo -n " ... cleanup docker: "
docker rm -f "${DOCKER_ID}" docker rm -f "${DOCKER_ID}"
echo "returning status: $e" echo "returning status: $e"

2
scripts/resolve-debbuilddeps.sh
View File

@@ -35,7 +35,7 @@ TO_INSTALL=
if test -e debian/control.in -a ! -e debian/control; then if test -e debian/control.in -a ! -e debian/control; then
for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
TO_INSTALL+=" ${f}" TO_INSTALL+=" ${f}"
fi fi
done done