From eeca7cda27fbc8cc11933b1b061491c98ada6553 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sun, 17 Feb 2019 13:26:19 +0000
Subject: OK, that blew out on disk space, try again
---
Makefile | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
(limited to 'Makefile')
diff --git a/Makefile b/Makefile
index 2573890..b34a496 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ XILINX_LICENSE := Xilinx.lic
BOOTSTRAP_IMAGE := cryptech-builder:bootstrap
BOOTSTRAP_CONTAINER := cryptech-builder-bootstrap
CRYPTECH_BASE_FILE := cryptech-builder-base-image.xz
-XILINX_PKGDIR := fs/$(basename ${XILINX_TARBALL})
+XILINX_PKGDIR := $(basename ${XILINX_TARBALL})
ifneq (./,$(sort $(dir ${XILINX_TARBALL} ${XILINX_LICENSE})))
$(error XILINX_TARBALL and XILINX_LICENSE must be in this directory for bind mount)
@@ -19,18 +19,16 @@ ${CRYPTECH_BASE_FILE}: ${XILINX_TARBALL} ${XILINX_LICENSE} Builder Ratinox
rm -rf fs
mkdir fs
sudo /usr/sbin/debootstrap --foreign jessie fs
+ sudo tar -C fs -xf ${XILINX_TARBALL}
+ test -d fs/${XILINX_PKGDIR}
sudo tar -C fs -c . | docker import - ${BOOTSTRAP_IMAGE}
sudo rm -rf fs
- mkdir fs
- tar -C fs -xf ${XILINX_TARBALL}
- test -d ${XILINX_PKGDIR}
docker run -it --name ${BOOTSTRAP_CONTAINER} \
--mount type=bind,source=$(abspath .),target=/cryptech-builder \
- --env 'XILINX_PKGDIR=/cryptech-builder/${XILINX_PKGDIR}' \
+ --env 'XILINX_PKGDIR=/${XILINX_PKGDIR}' \
--env 'XILINX_LICENSE=${XILINX_LICENSE}' \
${BOOTSTRAP_IMAGE} \
/cryptech-builder/Builder
- rm -rf fs
-mogrify -verbose -format png *.xwd && rm *.xwd
docker export ${BOOTSTRAP_CONTAINER} | xz -v >${CRYPTECH_BASE_FILE}.tmp
docker container rm -f ${BOOTSTRAP_CONTAINER}
--
cgit v1.2.3