From: Stefano Stabellini <sstabellini@kernel.org>
Date: Mon, 13 Nov 2017 23:07:12 +0000 (-0800)
Subject: Use out/ consistently
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2d2fcc53fa3c3a0a613d68d977f6884c10ed5f5a;p=people%2Fsstabellini%2Fmojo.git%2F.git

Use out/ consistently

All build products go to the out/ directory

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/build.sh b/build.sh
index 7d87be1..e6dd686 100644
--- a/build.sh
+++ b/build.sh
@@ -34,20 +34,20 @@ then
     docker run $DOM0_LABEL /root/sleep &
     sleep 1
     container_id=`docker ps | grep $DOM0_LABEL | cut -f 1 -d " "`
-    docker export $container_id > mkimage/"$DOM0_LABEL".tar
+    docker export $container_id > out/"$DOM0_LABEL".tar
     docker kill $container_id
 fi
 
 exists=`docker images $IMAGE_BUILD_LABEL | grep $IMAGE_BUILD_LABEL`
 if test -z "$exists"
 then
-    docker build -f mkimage/Dockerfile -t $IMAGE_BUILD_LABEL ./mkimage
+    docker build -f mkimage/Dockerfile -t $IMAGE_BUILD_LABEL .
 fi
 
 # Create system image
-if ! test -f image
+if ! test -f out/image
 then
-    docker run --privileged -i $IMAGE_BUILD_LABEL /make-efi > image
+    docker run --privileged -i $IMAGE_BUILD_LABEL /make-efi > out/image
 fi
 
 
diff --git a/mkimage/Dockerfile b/mkimage/Dockerfile
index a085858..3de85f1 100644
--- a/mkimage/Dockerfile
+++ b/mkimage/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine AS grub-build
 
-ADD dom0.tar /root
+ADD out/dom0.tar /root
 
 RUN apk update && apk add \
   automake \
@@ -23,7 +23,7 @@ ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto d
 search_disk_uuid tftp verify xzio xfs video multiboot2 gfxterm efi_gop efi_uga"
 ENV GRUB_COMMIT=6782f6d431d22b4e9ab14e94d263795c7991e160
 
-COPY patches/* /patches/
+COPY mkimage/patches/* /patches/
 RUN mkdir /grub-lib && \
   set -e && \
   git clone https://github.com/coreos/grub.git && \
@@ -63,6 +63,6 @@ RUN \
   multipath-tools \
   && true
 
-COPY make-efi /
+COPY mkimage/make-efi /
 
 ENTRYPOINT [ "/bin/sh" ]