From 5b2442c6364638c1e0905fbb0bab729a8cac67fe Mon Sep 17 00:00:00 2001 From: Jie Chen Date: Fri, 17 Jan 2025 11:20:02 -0800 Subject: [PATCH] Changed /bin to /usr/bin Signed-off-by: Jie Chen --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9a9f5b4014..0d1550a361 100644 --- a/Makefile +++ b/Makefile @@ -64,14 +64,14 @@ out/delta-snp.tar.gz: out/delta.tar.gz bin/internal/tools/snp-report boot/startu out/delta.tar.gz: bin/init bin/vsockexec bin/cmd/gcs bin/cmd/gcstools bin/cmd/hooks/wait-paths Makefile @mkdir -p out rm -rf rootfs - mkdir -p rootfs/bin/ + mkdir -p rootfs/usr/bin/ mkdir -p rootfs/info/ cp bin/init rootfs/ - cp bin/vsockexec rootfs/bin/ - cp bin/cmd/gcs rootfs/bin/ - cp bin/cmd/gcstools rootfs/bin/ - cp bin/cmd/hooks/wait-paths rootfs/bin/ - for tool in $(GCS_TOOLS); do ln -s gcstools rootfs/bin/$$tool; done + cp bin/vsockexec rootfs/usr/bin/ + cp bin/cmd/gcs rootfs/usr/bin/ + cp bin/cmd/gcstools rootfs/usr/bin/ + cp bin/cmd/hooks/wait-paths rootfs/usr/bin/ + for tool in $(GCS_TOOLS); do ln -s gcstools rootfs/usr/bin/$$tool; done git -C $(SRCROOT) rev-parse HEAD > rootfs/info/gcs.commit && \ git -C $(SRCROOT) rev-parse --abbrev-ref HEAD > rootfs/info/gcs.branch && \ date --iso-8601=minute --utc > rootfs/info/tar.date @@ -81,6 +81,9 @@ out/delta.tar.gz: bin/init bin/vsockexec bin/cmd/gcs bin/cmd/gcstools bin/cmd/ho tar -zcf $@ -C rootfs . rm -rf rootfs + # # Create symlink from /usr/bin to /bin + # ln -s /usr/bin /bin + bin/cmd/gcs bin/cmd/gcstools bin/cmd/hooks/wait-paths bin/cmd/tar2ext4 bin/internal/tools/snp-report: @mkdir -p $(dir $@) GOOS=linux $(GO_BUILD) -o $@ $(SRCROOT)/$(@:bin/%=%)