From 51105a6700f47e8cf840676dd36469125fbbb82c Mon Sep 17 00:00:00 2001
From: Ryo Ota <nwtgck@nwtgck.org>
Date: Mon, 20 Sep 2021 11:04:46 +0900
Subject: [PATCH] Fix debian build

---
 tools/docker/debian/Dockerfile         |  2 +-
 tools/docker/debian/build-container.sh | 10 +++++-----
 tools/docker/debian/build-state.js     |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/docker/debian/Dockerfile b/tools/docker/debian/Dockerfile
index e202dce3..543dd6ce 100644
--- a/tools/docker/debian/Dockerfile
+++ b/tools/docker/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM i386/debian
+FROM i386/debian:buster
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/tools/docker/debian/build-container.sh b/tools/docker/debian/build-container.sh
index be1fe981..fd4ff4b5 100755
--- a/tools/docker/debian/build-container.sh
+++ b/tools/docker/debian/build-container.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -veu
 
-OUT_ROOTFS_TAR=$(dirname "$0")/../../images/debian-9p-rootfs.tar
-OUT_ROOTFS_FLAT=$(dirname "$0")/../../images/debian-9p-rootfs-flat
-OUT_FSJSON=$(dirname "$0")/../../images/debian-base-fs.json
+OUT_ROOTFS_TAR=$(dirname "$0")/../../../images/debian-9p-rootfs.tar
+OUT_ROOTFS_FLAT=$(dirname "$0")/../../../images/debian-9p-rootfs-flat
+OUT_FSJSON=$(dirname "$0")/../../../images/debian-base-fs.json
 CONTAINER_NAME=debian-full
 IMAGE_NAME=i386/debian-full
 
@@ -13,10 +13,10 @@ docker create -t -i --name "$CONTAINER_NAME" "$IMAGE_NAME" bash
 
 docker export "$CONTAINER_NAME" > "$OUT_ROOTFS_TAR"
 
-$(dirname "$0")/../../tools/fs2json.py --out "$OUT_FSJSON" "$OUT_ROOTFS_TAR"
+$(dirname "$0")/../../../tools/fs2json.py --out "$OUT_FSJSON" "$OUT_ROOTFS_TAR"
 
 # Note: Not deleting old files here
 mkdir -p "$OUT_ROOTFS_FLAT"
-$(dirname "$0")/../../tools/copy-to-sha256.py "$OUT_ROOTFS_TAR" "$OUT_ROOTFS_FLAT"
+$(dirname "$0")/../../../tools/copy-to-sha256.py "$OUT_ROOTFS_TAR" "$OUT_ROOTFS_FLAT"
 
 echo "$OUT_ROOTFS_TAR", "$OUT_ROOTFS_FLAT" and "$OUT_FSJSON" created.
diff --git a/tools/docker/debian/build-state.js b/tools/docker/debian/build-state.js
index 33d55688..dfffb4f2 100755
--- a/tools/docker/debian/build-state.js
+++ b/tools/docker/debian/build-state.js
@@ -9,9 +9,9 @@ const path = require("path");
 console.log("Don't forget to run `make all` before running this script");
 
 var fs = require("fs");
-var V86 = require("./../../build/libv86.js").V86;
+var V86 = require("./../../../build/libv86.js").V86;
 
-const V86_ROOT = path.join(__dirname, "../..");
+const V86_ROOT = path.join(__dirname, "../../..");
 
 var OUTPUT_FILE = path.join(V86_ROOT, "images/debian-state-base.bin");