diff --git a/.reuse/dep5 b/.reuse/dep5 index 6f9bcc45..d2344cc5 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -9,6 +9,6 @@ Source: https://github.com/fosslinux/live-bootstrap # Copyright: $YEAR $NAME <$CONTACT> # License: ... -Files: SHA256SUMS.sources sysa/pre-sha.sha256sums sysa/*/checksums sysa/SHA256SUMS.pkgs +Files: SHA256SUMS.sources sysa/pre-sha.sha256sums sysa/*/*.checksums sysa/SHA256SUMS.pkgs Copyright: none License: MIT diff --git a/DEVEL.md b/DEVEL.md index 87e4d2e2..e1d575e0 100644 --- a/DEVEL.md +++ b/DEVEL.md @@ -40,7 +40,7 @@ It then diverges based upon which driver is being used: There are default functions run which can be overridden by an optional script `package-version.sh` within the package-specific directory. -In this folder, there are other folders/files. `src` and `checksums` are +In this folder, there are other folders/files. `src` and `*.checksums` are required, others are optional. Permissable folders/files: @@ -50,11 +50,8 @@ Permissable folders/files: - `patches`: patches for the source. - `src`: the upstream unmodified source code. This may be either a submodule or nonexistent. -- `checksums`: the checksums for the resulting binaries and libraries that - are compiled and installed. This may be either a folder or a file. It should - be a folder when there are multiple checksumming files required (normally - multiple seperate passes) but a file when there is only one checksumming - file. +- `*.checksums`: files containing the checksums for the resulting binaries and +libraries that are compiled and installed. - Up to and including `patch`, `fletcher16` is used for the checksumming. - After `patch`, `sha-2` is built which contains an external implementation of `sha256sum`. We then use that currently for all remaining software. diff --git a/sysa/bash-2.05b/checksums b/sysa/bash-2.05b/bash-2.05b.checksums similarity index 100% rename from sysa/bash-2.05b/checksums rename to sysa/bash-2.05b/bash-2.05b.checksums diff --git a/sysa/bash-2.05b/bash-2.05b.kaem b/sysa/bash-2.05b/bash-2.05b.kaem index b6ac4ebb..33c44158 100755 --- a/sysa/bash-2.05b/bash-2.05b.kaem +++ b/sysa/bash-2.05b/bash-2.05b.kaem @@ -51,4 +51,4 @@ ln -s ${prefix}/bin/bash ${prefix}/bin/sh cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/bzip2-1.0.8/checksums b/sysa/bzip2-1.0.8/bzip2-1.0.8.checksums similarity index 100% rename from sysa/bzip2-1.0.8/checksums rename to sysa/bzip2-1.0.8/bzip2-1.0.8.checksums diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem b/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem index d2cfd704..28fa0ef0 100755 --- a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem +++ b/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem @@ -35,4 +35,4 @@ bzip2 --help cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/coreutils-5.0/checksums b/sysa/coreutils-5.0/coreutils-5.0.checksums similarity index 100% rename from sysa/coreutils-5.0/checksums rename to sysa/coreutils-5.0/coreutils-5.0.checksums diff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/sysa/coreutils-5.0/coreutils-5.0.kaem index ad718214..8f1c4499 100755 --- a/sysa/coreutils-5.0/coreutils-5.0.kaem +++ b/sysa/coreutils-5.0/coreutils-5.0.kaem @@ -38,4 +38,4 @@ cd ../.. rm -r src/ # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/gzip-1.2.4/checksums b/sysa/gzip-1.2.4/gzip-1.2.4.checksums similarity index 100% rename from sysa/gzip-1.2.4/checksums rename to sysa/gzip-1.2.4/gzip-1.2.4.checksums diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/sysa/gzip-1.2.4/gzip-1.2.4.kaem index d5f0c005..e73404d0 100755 --- a/sysa/gzip-1.2.4/gzip-1.2.4.kaem +++ b/sysa/gzip-1.2.4/gzip-1.2.4.kaem @@ -37,4 +37,4 @@ chmod 755 ${bindir}/gunzip cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/heirloom-devtools-070527/checksums b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums similarity index 100% rename from sysa/heirloom-devtools-070527/checksums rename to sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums diff --git a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem index 8605eae1..665c66dc 100755 --- a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem +++ b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem @@ -44,4 +44,4 @@ install -m 644 ncform ${lexdir} cd ../../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/make-3.80/checksums b/sysa/make-3.80/make-3.80.checksums similarity index 100% rename from sysa/make-3.80/checksums rename to sysa/make-3.80/make-3.80.checksums diff --git a/sysa/make-3.80/make-3.80.kaem b/sysa/make-3.80/make-3.80.kaem index 5f5dc1d5..8936f779 100755 --- a/sysa/make-3.80/make-3.80.kaem +++ b/sysa/make-3.80/make-3.80.kaem @@ -55,4 +55,4 @@ make --version cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/mes-0.24/checksums b/sysa/mes-0.24/mes-0.24.checksums similarity index 100% rename from sysa/mes-0.24/checksums rename to sysa/mes-0.24/mes-0.24.checksums diff --git a/sysa/mes-0.24/mes-0.24.kaem b/sysa/mes-0.24/mes-0.24.kaem index ab722023..d0e5792e 100755 --- a/sysa/mes-0.24/mes-0.24.kaem +++ b/sysa/mes-0.24/mes-0.24.kaem @@ -316,4 +316,4 @@ cp include/sys/wait.h ${incdir}/sys/wait.h # Checksums cd ../.. -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/patch-2.5.9/checksums b/sysa/patch-2.5.9/patch-2.5.9.checksums similarity index 100% rename from sysa/patch-2.5.9/checksums rename to sysa/patch-2.5.9/patch-2.5.9.checksums diff --git a/sysa/patch-2.5.9/patch-2.5.9.kaem b/sysa/patch-2.5.9/patch-2.5.9.kaem index 1094ff00..4805c7cc 100755 --- a/sysa/patch-2.5.9/patch-2.5.9.kaem +++ b/sysa/patch-2.5.9/patch-2.5.9.kaem @@ -34,4 +34,4 @@ chmod 755 ${prefix}/bin/patch cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/sed-4.0.9/checksums b/sysa/sed-4.0.9/sed-4.0.9.checksums similarity index 100% rename from sysa/sed-4.0.9/checksums rename to sysa/sed-4.0.9/sed-4.0.9.checksums diff --git a/sysa/sed-4.0.9/sed-4.0.9.kaem b/sysa/sed-4.0.9/sed-4.0.9.kaem index a5ead71b..8670bf91 100755 --- a/sysa/sed-4.0.9/sed-4.0.9.kaem +++ b/sysa/sed-4.0.9/sed-4.0.9.kaem @@ -31,4 +31,4 @@ chmod 755 ${prefix}/bin/sed cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/tar-1.12/checksums b/sysa/tar-1.12/tar-1.12.checksums similarity index 100% rename from sysa/tar-1.12/checksums rename to sysa/tar-1.12/tar-1.12.checksums diff --git a/sysa/tar-1.12/tar-1.12.kaem b/sysa/tar-1.12/tar-1.12.kaem index 18535f35..10b5e5c5 100755 --- a/sysa/tar-1.12/tar-1.12.kaem +++ b/sysa/tar-1.12/tar-1.12.kaem @@ -34,4 +34,4 @@ chmod 755 ${prefix}/bin/tar cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/tcc-0.9.26/checksums b/sysa/tcc-0.9.26/tcc-0.9.26.checksums similarity index 100% rename from sysa/tcc-0.9.26/checksums rename to sysa/tcc-0.9.26/tcc-0.9.26.checksums diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.kaem b/sysa/tcc-0.9.26/tcc-0.9.26.kaem index 9975b1cf..9a1ce03d 100755 --- a/sysa/tcc-0.9.26/tcc-0.9.26.kaem +++ b/sysa/tcc-0.9.26/tcc-0.9.26.kaem @@ -388,4 +388,4 @@ tcc -ar cr ${libdir}/libgetopt.a getopt.o cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums diff --git a/sysa/tcc-0.9.27/checksums b/sysa/tcc-0.9.27/tcc-0.9.27.checksums similarity index 100% rename from sysa/tcc-0.9.27/checksums rename to sysa/tcc-0.9.27/tcc-0.9.27.checksums diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.kaem b/sysa/tcc-0.9.27/tcc-0.9.27.kaem index 09550515..181b3c68 100755 --- a/sysa/tcc-0.9.27/tcc-0.9.27.kaem +++ b/sysa/tcc-0.9.27/tcc-0.9.27.kaem @@ -47,4 +47,4 @@ tcc -version cd ../.. # Checksums -sha256sum -c checksums +sha256sum -c ${pkg}.checksums