diff --git a/.gitmodules b/.gitmodules index 0a44de3..3d2b8b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,9 +24,6 @@ [submodule "sysa/tcc-0.9.27/src/tcc-0.9.27"] path = sysa/tcc-0.9.27/src/tcc-0.9.27 url = git://repo.or.cz/tinycc.git -[submodule "sysa/sed-4.0.7/src"] - path = sysa/sed-4.0.7/src - url = https://git.savannah.gnu.org/git/sed/sed-history.git [submodule "sysa/tcc-0.9.26/src/mes-libc"] path = sysa/tcc-0.9.26/src/mes-libc url = https://gitlab.com/janneke/mes diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index dc9b6c4..3b8dbc0 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -27,6 +27,7 @@ ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.ta 1184478b298978b164a383ed5661e3a117c48ab97d6d0ab7ef614cdbe918b9eb perl5.004_05.tar.gz 93f41cd87ab8ee83391cfa39a63b076adeb7c3501d2efa31b98d0ef037122bd1 perl5.005_03.tar.gz a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e perl-5.6.2.tar.gz +63ec0437ab1c3d62e8d63f8e6d604456c695bfcbe9297021ecc607fd90fd0da0 sed-4.0.7.tar.gz c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600 sed-4.0.9.tar.gz 404a8d72427a559c074e581bf8f7d5a73283faf249cd3faf6dc1c6faf97d07c7 sha-2-61555d.tar.gz c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a tar-1.12.tar.gz diff --git a/rootfs.sh b/rootfs.sh index 363b4d0..347401e 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -101,9 +101,6 @@ popd # tcc 0.9.27 cp -r tcc-0.9.27 tmp/after/ -# sed 4.0.7 -cp -r sed-4.0.7 tmp/after/ - # tar 1.12 url=https://ftp.gnu.org/gnu/tar/tar-1.12.tar.gz cp -r tar-1.12 tmp/after @@ -141,6 +138,9 @@ get_file() { # gzip 1.2.4 get_file https://ftp.gnu.org/gnu/gzip/gzip-1.2.4.tar 1 +# sed 4.0.7 +get_file https://ftp.gnu.org/gnu/sed/sed-4.0.7.tar.gz 1 + # patch 2.5.9 get_file https://ftp.gnu.org/pub/gnu/patch/patch-2.5.9.tar.gz 1 diff --git a/sysa/sed-4.0.7/sed-4.0.7.kaem b/sysa/sed-4.0.7/sed-4.0.7.kaem index 235ed29..2487bb4 100755 --- a/sysa/sed-4.0.7/sed-4.0.7.kaem +++ b/sysa/sed-4.0.7/sed-4.0.7.kaem @@ -2,12 +2,18 @@ # SPDX-FileCopyrightText: 2021 Andrius Štikonas # SPDX-FileCopyrightText: 2021 fosslinux +# SPDX-FileCopyrightText: 2021 Paul Dersey # # SPDX-License-Identifier: GPL-3.0-or-later set -ex -cd src +cd build + +# Extract +gunzip ../src/${pkg}.tar.gz +tar xf ../src/${pkg}.tar +cd ${pkg} # Create config.h catm config.h @@ -43,7 +49,7 @@ tcc -static -o ${bindir}/sed -L lib lib/libsed.a compile.o execute.o regex.o fmt # Test sed --version -cd .. +cd ../.. # Checksums fletcher16 checksums diff --git a/sysa/sed-4.0.7/src b/sysa/sed-4.0.7/src deleted file mode 160000 index b8fb156..0000000 --- a/sysa/sed-4.0.7/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b8fb156db0eedfd28db3340b418591e8fcab08bc