DoKernelOrg: Update for FC13

diff --git a/DoKernelOrg b/DoKernelOrg
index bc0d51d5e494724f82ef80b6da974b58ecc91262..1bdc49a5b3f0bb235a9dda703d44bce4b3dc8c78 100755 (executable)
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -16,12 +16,12 @@ GNU_ROFF=YesPlease'
 rm -f version
 case `hostname` in
 hera.kernel.org)
-       narch='x86_64 i386'
+       narch='x86_64 i386 i686'
        arch=x86_64 ;;
-wing-fc*|fc*.siamese.dyndns.org)
+wing-fc*|fc*.siamese.dyndns.org|fc*)
        eval $(rpm --showrc | sed -ne '
                s/^-14: dist[   ]*\./dist=/p
-               s/^-14: _build_arch[    ]*/arch=/p
+               s/^-11= _target_cpu[    ]*/arch=/p
        ') &&
        test -n "$dist" && test -n "$arch" || exit 1
        ;;
@@ -32,7 +32,7 @@ esac &&
 echo "* Building $THIS" &&
 make $J git >./:all.log 2>&1 &&
 V=`./git --version | sed -e 's/git version //'` &&
-make $d rpm >>./:all.log 2>&1 &&
+NEEDS_CRYPTO_WITH_SSL=YesPlease make $d rpm >>./:all.log 2>&1 &&
 case "$narch" in
 '')
        # This is not the primary build machine.

diff --git a/cook b/cook
index efc387cb4413a7a6fa01bfbb34983153b521260f..41d88af668e293add031d603f213a786e453f65d 100755 (executable)
--- a/cook
+++ b/cook
@@ -3,6 +3,24 @@
 
 use strict;
 
+my %reverts = ('next' => {
+       map { $_ => 1 } qw(
+               c9bb83f
+               8f6d1e2
+               477e5a8
+               cc17e9f
+               07b74a9
+               e4b5259
+               76c7727
+               7e7b4f7
+               44d3770
+               107880a
+               02f9c7c
+               a9ef3e3
+           ) });
+
+%reverts = ();
+
 sub phrase_these {
        my (@u) = sort @_;
        my @d = ();
@@ -163,7 +181,9 @@ sub get_commit {
                                        };
                                }
                                my $co = $commit{$sha1};
-                               $co->{'branch'}{$branch} = 1;
+                               if (!exists $reverts{$branch}{$sha1}) {
+                                       $co->{'branch'}{$branch} = 1;
+                               }
                                next if (exists $base{$branch});
                                push @{$topic{$branch}{'log'}}, $sha1;
                        }
@@ -211,6 +231,7 @@ sub get_commit {
                }
                for my $tip (split(' ', $tips)) {
                        my $co = $commit{$tip};
+                       next unless ($co->{'branch'}{'next'});
                        $co->{'merged'} = " (merged to 'next' on $date at $commit)";
                }
        }

diff --git a/people b/people
new file mode 100755 (executable)
index 0000000..2aeef34
--- /dev/null
+++ b/people
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Feed whats-cooking to find who are involved
+
+sed -ne 's|\(.* \)*\* \([a-z][a-z]/[a-z0-9][-_a-z0-9]*\) ([-0-9]*) [0-9]* commit.*|\2|p' |
+while read topic
+do
+       git log --format="%an <%ae>" --no-merges "$topic" ^master
+done |
+sort -u |
+sed -e '/Junio C Hamano/d' -e 's/.*/    &,/' -e '$s/,$//'
+
+