]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
uek-rpm: add update-el-x86; fix-up ol6/update-el
authorChuck Anderson <chuck.anderson@oracle.com>
Wed, 1 Nov 2017 19:17:51 +0000 (12:17 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 3 Nov 2017 19:48:38 +0000 (12:48 -0700)
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
uek-rpm/ol6/update-el-ol6 [deleted file]
uek-rpm/ol6/update-el-x86 [new file with mode: 0644]
uek-rpm/ol7/update-el-ol7 [deleted file]
uek-rpm/ol7/update-el-x86 [new file with mode: 0644]

index 4074fe20274103ae8ad0043c012d4e2ba6ee5ce9..341291e5354914889638f9075289fa3a01d97dba 100644 (file)
@@ -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 (file)
index c596943..0000000
+++ /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 (file)
index 0000000..341291e
--- /dev/null
@@ -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 (file)
index 4fedf1d..0000000
+++ /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 (file)
index 0000000..f994162
--- /dev/null
@@ -0,0 +1 @@
+7.3