simcop2387/docker-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity

5.22.1 has been released

Browse source
This commit is contained in:
Peter Martini 2015-12-13 22:27:16 -05:00
parent 0277d2edfe
commit 952b34b915
6 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
5.022.000-64bit,threaded/DevelPatchPerl.patch → 5.022.001-64bit,threaded/DevelPatchPerl.patch
View file

@ -1,12 +1,12 @@
diff --git a/patchlevel.h b/patchlevel.h diff --git a/patchlevel.h b/patchlevel.h
index a0ad78b..1812032 100644 index bd56612..3d5f668 100644
--- a/patchlevel.h --- a/patchlevel.h
+++ b/patchlevel.h +++ b/patchlevel.h
@@ -137,6 +137,7 @@ static const char * const local_patches[] = { @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
,"uncommitted-changes" ,"uncommitted-changes"
#endif #endif
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
+ ,"Devel::PatchPerl 1.34" + ,"Devel::PatchPerl 1.38"
,NULL ,NULL
}; };

12
5.022.000-64bit,threaded/Dockerfile → 5.022.001-64bit,threaded/Dockerfile
View file

@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl
COPY *.patch /usr/src/perl/ COPY *.patch /usr/src/perl/
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2 -o perl-5.22.0.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \
&& echo '400338c91c56420d98142cbfcb84d418cae2c98c *perl-5.22.0.tar.bz2' | sha1sum -c - \ && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-5.22.0.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \
&& rm perl-5.22.0.tar.bz2 \ && rm perl-5.22.1.tar.bz2 \
&& cat *.patch | patch -p1 \ && cat *.patch | patch -p1 \
&& ./Configure -Dusethreads -Duse64bitall -des \ && ./Configure -Dusethreads -Duse64bitall -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make test_harness \ && TEST_JOBS=$(nproc) make test_harness \
&& make install \ && make install \
&& cd /usr/src \ && cd /usr/src \
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2
WORKDIR /root WORKDIR /root
CMD ["perl5.22.0","-de0"] CMD ["perl5.22.1","-de0"]

4
5.022.000-64bit/DevelPatchPerl.patch → 5.022.001-64bit/DevelPatchPerl.patch
View file

@ -1,12 +1,12 @@
diff --git a/patchlevel.h b/patchlevel.h diff --git a/patchlevel.h b/patchlevel.h
index a0ad78b..1812032 100644 index bd56612..3d5f668 100644
--- a/patchlevel.h --- a/patchlevel.h
+++ b/patchlevel.h +++ b/patchlevel.h
@@ -137,6 +137,7 @@ static const char * const local_patches[] = { @@ -137,6 +137,7 @@ static const char * const local_patches[] = {
,"uncommitted-changes" ,"uncommitted-changes"
#endif #endif
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
+ ,"Devel::PatchPerl 1.34" + ,"Devel::PatchPerl 1.38"
,NULL ,NULL
}; };

12
5.022.000-64bit/Dockerfile → 5.022.001-64bit/Dockerfile
View file

@ -9,14 +9,14 @@ RUN mkdir /usr/src/perl
COPY *.patch /usr/src/perl/ COPY *.patch /usr/src/perl/
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2 -o perl-5.22.0.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \
&& echo '400338c91c56420d98142cbfcb84d418cae2c98c *perl-5.22.0.tar.bz2' | sha1sum -c - \ && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-5.22.0.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \
&& rm perl-5.22.0.tar.bz2 \ && rm perl-5.22.1.tar.bz2 \
&& cat *.patch | patch -p1 \ && cat *.patch | patch -p1 \
&& ./Configure -Duse64bitall -des \ && ./Configure -Duse64bitall -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make test_harness \ && TEST_JOBS=$(nproc) make test_harness \
&& make install \ && make install \
&& cd /usr/src \ && cd /usr/src \
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
@ -26,4 +26,4 @@ RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.22.0.tar.bz2
WORKDIR /root WORKDIR /root
CMD ["perl5.22.0","-de0"] CMD ["perl5.22.1","-de0"]

6
Releases.yaml
View file

@ -39,6 +39,6 @@ releases:
sha1: eedf9e3be3c83bef15911996ed18703cffe4d113 sha1: eedf9e3be3c83bef15911996ed18703cffe4d113
pause: SHAY pause: SHAY
- version: 5.22.0 - version: 5.22.1
sha1: 400338c91c56420d98142cbfcb84d418cae2c98c sha1: 29f9b320b0299577a3e1d02e9e8ef8f26f160332
pause: RJBS pause: SHAY

8
generate.pl
View file

@ -88,8 +88,8 @@ for my $release (@{$yaml->{releases}}) {
for my $config (keys %builds) { for my $config (keys %builds) {
my $output = $template; my $output = $template;
$output =~ s/{{$_}}/$release->{$_}/mg for (qw(version pause extra_flags sha1)); $output =~ s/\{\{$_\}\}/$release->{$_}/mg for (qw(version pause extra_flags sha1));
$output =~ s/{{args}}/$builds{$config}/mg; $output =~ s/\{\{args\}\}/$builds{$config}/mg;
my $dir = sprintf "%i.%03i.%03i-%s", my $dir = sprintf "%i.%03i.%03i-%s",
($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/), ($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/),
@ -104,9 +104,9 @@ for my $release (@{$yaml->{releases}}) {
} }
if (defined $release->{test_parallel} && $release->{test_parallel} eq "no") { if (defined $release->{test_parallel} && $release->{test_parallel} eq "no") {
$output =~ s/{{test}}/make test_harness/; $output =~ s/\{\{test\}\}/make test_harness/;
} elsif (!defined $release->{test_parallel} || $release->{test_parallel} eq "yes") { } elsif (!defined $release->{test_parallel} || $release->{test_parallel} eq "yes") {
$output =~ s/{{test}}/TEST_JOBS=\$(nproc) make test_harness/; $output =~ s/\{\{test\}\}/TEST_JOBS=\$(nproc) make test_harness/;
} else { } else {
die "test_parallel was provided for $release->{version} but is invalid; should be 'yes' or 'no'\n"; die "test_parallel was provided for $release->{version} but is invalid; should be 'yes' or 'no'\n";
} }