libraries/libxml-cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new feature specify dns; check signature after signing

Browse Source
This commit is contained in:
Marc Wäckerlin
2018-04-03 14:27:01 +00:00
parent 3748ed5950
commit ad17e59357
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2018-03-29 07:44
* [r111] bootstrap.sh, build-in-docker.sh, template.sh:
fix build in bionic
2018-03-28 13:31
* [r110] ChangeLog, build-in-docker.conf:
new repository url
2017-12-21 15:18
* [r109] ChangeLog, INSTALL, ax_init_standard_project.m4,

1
ax_init_standard_project.m4
View File

@@ -578,6 +578,7 @@ clean-debian-targets:
-rm -rf \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.{dsc,tar.gz} \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}*.changes \$\$(sed -n 's,Package: \(.*\),\1_${PACKAGE_VERSION}~${DISTRO}.${BUILD_NUMBER}*.deb,p;' debian/control)
deb: distdir
cd \${PACKAGE_NAME}-\${PACKAGE_VERSION} && ( export CFLAGS="\${CFLAGS}"; export CPPFLAGS="\${CPPFLAGS}"; export CXXFLAGS="\${CXXFLAGS}"; export LDFLAGS="\${LDFLAGS}"; export DEB_CFLAGS_APPEND="\${CFLAGS}"; export DEB_CPPFLAGS_APPEND="\${CPPFLAGS}"; export DEB_CXXFLAGS_APPEND="\${CXXFLAGS}"; export DEB_LDFLAGS_APPEND="\${LDFLAGS}"; dpkg-buildpackage )
gpg --verify \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.dsc
distclean-debian-targets:
-rm debian/changelog debian/control
#### End: $0

4
build-in-docker.conf
View File

@@ -12,5 +12,5 @@
repos+=("ubuntu:::universe")
# Use Marc Wäckerlin's Repository, see https://mrw.sh
repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo")
keys+=("https://repository.mrw.sh/PublicKey")
repos+=("debian|ubuntu:::https://dev0004.int.swisssign.net/pub-repo unstable:::https://dev0004.int.swisssign.net/pub-repo unstable/@DISTRIBUTOR@/swisssign.repo")
keys+=("https://dev0004.int.swisssign.net/pub-repo/PublicKey")

7
build-in-docker.sh
View File

@@ -10,6 +10,7 @@ mode="deb"
img="mwaeckerlin/ubuntu:latest"
repos=()
keys=()
dns=()
envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
packages=()
@@ -41,6 +42,7 @@ while test $# -gt 0; do
echo " -f, --flag <flag> add flag to ./bootstrap.sh or ./configure"
echo " -r, --repo <url> add given apt repository"
echo " -k, --key <url> add public key from url"
echo " -n, --dns <ip> add ip as dns server"
echo " -e, --env <var>=<val> set environment variable in docker"
echo " -d, --dir <dir> access given directory read only"
echo " -p, --package <pkg> install extra debian packages"
@@ -128,6 +130,9 @@ while test $# -gt 0; do
(-e|--env) shift;
envs+=("-e $1")
;;
(-n|--dns) shift;
dns+=("--dns $1")
;;
(-d|--dirs) shift;
dirs+=("-v $1:$1:ro")
;;
@@ -223,7 +228,7 @@ function ifthenelse() {
set -x
docker pull $img
DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
if ! [[ $arch =~ $myarch ]]; then
docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"