remove artefacts from manual merge gone wrong

[m1-debian] / patch_kernel_config.pl

diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl
index 70f32cd0d1d73894e9f5a505f3f9974021ccdda7..617cfc3af89cc871214e6b060404ac0cca609e7e 100644 (file)
--- a/patch_kernel_config.pl
+++ b/patch_kernel_config.pl
@@ -6,7 +6,7 @@ use warnings FATAL => 'all';
 # This was taken from the linux-image-5.16.0-3-arm64-unsigned
 # Than it was copied as .config in the asahi tree
 # Than make olddefconfig was executed twice
 # This was taken from the linux-image-5.16.0-3-arm64-unsigned
 # Than it was copied as .config in the asahi tree
 # Than make olddefconfig was executed twice

-my @lines = `cat config`;
+my @lines = `cat .config`;

 chomp @lines;
 
 my %asahi_options = (
 chomp @lines;
 
 my %asahi_options = (


@@ -98,7 +98,7 @@ for my $o (keys %asahi_options) {
         }
 }
 
         }
 }
 

-open(CONFIG, '>', 'config.new') || die;
+open(CONFIG, '>', '.config') || die;

 for (keys %debian_options) {
         print CONFIG $_ . '=' . $debian_options{$_} . "\n";
 }
 for (keys %debian_options) {
         print CONFIG $_ . '=' . $debian_options{$_} . "\n";
 }