diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-17 19:39:07 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-17 19:39:07 +0100 |
commit | 121cdd55fe1d658ea2a9cad2ed8eb6ae22ed785d (patch) | |
tree | 09aca67d95f46d2d6312807b723864452dc37b98 /merge.pl | |
parent | 9d53a3102caf03deb8e8328dd586708b5328b853 (diff) | |
parent | c7a5157d4de03982fcd2e3cd1f035858153ab349 (diff) | |
download | kernel-121cdd55fe1d658ea2a9cad2ed8eb6ae22ed785d.tar.gz kernel-121cdd55fe1d658ea2a9cad2ed8eb6ae22ed785d.tar.xz kernel-121cdd55fe1d658ea2a9cad2ed8eb6ae22ed785d.zip |
merge origin/f32kernel-5.11.7-150.vanilla.1.fc32
Diffstat (limited to 'merge.pl')
-rwxr-xr-x[l---------] | merge.pl | 73 |
1 files changed, 72 insertions, 1 deletions
diff --git a/merge.pl b/merge.pl index b77225dd2..dbaf5927b 120000..100755 --- a/merge.pl +++ b/merge.pl @@ -1 +1,72 @@ -configs/merge.pl
\ No newline at end of file +#! /usr/bin/perl + +my @args=@ARGV; +my %configvalues; +my @configoptions; +my $configcounter = 0; + +# optionally print out the architecture as the first line of our output +my $arch = $args[2]; +if (defined $arch) { + print "# $arch\n"; +} + +# first, read the override file + +open (FILE,"$args[0]") || die "Could not open $args[0]"; +while (<FILE>) { + my $str = $_; + my $configname; + + if (/\# ([\w]+) is not set/) { + $configname = $1; + } elsif (/^\#/) { + # fall through on comments like 'avoid CONFIG_FOO=y' + ; + } elsif (/([\w]+)=/) { + $configname = $1; + } + + if (defined($configname) && !exists($configvalues{$configname})) { + $configvalues{$configname} = $str; + $configoptions[$configcounter] = $configname; + $configcounter ++; + } +}; + +# now, read and output the entire configfile, except for the overridden +# parts... for those the new value is printed. + +open (FILE2,"$args[1]") || die "Could not open $args[1]"; +while (<FILE2>) { + my $configname; + + if (/\# ([\w]+) is not set/) { + $configname = $1; + } elsif (/^\#/) { + # fall through on comments like 'avoid CONFIG_FOO=y' + ; + } elsif (/([\w]+)=/) { + $configname = $1; + } + + if (defined($configname) && exists($configvalues{$configname})) { + print "$configvalues{$configname}"; + delete($configvalues{$configname}); + } else { + print "$_"; + } +} + +# now print the new values from the overridden configfile +my $counter = 0; + +while ($counter < $configcounter) { + my $configname = $configoptions[$counter]; + if (exists($configvalues{$configname})) { + print "$configvalues{$configname}"; + } + $counter++; +} + +1; |