commit 15a7d000a6c2a069b783f324586364790008b868
author June Tate-Gans <jtgans@google.com> Tue Jul 21 18:31:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 21 18:31:52 2020 +0000
tree 0051e4deb59898e00ba372acd29aa21f6a8e1a12
parent 9386778f931b662a9a66c331794fe985067d0a25
parent ac3a61b435e8df400d167a2347799794df897b7b

Merge "image: Ensure sha256sum generates relative paths"

rootfs.mk

diff --git a/rootfs.mk b/rootfs.mk
index 89cfa77..1dd169a 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -63,7 +63,7 @@
 	$(LOG) rootfs raw-cache
 	mkdir -p $(dir $(ROOTFS_RAW_IMG))
 	cp $(ROOTFS_RAW_LOCAL_CACHE_PATH) $(ROOTFS_RAW_IMG)
-	sha256sum $(ROOTFS_RAW_IMG) > $(ROOTFS_RAW_IMG).sha256sum
+	cd $(dir $(ROOTFS_RAW_IMG)); sha256sum $(notdir $(ROOTFS_RAW_IMG)) > $(ROOTFS_RAW_IMG).sha256sum
 	$(LOG) rootfs raw-cache finished
 else
 $(ROOTFS_RAW_IMG): $(ROOTDIR)/build/preamble.mk $(ROOTDIR)/build/rootfs.mk /usr/bin/qemu-$(QEMU_ARCH)-static /tmp/multistrap
@@ -111,7 +111,7 @@
 	sudo rmdir $(ROOTFS_DIR)
 	sudo sync $(ROOTFS_RAW_IMG)
 	sudo chown ${USER} $(ROOTFS_RAW_IMG)
-	sha256sum $(ROOTFS_RAW_IMG) > $(ROOTFS_RAW_IMG).sha256sum
+	cd $(dir $(ROOTFS_RAW_IMG); sha256sum $(notdir $(ROOTFS_RAW_IMG)) > $(ROOTFS_RAW_IMG).sha256sum
 	$(LOG) rootfs raw-build finished
 endif