DoKernelOrg: Update for FC13
Junio C Hamano committed
Dec 8, 2010 at 15:33 UTC
2b9d6c0f5614ca4fe5942e9b6b01d8095ff66021
3 files changed
+38
-5
DoKernelOrg
+4
-4
@@ -16,12 +16,12 @@ GNU_ROFF=YesPlease'
16
rm -f version
17
case `hostname` in
18
hera.kernel.org)
19
- narch='x86_64 i386'
19
+ narch='x86_64 i386 i686'
20
arch=x86_64 ;;
21
-wing-fc*|fc*.siamese.dyndns.org)
21
+wing-fc*|fc*.siamese.dyndns.org|fc*)
22
eval $(rpm --showrc | sed -ne '
23
s/^-14: dist[ ]*\./dist=/p
24
- s/^-14: _build_arch[ ]*/arch=/p
24
+ s/^-11= _target_cpu[ ]*/arch=/p
25
') &&
26
test -n "$dist" && test -n "$arch" || exit 1
27
;;
@@ -32,7 +32,7 @@ esac &&
32
echo "* Building $THIS" &&
33
make $J git >./:all.log 2>&1 &&
34
V=`./git --version | sed -e 's/git version //'` &&
35
-make $d rpm >>./:all.log 2>&1 &&
35
+NEEDS_CRYPTO_WITH_SSL=YesPlease make $d rpm >>./:all.log 2>&1 &&
36
case "$narch" in
37
'')
38
# This is not the primary build machine.
cook
+22
-1
@@ -3,6 +3,24 @@
3
4
use strict;
5
6
+my %reverts = ('next' => {
7
+ map { $_ => 1 } qw(
8
+ c9bb83f
9
+ 8f6d1e2
10
+ 477e5a8
11
+ cc17e9f
12
+ 07b74a9
13
+ e4b5259
14
+ 76c7727
15
+ 7e7b4f7
16
+ 44d3770
17
+ 107880a
18
+ 02f9c7c
19
+ a9ef3e3
20
+ ) });
21
+
22
+%reverts = ();
23
+
24
sub phrase_these {
25
my (@u) = sort @_;
26
my @d = ();
@@ -163,7 +181,9 @@ sub get_commit {
181
};
182
}
183
my $co = $commit{$sha1};
166
- $co->{'branch'}{$branch} = 1;
184
+ if (!exists $reverts{$branch}{$sha1}) {
185
+ $co->{'branch'}{$branch} = 1;
186
+ }
187
next if (exists $base{$branch});
188
push @{$topic{$branch}{'log'}}, $sha1;
189
}
@@ -211,6 +231,7 @@ sub get_commit {
231
}
232
for my $tip (split(' ', $tips)) {
233
my $co = $commit{$tip};
234
+ next unless ($co->{'branch'}{'next'});
235
$co->{'merged'} = " (merged to 'next' on $date at $commit)";
236
}
237
}
people
new
+12
@@ -0,0 +1,12 @@
1
+#!/bin/sh
2
+# Feed whats-cooking to find who are involved
3
+
4
+sed -ne 's|\(.* \)*\* \([a-z][a-z]/[a-z0-9][-_a-z0-9]*\) ([-0-9]*) [0-9]* commit.*|\2|p' |
5
+while read topic
6
+do
7
+ git log --format="%an <%ae>" --no-merges "$topic" ^master
8
+done |
9
+sort -u |
10
+sed -e '/Junio C Hamano/d' -e 's/.*/ &,/' -e '$s/,$//'
11
+
12
+