From 634ec99771cf0bd3aa3294e1401e2fc666009f6a Mon Sep 17 00:00:00 2001 From: fosslinux Date: Fri, 14 Jan 2022 16:23:36 +1100 Subject: [PATCH] Rename perl5.004_05 and perl5.005_03 The underscores cause problems later, as _ is a delimiter for "revision number" in packaging. --- SHA256SUMS.sources | 4 ++-- sysa.py | 6 ++++-- sysa/{perl5.004_05 => perl5.004-05}/checksums | 0 sysa/{perl5.004_05 => perl5.004-05}/files/config.h | 0 sysa/{perl5.004_05 => perl5.004-05}/mk/main.mk | 2 +- .../perl5.004_05.sh => perl5.004-05/perl5.004-05.sh} | 1 + sysa/{perl5.005_03 => perl5.005-03}/checksums | 0 sysa/{perl5.005_03 => perl5.005-03}/files/config.h | 0 sysa/{perl5.005_03 => perl5.005-03}/mk/main.mk | 2 +- .../perl5.005_03.sh => perl5.005-03/perl5.005-03.sh} | 1 + sysa/run.sh | 4 ++-- 11 files changed, 12 insertions(+), 8 deletions(-) rename sysa/{perl5.004_05 => perl5.004-05}/checksums (100%) rename sysa/{perl5.004_05 => perl5.004-05}/files/config.h (100%) rename sysa/{perl5.004_05 => perl5.004-05}/mk/main.mk (92%) rename sysa/{perl5.004_05/perl5.004_05.sh => perl5.004-05/perl5.004-05.sh} (99%) rename sysa/{perl5.005_03 => perl5.005-03}/checksums (100%) rename sysa/{perl5.005_03 => perl5.005-03}/files/config.h (100%) rename sysa/{perl5.005_03 => perl5.005-03}/mk/main.mk (92%) rename sysa/{perl5.005_03/perl5.005_03.sh => perl5.005-03/perl5.005-03.sh} (99%) diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index 86693669..2a81c80a 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -87,8 +87,8 @@ ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.ta ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz 1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3 perl-5.000.tar.gz 9fa29beb2fc4a3c373829fc051830796de301f32a719d0b52a400d1719bbd7b1 perl-5.003.tar.gz -1184478b298978b164a383ed5661e3a117c48ab97d6d0ab7ef614cdbe918b9eb perl5.004_05.tar.gz -93f41cd87ab8ee83391cfa39a63b076adeb7c3501d2efa31b98d0ef037122bd1 perl5.005_03.tar.gz +1184478b298978b164a383ed5661e3a117c48ab97d6d0ab7ef614cdbe918b9eb perl5.004-05.tar.gz +93f41cd87ab8ee83391cfa39a63b076adeb7c3501d2efa31b98d0ef037122bd1 perl5.005-03.tar.gz 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 perl-5.10.1.tar.bz2 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e perl-5.6.2.tar.gz diff --git a/sysa.py b/sysa.py index de1c25ef..d525c995 100755 --- a/sysa.py +++ b/sysa.py @@ -179,10 +179,12 @@ class SysA(SysGeneral): self.get_file("https://github.com/Perl/perl5/archive/perl-5.003.tar.gz") # perl 5.004_05 - self.get_file("https://www.cpan.org/src/5.0/perl5.004_05.tar.gz") + self.get_file("https://www.cpan.org/src/5.0/perl5.004_05.tar.gz", + output="perl5.004-05.tar.gz") # perl 5.005_03 - self.get_file("https://www.cpan.org/src/5.0/perl5.005_03.tar.gz") + self.get_file("https://www.cpan.org/src/5.0/perl5.005_03.tar.gz", + output="perl5.005-03.tar.gz") # perl 5.6.2 self.get_file("https://www.cpan.org/src/5.0/perl-5.6.2.tar.gz") diff --git a/sysa/perl5.004_05/checksums b/sysa/perl5.004-05/checksums similarity index 100% rename from sysa/perl5.004_05/checksums rename to sysa/perl5.004-05/checksums diff --git a/sysa/perl5.004_05/files/config.h b/sysa/perl5.004-05/files/config.h similarity index 100% rename from sysa/perl5.004_05/files/config.h rename to sysa/perl5.004-05/files/config.h diff --git a/sysa/perl5.004_05/mk/main.mk b/sysa/perl5.004-05/mk/main.mk similarity index 92% rename from sysa/perl5.004_05/mk/main.mk rename to sysa/perl5.004-05/mk/main.mk index 1ae4a865..8379361e 100644 --- a/sysa/perl5.004_05/mk/main.mk +++ b/sysa/perl5.004-05/mk/main.mk @@ -19,6 +19,6 @@ miniperl: $(MINIPERL_OBJ) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install miniperl $(DESTDIR)$(PREFIX)/bin/perl + install -D miniperl $(DESTDIR)$(PREFIX)/bin/perl mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" diff --git a/sysa/perl5.004_05/perl5.004_05.sh b/sysa/perl5.004-05/perl5.004-05.sh similarity index 99% rename from sysa/perl5.004_05/perl5.004_05.sh rename to sysa/perl5.004-05/perl5.004-05.sh index db2217a0..5e6abcf6 100755 --- a/sysa/perl5.004_05/perl5.004_05.sh +++ b/sysa/perl5.004-05/perl5.004-05.sh @@ -2,6 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later + src_prepare() { default diff --git a/sysa/perl5.005_03/checksums b/sysa/perl5.005-03/checksums similarity index 100% rename from sysa/perl5.005_03/checksums rename to sysa/perl5.005-03/checksums diff --git a/sysa/perl5.005_03/files/config.h b/sysa/perl5.005-03/files/config.h similarity index 100% rename from sysa/perl5.005_03/files/config.h rename to sysa/perl5.005-03/files/config.h diff --git a/sysa/perl5.005_03/mk/main.mk b/sysa/perl5.005-03/mk/main.mk similarity index 92% rename from sysa/perl5.005_03/mk/main.mk rename to sysa/perl5.005-03/mk/main.mk index 2b8b9c26..f4f35641 100644 --- a/sysa/perl5.005_03/mk/main.mk +++ b/sysa/perl5.005-03/mk/main.mk @@ -19,6 +19,6 @@ miniperl: $(MINIPERL_OBJ) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install miniperl $(DESTDIR)$(PREFIX)/bin/perl + install -D miniperl $(DESTDIR)$(PREFIX)/bin/perl mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" diff --git a/sysa/perl5.005_03/perl5.005_03.sh b/sysa/perl5.005-03/perl5.005-03.sh similarity index 99% rename from sysa/perl5.005_03/perl5.005_03.sh rename to sysa/perl5.005-03/perl5.005-03.sh index 2cb00caf..70f02d16 100755 --- a/sysa/perl5.005_03/perl5.005_03.sh +++ b/sysa/perl5.005-03/perl5.005-03.sh @@ -2,6 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later + src_prepare() { default diff --git a/sysa/run.sh b/sysa/run.sh index 260430a6..76d1f79e 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -152,9 +152,9 @@ build perl-5.000 build perl-5.003 -build perl5.004_05 +build perl5.004-05 '' '' '' perl5.004_05 -build perl5.005_03 +build perl5.005-03 '' '' '' perl5.005_03 build perl-5.6.2