fix installation check after package build

master
Marc Wäckerlin 6 years ago
parent 7fdca1e840
commit c2b498c494
  1. 2
      INSTALL
  2. 16
      ax_init_standard_project.m4
  3. 11
      build-in-docker.sh

@ -1 +1 @@
/usr/share/automake-1.15/INSTALL
/usr/share/automake-1.13/INSTALL

@ -867,7 +867,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
DEV_DIST_PKG=
pkg=m4_default([$2], [$1])
$6
dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
deb_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
if test -n "$4"; then
for f in $pkg $4; do
@ -1106,8 +1106,7 @@ AC_DEFUN([AX_DEB_DEPEND], [
# - parameter:
# $1 = package name
AC_DEFUN([AX_DEB_SECTION], [
pkg="$1"
DEB_SECTION="${pkg}"
DEB_SECTION="$1"
])
# call after setting debian dependencies
@ -1139,19 +1138,17 @@ AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
# - parameter:
# $1 = package name
AC_DEFUN([AX_RPM_BUILD_DEPEND], [
pkg="$1"
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, $1"
])
# require package in .spec.in append @RPM_DEPEND@ to Depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_RPM_DEPEND], [
pkg="$1"
if test -z "${RPM_DEPEND}"; then
RPM_DEPEND="${pkg}"
RPM_DEPEND="$1"
else
RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
RPM_DEPEND="${RPM_DEPEND}, $1"
fi
])
@ -1159,8 +1156,7 @@ AC_DEFUN([AX_RPM_DEPEND], [
# - parameter:
# $1 = package name
AC_DEFUN([AX_RPM_GROUP], [
pkg="$1"
RPM_GROUP="${pkg}"
RPM_GROUP="$1"
])
# call after setting rpmian dependencies

@ -344,12 +344,13 @@ done
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
# last check: try to install built deb or rpm files (if not already cleaned up)
if test "${targets//deb/}" != "${targets}"; then
if ls *.deb > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb"
fi
# not supported in trusty and jessie
if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb"
fi
fi
if test "${targets//rpm/}" != "${targets}"; then
if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
if ls *.rpm > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm"
fi

Loading…
Cancel
Save