Skip to content

Commit c8a1cb3

Browse files
committed
Two generate changes:
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
1 parent 5a9cbc4 commit c8a1cb3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

generate.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ sub die_with_sample {
7878
die "Couldn't create a temp git repo for $release->{version}" if $? != 0;
7979
Devel::PatchPerl->patch_source($release->{version}, $dir);
8080
$patch = qx{
81-
cd $dir && git commit -am tmp >/dev/null 2>/dev/null && git format-patch -1 --stdout
81+
cd $dir && git diff
8282
};
8383
die "Couldn't create a Devel::PatchPerl patch for $release->{version}" if $? != 0;
8484
}
@@ -187,14 +187,14 @@ =head1 DESCRIPTION
187187
&& rm -fr /var/lib/apt/lists/*
188188
189189
RUN mkdir /usr/src/perl
190-
COPY DevelPatchPerl.patch /usr/src/perl/
190+
COPY *.patch /usr/src/perl/
191191
WORKDIR /usr/src/perl
192192
193193
RUN curl -SL https://cpan.metacpan.org/authors/id/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \
194194
&& echo '{{sha1}} *perl-{{version}}.tar.bz2' | sha1sum -c - \
195195
&& tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \
196196
&& rm perl-{{version}}.tar.bz2 \
197-
&& cat DevelPatchPerl.patch | patch -p1 \
197+
&& cat *.patch | patch -p1 \
198198
&& ./Configure {{args}} {{extra_flags}} -des \
199199
&& make -j$(nproc) \
200200
&& {{test}} \

0 commit comments

Comments
 (0)