diff options
| -rwxr-xr-x | bin/mkpkgbuild (renamed from bin/makepkgbuild) | 0 | ||||
| -rwxr-xr-x | bin/mkpkgdata | 14 | ||||
| -rwxr-xr-x | metas/perl | 2 | ||||
| -rwxr-xr-x | metas/perl.d/perl-dist | 11 |
4 files changed, 17 insertions, 10 deletions
diff --git a/bin/makepkgbuild b/bin/mkpkgbuild index 67077fc..67077fc 100755 --- a/bin/makepkgbuild +++ b/bin/mkpkgbuild diff --git a/bin/mkpkgdata b/bin/mkpkgdata index ced31db..f330894 100755 --- a/bin/mkpkgdata +++ b/bin/mkpkgdata @@ -60,20 +60,18 @@ tmp="/tmp/$prog.$$" for flav in "$METABIN"/* do [ -f "$flav" -a -x "$flav" ] || continue - PATH="$PATH:$flav.d" "$flav" "$1" > "$tmp" trap 'rm "$tmp"' 1 2 15 + PATH="$PATH:$flav.d" "$flav" "$1" > "$tmp" metaret=$? - if [ "$metaret" -eq 0 ] - then - basicmeta "$1" + case "$metaret" in + 0) basicmeta "$1" lazysource < "$tmp" - rm "$tmp" - exit 0 - fi + esac rm "$tmp" trap '' 1 2 5 - case $metaret in + case "$metaret" in + 0) exit 0 ;; 1) echo "$prog: $flav encountered an error" 1>&2 exit 1 ;; 2) ;; # loop @@ -100,7 +100,7 @@ END_META my $file = $cpath; $file =~ s{.*/}{}; system 'perl-dist' => $file; - return $?; + return $? >> 8; } exit main(@ARGV); diff --git a/metas/perl.d/perl-dist b/metas/perl.d/perl-dist index 3259fd8..297d052 100755 --- a/metas/perl.d/perl-dist +++ b/metas/perl.d/perl-dist @@ -3,7 +3,7 @@ use warnings 'FATAL' => 'all'; use strict; -my $PROG = 'perl-dist'; +my $PROG = 'metas/perl.d/perl-dist'; package Convert; @@ -312,6 +312,15 @@ sub _nocore my (@mods) = @_; my $path = _vardir() . '/coremods'; + unless(-f $path){ + print STDERR "$PROG: error: $path is missing. +****************************************************************************** + You must generate it with genpkg's metas/perl.d/scrapecore script. Run it + against the source distribution of perl that is currently being packaged. +****************************************************************************** +"; + exit 1; + } open(my $if, '<', $path) or die "$PROG: open $path: $!"; my %mods = map { ($_ => 1) } @mods; |