From 8f105b332931bbc3d8ea7c1cfa4d7759ca6b9393 Mon Sep 17 00:00:00 2001 From: Samuel Tyler Date: Thu, 25 Sep 2025 20:40:49 +1000 Subject: [PATCH] Make perl reproducible between bwrap and hardware Also, with these changes, change the architecture to i686, as per previous commits. --- steps/perl-5.12.5/files/config.over | 1 + steps/perl-5.12.5/pass1.sh | 2 +- steps/perl-5.15.7/files/config.over | 1 + steps/perl-5.15.7/pass1.sh | 2 +- steps/perl-5.16.3/files/config.over | 1 + steps/perl-5.16.3/pass1.sh | 2 +- steps/perl-5.17.2/files/config.over | 1 + steps/perl-5.17.2/pass1.sh | 2 +- steps/perl-5.17.4/files/config.over | 1 + steps/perl-5.17.4/pass1.sh | 2 +- steps/perl-5.18.4/files/config.over | 1 + steps/perl-5.18.4/pass1.sh | 2 +- steps/perl-5.22.4/files/config.over | 1 + steps/perl-5.22.4/pass1.sh | 2 +- steps/perl-5.24.4/files/config.over | 1 + steps/perl-5.24.4/pass1.sh | 2 +- steps/perl-5.30.3/files/config.over | 1 + steps/perl-5.30.3/pass1.sh | 2 +- steps/perl-5.36.3/files/config.over | 1 + steps/perl-5.36.3/pass1.sh | 2 +- steps/perl-5.42.0/files/config.over | 1 + steps/perl-5.42.0/pass1.sh | 2 +- steps/perl-5.6.2/files/config.h | 2 +- steps/perl-5.8.9/files/config.over | 5 +++++ steps/perl-5.8.9/pass1.sh | 2 +- steps/perl5.004-05/files/config.h | 2 +- steps/perl5.005-03/files/config.h | 2 +- 27 files changed, 31 insertions(+), 15 deletions(-) create mode 120000 steps/perl-5.12.5/files/config.over create mode 120000 steps/perl-5.15.7/files/config.over create mode 120000 steps/perl-5.16.3/files/config.over create mode 120000 steps/perl-5.17.2/files/config.over create mode 120000 steps/perl-5.17.4/files/config.over create mode 120000 steps/perl-5.18.4/files/config.over create mode 120000 steps/perl-5.22.4/files/config.over create mode 120000 steps/perl-5.24.4/files/config.over create mode 120000 steps/perl-5.30.3/files/config.over create mode 120000 steps/perl-5.36.3/files/config.over create mode 120000 steps/perl-5.42.0/files/config.over create mode 100755 steps/perl-5.8.9/files/config.over diff --git a/steps/perl-5.12.5/files/config.over b/steps/perl-5.12.5/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.12.5/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.12.5/pass1.sh b/steps/perl-5.12.5/pass1.sh index 409e6d1a..9b181b61 100755 --- a/steps/perl-5.12.5/pass1.sh +++ b/steps/perl-5.12.5/pass1.sh @@ -70,7 +70,7 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" diff --git a/steps/perl-5.15.7/files/config.over b/steps/perl-5.15.7/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.15.7/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.15.7/pass1.sh b/steps/perl-5.15.7/pass1.sh index d8bd5149..70dada23 100755 --- a/steps/perl-5.15.7/pass1.sh +++ b/steps/perl-5.15.7/pass1.sh @@ -67,7 +67,7 @@ src_configure() { -Dusedevel \ -Uversiononly \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" diff --git a/steps/perl-5.16.3/files/config.over b/steps/perl-5.16.3/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.16.3/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.16.3/pass1.sh b/steps/perl-5.16.3/pass1.sh index 9d0475bc..9f88bce2 100755 --- a/steps/perl-5.16.3/pass1.sh +++ b/steps/perl-5.16.3/pass1.sh @@ -66,7 +66,7 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" diff --git a/steps/perl-5.17.2/files/config.over b/steps/perl-5.17.2/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.17.2/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.17.2/pass1.sh b/steps/perl-5.17.2/pass1.sh index 778d5d7a..57f40d96 100755 --- a/steps/perl-5.17.2/pass1.sh +++ b/steps/perl-5.17.2/pass1.sh @@ -73,7 +73,7 @@ src_configure() { -Dusedevel \ -Uversiononly \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" diff --git a/steps/perl-5.17.4/files/config.over b/steps/perl-5.17.4/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.17.4/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.17.4/pass1.sh b/steps/perl-5.17.4/pass1.sh index 44e3bc32..5b5bd921 100755 --- a/steps/perl-5.17.4/pass1.sh +++ b/steps/perl-5.17.4/pass1.sh @@ -77,7 +77,7 @@ src_configure() { -Dusedevel \ -Uversiononly \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" diff --git a/steps/perl-5.18.4/files/config.over b/steps/perl-5.18.4/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.18.4/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.18.4/pass1.sh b/steps/perl-5.18.4/pass1.sh index df0b19a8..24e12aa1 100755 --- a/steps/perl-5.18.4/pass1.sh +++ b/steps/perl-5.18.4/pass1.sh @@ -71,7 +71,7 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" diff --git a/steps/perl-5.22.4/files/config.over b/steps/perl-5.22.4/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.22.4/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.22.4/pass1.sh b/steps/perl-5.22.4/pass1.sh index 3fb0c2c7..e4eb9ab0 100755 --- a/steps/perl-5.22.4/pass1.sh +++ b/steps/perl-5.22.4/pass1.sh @@ -84,7 +84,7 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" } diff --git a/steps/perl-5.24.4/files/config.over b/steps/perl-5.24.4/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.24.4/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.24.4/pass1.sh b/steps/perl-5.24.4/pass1.sh index a62453c4..2a2b7238 100755 --- a/steps/perl-5.24.4/pass1.sh +++ b/steps/perl-5.24.4/pass1.sh @@ -83,7 +83,7 @@ src_configure() { -Dcc=gcc \ -Dusedl=false \ -Ddate=':' \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" \ -Dccflags='-DPERL_BUILD_DATE="null"' diff --git a/steps/perl-5.30.3/files/config.over b/steps/perl-5.30.3/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.30.3/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.30.3/pass1.sh b/steps/perl-5.30.3/pass1.sh index 952760ae..266e7b27 100755 --- a/steps/perl-5.30.3/pass1.sh +++ b/steps/perl-5.30.3/pass1.sh @@ -76,7 +76,7 @@ src_configure() { -Dcc=gcc \ -Dusedl=false \ -Ddate=':' \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" \ -Dccflags='-DPERL_BUILD_DATE="null"' diff --git a/steps/perl-5.36.3/files/config.over b/steps/perl-5.36.3/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.36.3/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.36.3/pass1.sh b/steps/perl-5.36.3/pass1.sh index 6face782..fba88bfa 100755 --- a/steps/perl-5.36.3/pass1.sh +++ b/steps/perl-5.36.3/pass1.sh @@ -78,7 +78,7 @@ src_configure() { -Dcc=gcc \ -Dusedl=false \ -Ddate=':' \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" \ -Dccflags='-DPERL_BUILD_DATE="null"' diff --git a/steps/perl-5.42.0/files/config.over b/steps/perl-5.42.0/files/config.over new file mode 120000 index 00000000..c4be551d --- /dev/null +++ b/steps/perl-5.42.0/files/config.over @@ -0,0 +1 @@ +../../perl-5.8.9/files/config.over \ No newline at end of file diff --git a/steps/perl-5.42.0/pass1.sh b/steps/perl-5.42.0/pass1.sh index 4157d301..48738132 100755 --- a/steps/perl-5.42.0/pass1.sh +++ b/steps/perl-5.42.0/pass1.sh @@ -81,7 +81,7 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" \ -Dccflags='-DPERL_BUILD_DATE="null"' diff --git a/steps/perl-5.6.2/files/config.h b/steps/perl-5.6.2/files/config.h index 5103f75e..47b8168b 100644 --- a/steps/perl-5.6.2/files/config.h +++ b/steps/perl-5.6.2/files/config.h @@ -95,7 +95,7 @@ #define Free_t void #define SH_PATH "/bin/sh" -#define ARCHNAME "i386-linux" +#define ARCHNAME "i686-linux" #define BIN_EXP "/usr/bin" #define NVSIZE 8 /* sizeof(double) */ diff --git a/steps/perl-5.8.9/files/config.over b/steps/perl-5.8.9/files/config.over new file mode 100755 index 00000000..0402df37 --- /dev/null +++ b/steps/perl-5.8.9/files/config.over @@ -0,0 +1,5 @@ +#!/bin/sh + +osvers=4.14.0 +myarchname=i686-linux +myuname="linux live-bootstrap 4.14.0 #1 i686 gnulinux " diff --git a/steps/perl-5.8.9/pass1.sh b/steps/perl-5.8.9/pass1.sh index 964b885f..edc981b8 100755 --- a/steps/perl-5.8.9/pass1.sh +++ b/steps/perl-5.8.9/pass1.sh @@ -68,7 +68,7 @@ src_configure() { -Dusedl=false \ -Ddate=':' \ -Dccflags="-U__DATE__ -U__TIME__" \ - -Darchname="i386-linux" \ + -Darchname="i686-linux" \ -Dmyhostname="(none)" \ -Dmaildomain="(none)" } diff --git a/steps/perl5.004-05/files/config.h b/steps/perl5.004-05/files/config.h index c5e49d7f..988228f0 100644 --- a/steps/perl5.004-05/files/config.h +++ b/steps/perl5.004-05/files/config.h @@ -92,6 +92,6 @@ #define Free_t void #define SH_PATH "/bin/sh" -#define ARCHNAME "i386-linux" +#define ARCHNAME "i686-linux" #define BIN_EXP "/usr/bin" diff --git a/steps/perl5.005-03/files/config.h b/steps/perl5.005-03/files/config.h index c5e49d7f..988228f0 100644 --- a/steps/perl5.005-03/files/config.h +++ b/steps/perl5.005-03/files/config.h @@ -92,6 +92,6 @@ #define Free_t void #define SH_PATH "/bin/sh" -#define ARCHNAME "i386-linux" +#define ARCHNAME "i686-linux" #define BIN_EXP "/usr/bin"