From 4b23a26667a83f137f46d93d698c0e76a1dc009f Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 14 Jul 2014 17:59:15 -0700
Subject: [PATCH] update_chroot: fix transition to new os-release location

Previously /etc/os-release was installed both by set_lsb_release and
the baselayout package. Now it is only installed by set_lsb_release but
when baselayout is upgraded it removes /etc/os-release. So the first
update_chroot works but the second detects the chroot's version
incorrectly and tries to apply the one time updates in this directory.
Both of them are very old so we can just delete them. The second run
will now fix up /etc/os-release and we can all move on and be happy.
---
 sdk_lib/updates/0000.0.0.sh                   |  6 ++++++
 .../updates/129.0.0_python_exec_transition.sh | 11 ----------
 .../updates/36.0.0_python_upgrade_required.sh | 21 -------------------
 3 files changed, 6 insertions(+), 32 deletions(-)
 create mode 100644 sdk_lib/updates/0000.0.0.sh
 delete mode 100644 sdk_lib/updates/129.0.0_python_exec_transition.sh
 delete mode 100644 sdk_lib/updates/36.0.0_python_upgrade_required.sh

diff --git a/sdk_lib/updates/0000.0.0.sh b/sdk_lib/updates/0000.0.0.sh
new file mode 100644
index 0000000000..944ef399b8
--- /dev/null
+++ b/sdk_lib/updates/0000.0.0.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Dummy script to fill this empty directory. update_chroot uses this
+# to apply one time upgrade scripts but there aren't any right now.
+
+true
diff --git a/sdk_lib/updates/129.0.0_python_exec_transition.sh b/sdk_lib/updates/129.0.0_python_exec_transition.sh
deleted file mode 100644
index e3046a4bb8..0000000000
--- a/sdk_lib/updates/129.0.0_python_exec_transition.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Upgrade python-exec, will transition to dev-lang/python-exec
-sudo emerge -qu dev-python/python-exec
-
-# Re-install portage and gentoolkit which tended to have issues
-sudo emerge -q sys-apps/portage app-portage/gentoolkit
diff --git a/sdk_lib/updates/36.0.0_python_upgrade_required.sh b/sdk_lib/updates/36.0.0_python_upgrade_required.sh
deleted file mode 100644
index 99b04a817c..0000000000
--- a/sdk_lib/updates/36.0.0_python_upgrade_required.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-cat >&2 <<EOF
-
-Your SDK chroot is too old! (or the version wasn't detected properly)
-As of v36 CoreOS has switched from python2.6 to 2.7 but the easiest way
-to upgrade is to recreate the chroot. On the host system please run:
-
- repo sync
- ./chromite/bin/cros_sdk --replace
-
-Note: This will delete your existing chroot (but not your source tree)
-so if you have anything kicking around in there like fancy dot files in
-chroot/home/$USER be sure to copy them elsewhere first!
-
-EOF
-exit 1