X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=DoKernelOrg;h=93426523da2f1a49cdee2a7a1eb2984c89cbd670;hb=df5cc80ec929c9a10b6e71e4f10b3c6085d67b23;hp=16a3468641cdf372a40c3e681b66bad5c42e4ba4;hpb=81246862e804f972136fa160ac7f08cdd1d51a59;p=git.git

diff --git a/DoKernelOrg b/DoKernelOrg
index 16a34686..93426523 100755
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -14,49 +14,29 @@ make clean >/dev/null 2>&1 &&
 case "$1" in
 '')
 	echo "* Building all"
-	branches='naster master maint'
-
-	# Make sure naster is between master and pu if exists
-	if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
-	then
-		master=`git rev-parse --verify refs/heads/master` &&
-		pu=`git rev-parse --verify refs/heads/pu` &&
-		MBM=`git merge-base --all $naster $master` &&
-		MBN=`git merge-base --all $naster $pu` &&
-		case ",$MBM,$MBN," in
-		",$master,$naster,") ;;
-		*)	echo >&2 "naster is not between master and pu"
-			exit 1 ;;
-		esac
-		# If naster is the same as pu, no point rebuilding pu.
-		case ",$naster,$pu," in
-		",$pu,$naster,") ;;
-		*) branches="$branches pu" ;;
-		esac
-	fi
-
-	{
-		nstalled=install
-		for branch in $branches
-		do
-			if git-rev-parse --verify refs/heads/$branch 2>/dev/null
-			then
-				echo "** $branch **" &&
-				git checkout $branch &&
-				make $J $nstalled &&
-				make test &&
-				make clean &&
-				nstalled=all || exit $?
-			else
-				echo
-				echo "* NO $branch"
-				echo
-			fi
-		done
-	} >:all.log 2>&1
+	branches='next master maint'
+	nstalled=install
+	for branch in $branches
+	do
+		if git-rev-parse --verify refs/heads/$branch 2>/dev/null
+		then
+			echo "** $branch **" &&
+			git checkout $branch &&
+			make $J $nstalled &&
+			make test &&
+			make clean &&
+			nstalled=all || exit $?
+		else
+			echo
+			echo "* NO $branch"
+			echo
+		fi
+	done >:all.log 2>&1
 	;;
+
 maint | master)
-	mkdir -p $G/RPMS/i386 $G/RPMS/SRPMS &&
+	arch=x86_64
+	mkdir -p $G/RPMS/$arch $G/RPMS/SRPMS &&
 
 	echo "* Building $1"
 	git checkout "$1" &&
@@ -64,11 +44,11 @@ maint | master)
 	make $J git >>./:rpm.log 2>&1 &&
 	V=`./git --version | sed -e 's/git version //'` &&
 	ln git-$V.tar.gz $G/. &&
-	ln $HOME/rpms/RPMS/i386/git*-$V-* $G/RPMS/i386/. &&
+	ln $HOME/rpms/RPMS/$arch/git*-$V-* $G/RPMS/$arch/. &&
 	ln $HOME/rpms/SRPMS/git-$V-* $G/RPMS/SRPMS/. &&
 	{
 		# I do not know how it exits, and I do not care much.
-		/usr/local/bin/yummy $G/RPMS/i386
+		/usr/local/bin/yummy $G/RPMS/$arch
 		/usr/local/bin/yummy $G/RPMS/SRPMS
 		:
 	} &&