Skip to content

Commit 0865169

Browse files
committed
Makefile: no stderr for readme, set output filename, fix checksum dep
1 parent c4785dd commit 0865169

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ README.md: README.md.in build-x86-images.sh mklive.sh mkrootfs.sh mkplatformfs.s
3939
cat README.md.in >> README.md
4040
for script in build-x86-images mklive mkrootfs mkplatformfs mkimage mknet; do \
4141
printf '### %s.sh\n\n```\n' "$${script}" >> README.md ; \
42-
"./$${script}.sh" -h >> README.md ; \
42+
"./$${script}.sh" -h 2>/dev/null >> README.md ; \
4343
printf '```\n\n' >> README.md ; \
4444
done
4545

46-
checksum: dist
46+
checksum: distdir-$(DATECODE)
4747
cd distdir-$(DATECODE)/ && sha256 * > sha256sum.txt
4848

4949
distdir-$(DATECODE):
@@ -69,7 +69,7 @@ rootfs-all-print:
6969

7070
void-%-ROOTFS-$(DATECODE).tar.xz:
7171
@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
72-
$(SUDO) ./mkrootfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $*
72+
$(SUDO) ./mkrootfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) -o $@ $*
7373
@[ -n "${CI}" ] && printf '::endgroup::\n' || true
7474

7575
platformfs-all: $(ALL_PLATFORMFS)
@@ -80,7 +80,7 @@ platformfs-all-print:
8080
.SECONDEXPANSION:
8181
void-%-PLATFORMFS-$(DATECODE).tar.xz: void-$$(shell ./lib.sh platform2arch %)-ROOTFS-$(DATECODE).tar.xz
8282
@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
83-
$(SUDO) ./mkplatformfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) $* void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATECODE).tar.xz
83+
$(SUDO) ./mkplatformfs.sh $(XBPS_REPOSITORY) -x $(COMPRESSOR_THREADS) -o $@ $* void-$(shell ./lib.sh platform2arch $*)-ROOTFS-$(DATECODE).tar.xz
8484
@[ -n "${CI}" ] && printf '::endgroup::\n' || true
8585

8686
images-all: platformfs-all images-all-sbc images-all-cloud
@@ -97,7 +97,7 @@ images-all-print:
9797

9898
void-%-$(DATECODE).img.xz: void-%-PLATFORMFS-$(DATECODE).tar.xz
9999
@[ -n "${CI}" ] && printf "::group::\x1b[32mBuilding $@...\x1b[0m\n" || true
100-
$(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-$*-PLATFORMFS-$(DATECODE).tar.xz
100+
$(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) -o $(basename $@) void-$*-PLATFORMFS-$(DATECODE).tar.xz
101101
@[ -n "${CI}" ] && printf '::endgroup::\n' || true
102102

103103
# Some of the images MUST be compressed with gzip rather than xz, this

0 commit comments

Comments
 (0)