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

fix some build issues, i.e. pgp utf-8

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-12-09 12:12:10 +00:00
parent ee9a78d3fa
commit 7a08c44cee
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build-in-docker.sh
View File

@@ -208,8 +208,6 @@ if ! [[ $arch =~ $myarch ]]; then
docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
fi
docker start "${DOCKER_ID}"
docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
if ! docker exec ${DOCKER_ID} getent group $(id -g) > /dev/null 2>&1; then
docker exec ${DOCKER_ID} groupadd -g $(id -g) $(id -gn)
fi
@@ -218,6 +216,8 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
fi
case $mode in
(deb|apt)
docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG}
OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"