From 9c2be26ed8221f4053e203692711841884defdb4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 18 May 2014 16:09:35 +0200 Subject: [PATCH] scancpan: sort dependencies in order to avoid spurious diff when updating packages Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- support/scripts/scancpan | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/support/scripts/scancpan b/support/scripts/scancpan index dc62b4760c..d8723f35b0 100755 --- a/support/scripts/scancpan +++ b/support/scripts/scancpan @@ -581,7 +581,7 @@ while (my ($distname, $dist) = each %dist) { open my $fh, q{>}, $cfgname; say {$fh} qq{config BR2_PACKAGE_${brname}}; say {$fh} qq{\tbool "${fsname}"}; - foreach my $dep (@{$deps_runtime{$distname}}) { + foreach my $dep (sort @{$deps_runtime{$distname}}) { my $brdep = brname( fsname( $dep ) ); say {$fh} qq{\tselect BR2_PACKAGE_${brdep}}; } @@ -596,10 +596,10 @@ while (my ($distname, $dist) = each %dist) { # the scheme is not used, because the job is done by the BR download infrastructure # the auth part is not used, because we use $(BR2_CPAN_MIRROR) my($filename, $directories, $suffix) = fileparse( $path, q{tar.gz}, q{tgz} ); - my $dependencies = join q{ }, map( { q{host-} . fsname( $_ ); } @{$deps_build{$distname}} ), - map( { fsname( $_ ); } @{$deps_runtime{$distname}} ); - my $host_dependencies = join q{ }, map { q{host-} . fsname( $_ ); } @{$deps_build{$distname}}, - @{$deps_runtime{$distname}}; + my $dependencies = join q{ }, map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ), + map( { fsname( $_ ); } sort @{$deps_runtime{$distname}} ); + my $host_dependencies = join q{ }, map { q{host-} . fsname( $_ ); } sort( @{$deps_build{$distname}}, + @{$deps_runtime{$distname}} ); my $license = ref $dist->{license} eq 'ARRAY' ? join q{ or }, @{$dist->{license}} : $dist->{license}; -- 2.30.2