From 926a009e42a19f531692a1e632090546b4b97bab Mon Sep 17 00:00:00 2001
From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Wed, 1 Nov 2017 12:17:51 -0700
Subject: [PATCH] uek-rpm: add update-el-x86; fix-up ol6/update-el

The build env will start looking for uek-rpm/ol?/update-el-<arch>.
Add uek-rpm/ol6/update-el-x86, specifying 6.7.
Add uek-rpm/ol7/update-el-x86, specifying 7.3.

For now, leave uek-rpm/ol?/update-el.  Remove them later after we know
that there are no issues with using uek-rpm/ol?/update-el-x86.

Set uek-rpm/ol6/update-el to 6.7 which is the current UEK4 build env.
It was set previously to 6.6 but has been overridden by the build env.
The build env is about to be changed so that it will no longer override it.
uek-rpm/ol7/update-el has the correct value, 7.3, so no change is needed.

Delete the unused uek-rpm/ol6/update-el-ol6 and uek-rpm/ol7/update-el-ol7.

Orabug: 27004340
Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>
---
 uek-rpm/ol6/update-el     | 2 +-
 uek-rpm/ol6/update-el-ol6 | 1 -
 uek-rpm/ol6/update-el-x86 | 1 +
 uek-rpm/ol7/update-el-ol7 | 1 -
 uek-rpm/ol7/update-el-x86 | 1 +
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 uek-rpm/ol6/update-el-ol6
 create mode 100644 uek-rpm/ol6/update-el-x86
 delete mode 100644 uek-rpm/ol7/update-el-ol7
 create mode 100644 uek-rpm/ol7/update-el-x86

diff --git a/uek-rpm/ol6/update-el b/uek-rpm/ol6/update-el
index 4074fe202741..341291e53549 100644
--- a/uek-rpm/ol6/update-el
+++ b/uek-rpm/ol6/update-el
@@ -1 +1 @@
-6.6
+6.7
diff --git a/uek-rpm/ol6/update-el-ol6 b/uek-rpm/ol6/update-el-ol6
deleted file mode 100644
index c596943a9f06..000000000000
--- a/uek-rpm/ol6/update-el-ol6
+++ /dev/null
@@ -1 +0,0 @@
-6.4
diff --git a/uek-rpm/ol6/update-el-x86 b/uek-rpm/ol6/update-el-x86
new file mode 100644
index 000000000000..341291e53549
--- /dev/null
+++ b/uek-rpm/ol6/update-el-x86
@@ -0,0 +1 @@
+6.7
diff --git a/uek-rpm/ol7/update-el-ol7 b/uek-rpm/ol7/update-el-ol7
deleted file mode 100644
index 4fedf1d20e15..000000000000
--- a/uek-rpm/ol7/update-el-ol7
+++ /dev/null
@@ -1 +0,0 @@
-7.0
diff --git a/uek-rpm/ol7/update-el-x86 b/uek-rpm/ol7/update-el-x86
new file mode 100644
index 000000000000..f99416236e9f
--- /dev/null
+++ b/uek-rpm/ol7/update-el-x86
@@ -0,0 +1 @@
+7.3
-- 
2.50.1