Skip to content

Commit

Permalink
Changed /bin to /usr/bin
Browse files Browse the repository at this point in the history
Signed-off-by: Jie Chen <jiechen3@microsoft.com>
  • Loading branch information
jiechen0826 committed Jan 17, 2025
1 parent ae36274 commit 5b2442c
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/%=%)
Expand Down

0 comments on commit 5b2442c

Please sign in to comment.