aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2019-02-11 22:17:44 +0000
committerRob Austein <sra@hactrn.net>2019-02-11 22:17:44 +0000
commit8b18f65526d2b600c4aef49be338a83402bb6b58 (patch)
tree439b4a893d181bddde48ae7031afc3c0285ac11e
parent2fb10e93039defa73810140fb10bef1ab23650c4 (diff)
Update notes.
-rw-r--r--.gitignore2
-rw-r--r--Makefile4
-rw-r--r--README.md10
-rw-r--r--stage2/Dockerfile3
4 files changed, 14 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 5146787..1bd43b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
framebuf/Xvfb_screen0
-screenlog.0
+screenlog.*
*.stamp
Xilinx_ISE_DS_Lin_14.7_1015_1.tar
Xilinx.lic
diff --git a/Makefile b/Makefile
index 58db110..2b7a492 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-all: build
+all: debug
build: stage0.stamp stage1.stamp stage2.stamp # stage3.stamp
debug: stage2.stamp
docker container prune -f
mkdir -p framebuf
- docker run -it --mount type=bind,source=$(abspath framebuf),target=/framebuf xilinx:intalled
+ docker run -it --mount type=bind,source=$(abspath framebuf),target=/framebuf xilinx:installed /xilinx-unpack/installer
stage0.stamp:
mkdir -p stage0/jessie_chroot
diff --git a/README.md b/README.md
index cf7c8c5..1d9e25c 100644
--- a/README.md
+++ b/README.md
@@ -153,3 +153,13 @@ even need to convert from `xwd` format to something more common, we
can just `shutil.copyfile()` the frame buffer file and leave the
results for somebody else to deal with. If anything is going to keep
those they should probably be converted to png but not critical.
+
+OK, confirmed that the problem with running `Xvfb` is (somehow)
+specific to running under `docker build`. Same configuration (packge
+list, etc) ran (apparently) fine under `docker run`.
+
+Attempting to `docker commit` the result blew out what was left of my
+disk space. Since we're going to want to clean up and collapse
+anyway, it's possible that `docker container export` is a better path
+than commit here: would have to feed the result to `docker import` to
+get an image, but that might be exactly what we want.
diff --git a/stage2/Dockerfile b/stage2/Dockerfile
index 7b69f88..6b1c170 100644
--- a/stage2/Dockerfile
+++ b/stage2/Dockerfile
@@ -10,6 +10,5 @@ RUN apt-get update && apt-get install -y \
COPY installer /xilinx-unpack/
-RUN /xilinx-unpack/installer
-
+#RUN /xilinx-unpack/installer
#RUN rm -rf /xilinx-unpack