summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@sentrium.io>2019-10-03 10:43:27 -0500
committerJohn Estabrook <jestabro@sentrium.io>2019-10-03 15:36:52 -0500
commit9e5435a6ce462c8d1a6327a3ae48987190e4cec4 (patch)
tree39a968de9171fb5f01dee7b6d26744e791823262 /docker
parent173aaa25b60efa45b402b68f9b193cf9f83b3746 (diff)
downloadvyos-build-9e5435a6ce462c8d1a6327a3ae48987190e4cec4.tar.gz
vyos-build-9e5435a6ce462c8d1a6327a3ae48987190e4cec4.zip
T1710: [equuleus] buster: add patch to fix live-build missing key error
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile17
1 files changed, 16 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 799b118d..d1da13b0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -68,7 +68,8 @@ RUN apt-get update && apt-get install -y \
pkg-config \
debhelper \
gosu \
- live-build \
+ po4a \
+ cpio \
jq
# Package needed for mdns-repeater
@@ -293,6 +294,20 @@ RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packe
chmod +x /usr/bin/packer
#
+# live-build: building with local packages fails due to missing keys
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941691
+# https://salsa.debian.org/live-team/live-build/merge_requests/30
+#
+RUN wget https://salsa.debian.org/jestabro-guest/live-build/commit/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
+ git clone https://salsa.debian.org/live-team/live-build.git && \
+ cd live-build && \
+ git checkout debian/1%20190311 && \
+ patch -p1 < ../63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
+ dch -n "Applying fix for missing archive keys" && \
+ dpkg-buildpackage -us -uc && \
+ sudo dpkg -i ../live-build*.deb
+
+#
# live-build: building in docker fails with mounting /proc | /sys
#
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659