libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

fixed update problem in mageia

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-12-08 10:00:02 +00:00
parent ec1b9fc7a4
commit 918995921d
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@@ -1,3 +1,20 @@
2016-12-07 20:34
* [r453] bootstrap.sh, build-in-docker.sh:
typo
2016-12-07 20:21
* [r452] build-in-docker.sh, mrw-c++.spec.in,
resolve-rpmbuilddeps.sh:
tested on mageia 5 :)
2016-12-07 19:28
* [r451] ChangeLog, bootstrap.sh, build-in-docker.sh,
debian/control.in, mrw-c++.spec.in, resolve-rpmbuilddeps.sh:
tested on fedora, centos, opensuse and ubuntu
2016-12-07 15:59 2016-12-07 15:59
* [r450] bootstrap.sh, build-in-docker.sh, configure.ac, * [r450] bootstrap.sh, build-in-docker.sh, configure.ac,

7
build-in-docker.sh
View File

@@ -158,7 +158,8 @@ function traperror() {
read read
fi fi
echo -n " ... cleanup docker: " echo -n " ... cleanup docker: "
docker rm -f "${DOCKER_ID}" docker stop "${DOCKER_ID}" || true
docker rm "${DOCKER_ID}"
echo "returning status: $e" echo "returning status: $e"
echo "--->" echo "--->"
exit $e exit $e
@@ -255,6 +256,10 @@ enabled=1
gpgcheck=0 gpgcheck=0
EOF EOF
fi fi
UPDATE_TOOL=$(test -x /usr/sbin/urpmi && echo urpmi.update -a)
if test -n "${UPDATE_TOOL}"; then
docker exec ${DOCKER_ID} ${UPDATE_TOOL}
fi
INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto)) INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -c docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -c