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

Two generate changes:

Browse source 
1. Allow multiple patches
2. For the Devel::PatchPerl patches, use git diff instead
   of format-patch.  This removes the ever-changing committer/
   subject/etc details and leaves just the actual changes
This commit is contained in:
Peter Martini 2015-05-03 12:09:06 -04:00
parent 5a9cbc47de
commit c8a1cb32eb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generate.pl
View file

@ -78,7 +78,7 @@ for my $release (@{$yaml->{releases}}) {
die "Couldn't create a temp git repo for $release->{version}" if $? != 0; die "Couldn't create a temp git repo for $release->{version}" if $? != 0;
Devel::PatchPerl->patch_source($release->{version}, $dir); Devel::PatchPerl->patch_source($release->{version}, $dir);
$patch = qx{ $patch = qx{
cd $dir && git commit -am tmp >/dev/null 2>/dev/null && git format-patch -1 --stdout cd $dir && git diff
}; };
die "Couldn't create a Devel::PatchPerl patch for $release->{version}" if $? != 0; die "Couldn't create a Devel::PatchPerl patch for $release->{version}" if $? != 0;
} }
@ -187,14 +187,14 @@ RUN apt-get update \
&& rm -fr /var/lib/apt/lists/* && rm -fr /var/lib/apt/lists/*
RUN mkdir /usr/src/perl RUN mkdir /usr/src/perl
COPY DevelPatchPerl.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/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \
&& echo '{{sha1}} *perl-{{version}}.tar.bz2' | sha1sum -c - \ && echo '{{sha1}} *perl-{{version}}.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \
&& rm perl-{{version}}.tar.bz2 \ && rm perl-{{version}}.tar.bz2 \
&& cat DevelPatchPerl.patch | patch -p1 \ && cat *.patch | patch -p1 \
&& ./Configure {{args}} {{extra_flags}} -des \ && ./Configure {{args}} {{extra_flags}} -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& {{test}} \ && {{test}} \