From: Chuck Anderson Date: Wed, 1 Nov 2017 19:17:51 +0000 (-0700) Subject: uek-rpm: add update-el-x86; fix-up ol6/update-el X-Git-Tag: v4.1.12-117.0_27200813_3~55 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=926a009e42a19f531692a1e632090546b4b97bab;p=users%2Fjedix%2Flinux-maple.git uek-rpm: add update-el-x86; fix-up ol6/update-el The build env will start looking for uek-rpm/ol?/update-el-. 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 --- 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