From 39586f7064a7fa6f4483110ea76f2b2513951950 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Date: Wed, 28 Mar 2018 14:25:46 -0400
Subject: [PATCH] sys-kernel/coreos-sources: allow specifying ebuild to
 revbump.sh

master and alpha now carry multiple ebuilds.  Handle this by allowing
the user to specify which ebuild to update.
---
 .../sys-kernel/coreos-sources/revbump.sh      | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/revbump.sh b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/revbump.sh
index a54dd117b0..2b23c795cb 100755
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/revbump.sh
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/revbump.sh
@@ -2632,23 +2632,33 @@ EOF
 
 new_pvr="$1"
 srcdir="$2"
+old_ebuild="$3"
 
 if [[ -z "${new_pvr}" || -z "${srcdir}" ]]; then
-    echo "Usage:   $0 <new-PVR> <dir-with-git-format-patch-output>"
-    echo "Example: $0 4.9.9-r2 ~/linux"
+    echo "Usage:   $0 <new-PVR> <dir-with-git-format-patch-output> [old-ebuild]"
+    echo "Example: $0 4.9.9-r2 ~/linux coreos-sources-4.9.9-r1.ebuild"
     exit 2
 fi
 
 srcdir="$(realpath $srcdir)"
-old_ebuild=$(echo coreos-sources-*.ebuild)
+if [[ -z "${old_ebuild}" ]]; then
+    old_ebuild=$(echo coreos-sources-*.ebuild)
+elif [[ ! -f "${old_ebuild}" ]]; then
+    echo "Specified ebuild does not exist."
+    exit 1
+fi
 new_ebuild="coreos-sources-${new_pvr}.ebuild"
 
-if [[ "${old_ebuild}" = 'coreos-sources-*.ebuild' ]]; then
+if [[ ! -f "revbump.sh" ]]; then
     echo "Must be run from the coreos-sources directory."
     exit 1
 fi
+if [[ "${old_ebuild}" = 'coreos-sources-*.ebuild' ]]; then
+    echo "Couldn't find ebuild to update."
+    exit 1
+fi
 if [[ ! -f "${old_ebuild}" ]]; then
-    echo "Multiple ebuilds in coreos-sources directory.  Aborting."
+    echo "Multiple ebuilds in coreos-sources directory, and no ebuild specified. Aborting."
     exit 1
 fi
 if [[ "${old_ebuild}" = "${new_ebuild}" ]]; then