]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
scripts/mbox2send: handle the 5.x queue properly for the X-KernelTest-* fields
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Mar 2021 11:41:44 +0000 (12:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Mar 2021 11:41:44 +0000 (12:41 +0100)
Turns out we hard-coded 4.x in the mail headers.  Took people long
enough to notice it :)

Reported-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
scripts/mbox2send

index 58f87a39aa2a3b8a7a22c60985542694d0929763..7cc902ed77ab075b0fb52b3a9c9f5020561484d1 100755 (executable)
@@ -32,6 +32,8 @@ if ($mbox eq "") {
        die;
 }
 
+my $major_version = substr($root_version, 0, 1);
+
 my $date=`date -u --iso-8601=minutes --date="2 days"`;
 chomp($date);
 
@@ -71,7 +73,7 @@ while ($line = <MBOX>) {
                if ($tags_written eq "false") {
                        if ($line =~ m/^Subject:/) {
                                # write out our own X-KernelTest tags to make automated tools's lives easier
-                               print FILE "X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-$full_version.gz\n";
+                               print FILE "X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v$major_version.x/stable-review/patch-$full_version.gz\n";
                                print FILE "X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git\n";
                                print FILE "X-KernelTest-Branch: linux-$root_version.y\n";
                                print FILE "X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git\n";