Browse Source

new feature specify dns; check signature after signing

master
Marc Wäckerlin 1 year ago
parent
commit
1cf27f5474
5 changed files with 26 additions and 8 deletions
  1. 11
    0
      ChangeLog
  2. 1
    0
      ax_init_standard_project.m4
  3. 1
    0
      bootstrap.sh
  4. 12
    7
      build-in-docker.sh
  5. 1
    1
      template.sh

+ 11
- 0
ChangeLog View File

@@ -1,3 +1,14 @@
1
+2018-02-09 10:24  
2
+
3
+	* [r479] mrw-c++.spec.in:
4
+	  fixed build in fedora
5
+
6
+2017-12-21 15:13  
7
+
8
+	* [r478] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
9
+	  mac-create-app-bundle.sh, template.sh:
10
+	  update of build system
11
+
1 12
 2017-12-06 15:39  
2 13
 
3 14
 	* [r477] ChangeLog, bootstrap.sh:

+ 1
- 0
ax_init_standard_project.m4 View File

@@ -578,6 +578,7 @@ clean-debian-targets:
578 578
 	-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)
579 579
 deb: distdir
580 580
 	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 )
581
+	gpg --verify \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.dsc
581 582
 distclean-debian-targets:
582 583
 	-rm debian/changelog debian/control
583 584
 #### End: $0

+ 1
- 0
bootstrap.sh View File

@@ -1708,6 +1708,7 @@ $(
1708 1708
 BuildRequires: rpm-sign, lsb-release
1709 1709
 %else
1710 1710
 BuildRequires: rpm-sign, redhat-lsb
1711
+%global debug_package %{nil}
1711 1712
 %endif
1712 1713
 %endif
1713 1714
 $(

+ 12
- 7
build-in-docker.sh View File

@@ -10,6 +10,7 @@ mode="deb"
10 10
 img="mwaeckerlin/ubuntu:latest"
11 11
 repos=()
12 12
 keys=()
13
+dns=()
13 14
 envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
14 15
 dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
15 16
 packages=()
@@ -41,6 +42,7 @@ while test $# -gt 0; do
41 42
             echo "  -f, --flag <flag>     add flag to ./bootstrap.sh or ./configure"
42 43
             echo "  -r, --repo <url>      add given apt repository"
43 44
             echo "  -k, --key <url>       add public key from url"
45
+            echo "  -n, --dns <ip>        add ip as dns server"
44 46
             echo "  -e, --env <var>=<val> set environment variable in docker"
45 47
             echo "  -d, --dir <dir>       access given directory read only"
46 48
             echo "  -p, --package <pkg>   install extra debian packages"
@@ -128,6 +130,9 @@ while test $# -gt 0; do
128 130
         (-e|--env) shift;
129 131
             envs+=("-e $1")
130 132
             ;;
133
+        (-n|--dns) shift;
134
+            dns+=("--dns $1")
135
+            ;;
131 136
         (-d|--dirs) shift;
132 137
             dirs+=("-v $1:$1:ro")
133 138
             ;;
@@ -223,7 +228,7 @@ function ifthenelse() {
223 228
 set -x
224 229
 
225 230
 docker pull $img
226
-DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
231
+DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
227 232
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
228 233
 if ! [[ $arch =~ $myarch ]]; then
229 234
     docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
@@ -250,16 +255,16 @@ case $mode in
250 255
         done
251 256
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
252 257
         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
253
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
254
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
255
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
256
-        for repo in "${repos[@]}"; do
257
-            ifthenelse "${repo}" "apt-add-repository 'ARG'"
258
-        done
258
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
259
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
260
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
259 261
         for key in "${keys[@]}"; do
260 262
             wget -O- "$key" \
261 263
                 | docker exec -i ${DOCKER_ID} apt-key add -
262 264
         done
265
+        for repo in "${repos[@]}"; do
266
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
267
+        done
263 268
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
264 269
         for package in "${packages[@]}"; do
265 270
             ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"

+ 1
- 1
template.sh View File

@@ -39,7 +39,7 @@ message() {
39 39
     if test $# -eq 0; then
40 40
         return
41 41
     fi
42
-    echo "${bold}${while}$*${normal}" 1>&2
42
+    echo "${bold}${white}$*${normal}" 1>&2
43 43
 }
44 44
 
45 45
 # write a success message

Loading…
Cancel
Save