From 621b099a57e1eea03a14672fdb7239f69dc91336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 17 Feb 2021 20:23:50 +0000 Subject: [PATCH] Switch to perl tarballs generated from archiving git tags. --- SHA256SUMS.sources | 4 ++-- rootfs.sh | 5 ++--- sysa/{perl5.000 => perl-5.000}/files/config.h | 0 sysa/{perl5.000 => perl-5.000}/files/keywords.sh | 2 ++ sysa/{perl5.000 => perl-5.000}/files/opcode.awk | 0 sysa/{perl5.000 => perl-5.000}/files/opcode.sh | 1 + sysa/{perl5.000 => perl-5.000}/mk/main.mk | 0 .../perl5.000.sh => perl-5.000/perl-5.000.sh} | 12 +++++++++++- sysa/{perl5.003 => perl-5.003}/files/config.h | 0 sysa/{perl5.003 => perl-5.003}/mk/main.mk | 0 .../perl5.003.sh => perl-5.003/perl-5.003.sh} | 8 ++++++++ sysa/run.sh | 4 ++-- 12 files changed, 28 insertions(+), 8 deletions(-) rename sysa/{perl5.000 => perl-5.000}/files/config.h (100%) rename sysa/{perl5.000 => perl-5.000}/files/keywords.sh (87%) rename sysa/{perl5.000 => perl-5.000}/files/opcode.awk (100%) rename sysa/{perl5.000 => perl-5.000}/files/opcode.sh (97%) rename sysa/{perl5.000 => perl-5.000}/mk/main.mk (100%) rename sysa/{perl5.000/perl5.000.sh => perl-5.000/perl-5.000.sh} (67%) rename sysa/{perl5.003 => perl-5.003}/files/config.h (100%) rename sysa/{perl5.003 => perl-5.003}/mk/main.mk (100%) rename sysa/{perl5.003/perl5.003.sh => perl-5.003/perl-5.003.sh} (70%) diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index 5d482a2..3961a5e 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -13,6 +13,6 @@ a32032bab36208509466654df12f507600dfe0313feebbcd218c32a70bf72a16 grep-2.4.tar.g 64b30b41fde2ebf669e6af489883fb1df6a06ac30555a96cfa3c39ecce7267dd make-3.80.tar.gz 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.tar.gz -1beb92a6fc29483d0a8ab71379fb0e930a2c90198d81ba2930c1e788b5f58873 perl5.000.tar.gz -7dd4f058d3437f7469a1ca5be77e3834e631e295bc2d4d75d6fab5a9730070fd perl5.003.tar.gz +1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3 perl-5.000.tar.gz +9fa29beb2fc4a3c373829fc051830796de301f32a719d0b52a400d1719bbd7b1 perl-5.003.tar.gz c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a tar-1.12.tar.gz diff --git a/rootfs.sh b/rootfs.sh index 9cee346..aacdce6 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -191,11 +191,10 @@ get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz get_file https://ftp.gnu.org/gnu/gawk/gawk-3.0.4.tar.gz # perl 5.000 -get_file http://mirrors.develooper.com/perl/really-ancient-perls/oldperl/dist/leo/src/perl5/perl5.000.tar.gz +get_file https://github.com/Perl/perl5/archive/perl-5.000.tar.gz # perl 5.003 -# Upstream tarball is a bit broken, slackware repackaged it -get_file https://mirrors.slackware.com/slackware/slackware-3.1/source/d/perl-5.003/perl5.003.tar.gz +get_file https://github.com/Perl/perl5/archive/perl-5.003.tar.gz # General cleanup find tmp -name .git -exec rm -rf \; diff --git a/sysa/perl5.000/files/config.h b/sysa/perl-5.000/files/config.h similarity index 100% rename from sysa/perl5.000/files/config.h rename to sysa/perl-5.000/files/config.h diff --git a/sysa/perl5.000/files/keywords.sh b/sysa/perl-5.000/files/keywords.sh similarity index 87% rename from sysa/perl5.000/files/keywords.sh rename to sysa/perl-5.000/files/keywords.sh index 76950e5..34b0173 100644 --- a/sysa/perl5.000/files/keywords.sh +++ b/sysa/perl-5.000/files/keywords.sh @@ -3,4 +3,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# This file replaces keywords.pl + sed -e '1,/__END__/ d' keywords.pl | sed '1d' | awk '{print "#define", "KEY_"$0, NR-1}' > keywords.h diff --git a/sysa/perl5.000/files/opcode.awk b/sysa/perl-5.000/files/opcode.awk similarity index 100% rename from sysa/perl5.000/files/opcode.awk rename to sysa/perl-5.000/files/opcode.awk diff --git a/sysa/perl5.000/files/opcode.sh b/sysa/perl-5.000/files/opcode.sh similarity index 97% rename from sysa/perl5.000/files/opcode.sh rename to sysa/perl-5.000/files/opcode.sh index 9f52c18..8645e75 100755 --- a/sysa/perl5.000/files/opcode.sh +++ b/sysa/perl-5.000/files/opcode.sh @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# This file replaces opcode.pl sed -e '1,/__END__/ d; s/[#].*$//g; /^$/d' opcode.pl | tr -s '\t' '\t' > data diff --git a/sysa/perl5.000/mk/main.mk b/sysa/perl-5.000/mk/main.mk similarity index 100% rename from sysa/perl5.000/mk/main.mk rename to sysa/perl-5.000/mk/main.mk diff --git a/sysa/perl5.000/perl5.000.sh b/sysa/perl-5.000/perl-5.000.sh similarity index 67% rename from sysa/perl5.000/perl5.000.sh rename to sysa/perl-5.000/perl-5.000.sh index 56c0a90..b209ce7 100755 --- a/sysa/perl5.000/perl5.000.sh +++ b/sysa/perl-5.000/perl-5.000.sh @@ -2,21 +2,31 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +src_unpack() { + default_src_unpack + + mv perl5-perl-5.000 perl-5.000 +} + src_prepare() { default_src_prepare + # Remove and regenerate bison files rm perly.c perly.h bison -d perly.y mv perly.tab.c perly.c mv perly.tab.h perly.h + # Regenerate embed.h rm embed.h ./embed_h.SH + # Regenerate keywords.h rm keywords.h chmod +x keywords.sh ./keywords.sh - + + # Regenerate opcode.h rm opcode.h chmod +x opcode.sh ./opcode.sh diff --git a/sysa/perl5.003/files/config.h b/sysa/perl-5.003/files/config.h similarity index 100% rename from sysa/perl5.003/files/config.h rename to sysa/perl-5.003/files/config.h diff --git a/sysa/perl5.003/mk/main.mk b/sysa/perl-5.003/mk/main.mk similarity index 100% rename from sysa/perl5.003/mk/main.mk rename to sysa/perl-5.003/mk/main.mk diff --git a/sysa/perl5.003/perl5.003.sh b/sysa/perl-5.003/perl-5.003.sh similarity index 70% rename from sysa/perl5.003/perl5.003.sh rename to sysa/perl-5.003/perl-5.003.sh index fdd4892..e683d1f 100755 --- a/sysa/perl5.003/perl5.003.sh +++ b/sysa/perl-5.003/perl-5.003.sh @@ -2,14 +2,22 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +src_unpack() { + default_src_unpack + + mv perl5-perl-5.003 perl-5.003 +} + src_prepare() { default_src_prepare + # Regenerate bison files rm perly.c perly.h bison -d perly.y mv perly.tab.c perly.c mv perly.tab.h perly.h + # Regenerate other prebuilt header files for file in embed keywords opcode; do rm ${file}.h perl ${file}.pl diff --git a/sysa/run.sh b/sysa/run.sh index 660b739..4d7cb89 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -42,9 +42,9 @@ build coreutils-5.0 build gawk-3.0.4 # Part 29 -build perl5.000 +build perl-5.000 # Part 30 -build perl5.003 +build perl-5.003 echo "Bootstrapping completed."