kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Properly handle writing $(config) files to dist

Browse Source 
The `cp` operation was copying files to the root of dist, rather than to the
proper relative location. Including them in the dist file mainfest lets tar
handle this properly.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-02-07 14:37:29 -07:00
parent 97cc5576b1
commit 0160248429
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -166,9 +166,9 @@ init:
dist: $(config) dist: $(config)
rm -rf .dist/ rm -rf .dist/
mkdir -p .dist/$(WAREWULF)-$(VERSION) mkdir -p .dist/$(WAREWULF)-$(VERSION)
git ls-files >.dist/git-ls-files (git ls-files; printf "%s\n" $(config)) >.dist/dist-files
tar -c --files-from .dist/git-ls-files | tar -C .dist/$(WAREWULF)-$(VERSION) -x tar -c --files-from .dist/dist-files | tar -C .dist/$(WAREWULF)-$(VERSION) -x
cp -a vendor/ $(config) .dist/$(WAREWULF)-$(VERSION) test -d vendor/ && cp -a vendor/ .dist/$(WAREWULF)-$(VERSION) || :
scripts/get-version.sh >.dist/$(WAREWULF)-$(VERSION)/VERSION scripts/get-version.sh >.dist/$(WAREWULF)-$(VERSION)/VERSION
tar -C .dist -czf $(WAREWULF)-$(VERSION).tar.gz $(WAREWULF)-$(VERSION) tar -C .dist -czf $(WAREWULF)-$(VERSION).tar.gz $(WAREWULF)-$(VERSION)
rm -rf .dist/ rm -rf .dist/