Skip to content

Commit

Permalink
oct: Fixes dependencies on uncompressed files
Browse files Browse the repository at this point in the history
Fix a recent regression that broke the dependencies on uncompressed
files causing files to not be found.
This is also fixing an issue where *.checksum was generated with the
full output from sha256sum instead of only the checksum part, which was
the original intention.

Fixes: 7adb8b9 ("oct: Save all uncompressed files in srcdir")

Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
  • Loading branch information
tuliom committed May 2, 2022
1 parent bde1f96 commit 2b20ef2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions oct/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@ minigzip.c:
https://raw.githubusercontent.com/madler/zlib/master/test/$@

.PRECIOUS: %.uncompressed
empty.uncompressed:
$(srcdir)/empty.uncompressed:
cd $(srcdir) && dd if=/dev/null bs=1k count=1 of=$@

random4k.uncompressed:
$(srcdir)/random4k.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=4k count=1 of=$@

random13M.uncompressed:
$(srcdir)/random13M.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=1M count=13 of=$@

sparse10M.uncompressed:
$(srcdir)/sparse10M.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=1 count=0 seek=10M of=$@

sparse1000M.uncompressed:
$(srcdir)/sparse1000M.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=1 count=0 seek=1000M of=$@

zero4k.uncompressed:
$(srcdir)/zero4k.uncompressed:
cd $(srcdir) && dd if=/dev/zero bs=4k count=1 of=$@

zero13M.uncompressed:
$(srcdir)/zero13M.uncompressed:
cd $(srcdir) && dd if=/dev/zero bs=1M count=13 of=$@


Expand Down Expand Up @@ -81,8 +81,8 @@ zero13M.uncompressed:

# Pre-compute the checksum of all files in parallel.
.PRECIOUS: %.checksum
%.checksum: %.uncompressed
@$(SHA256SUM) $(srcdir)/$? | $(AWK) '{ print $1 }' > $@
%.checksum: $(srcdir)/%.uncompressed
@$(SHA256SUM) $? | $(AWK) '{ print $$1 }' > $@

check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) \
Expand Down
18 changes: 9 additions & 9 deletions oct/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1040,25 +1040,25 @@ minigzip.c:
https://raw.githubusercontent.com/madler/zlib/master/test/$@

.PRECIOUS: %.uncompressed
empty.uncompressed:
$(srcdir)/empty.uncompressed:
cd $(srcdir) && dd if=/dev/null bs=1k count=1 of=$@

random4k.uncompressed:
$(srcdir)/random4k.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=4k count=1 of=$@

random13M.uncompressed:
$(srcdir)/random13M.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=1M count=13 of=$@

sparse10M.uncompressed:
$(srcdir)/sparse10M.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=1 count=0 seek=10M of=$@

sparse1000M.uncompressed:
$(srcdir)/sparse1000M.uncompressed:
cd $(srcdir) && dd if=/dev/urandom bs=1 count=0 seek=1000M of=$@

zero4k.uncompressed:
$(srcdir)/zero4k.uncompressed:
cd $(srcdir) && dd if=/dev/zero bs=4k count=1 of=$@

zero13M.uncompressed:
$(srcdir)/zero13M.uncompressed:
cd $(srcdir) && dd if=/dev/zero bs=1M count=13 of=$@

%.uncompressed: %.source download.sh config.sh
Expand Down Expand Up @@ -1086,8 +1086,8 @@ zero13M.uncompressed:

# Pre-compute the checksum of all files in parallel.
.PRECIOUS: %.checksum
%.checksum: %.uncompressed
@$(SHA256SUM) $(srcdir)/$? | $(AWK) '{ print $1 }' > $@
%.checksum: $(srcdir)/%.uncompressed
@$(SHA256SUM) $? | $(AWK) '{ print $$1 }' > $@

check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) \
Expand Down

0 comments on commit 2b20ef2

Please sign in to comment.