From afc77225f4881a26fe3705251da3c156a6d21a34 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 15 Mar 2018 13:56:14 -0400 Subject: Revert "meta-phosphor: disable 'uninative' for RHEL6 support" Drop support for RHEL6 which has been unsupported by Poky since 2.1. This reverts commit c83cf1ce570d4771b1e42ded308bf4110e70408b. Tested: Built a witherspoon image Change-Id: Idd8dda940c72a69a7a228733c34018f906ec9b8f Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 4 ---- meta-phosphor/conf/distro/include/phosphor-base.inc | 5 ----- 2 files changed, 9 deletions(-) (limited to 'meta-phosphor') diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 5570841adf..1a5161425b 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -25,10 +25,6 @@ inherit core-image inherit obmc-phosphor-license inherit obmc-phosphor-utils -# TODO: openbmc/openbmc#1407 - Remove with RHEL6 support deprecation. -# Set supported kernel back to RHEL6.4's kernel. -SDK_OLDEST_KERNEL = "2.6.32" - FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "packagegroup-obmc-apps-bmc-state-mgmt" FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt')}" FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "packagegroup-obmc-apps-chassis-state-mgmt" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index d318da74ff..236a47e6bf 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -59,12 +59,7 @@ PREFERRED_VERSION_python-pygobject = "2.%" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc -# TODO: openbmc/openbmc#1407 - Remove with RHEL6 support deprecation. -# RHEL6.4's kernel is too old to use the uninative-shim due to missing -# syscall support. Disable uninative and set OLDEST_KERNEL back to -# the version in RHEL6.4. INHERIT_remove = " uninative" -OLDEST_KERNEL = "2.6.32" KERNEL_FEATURES_append = " phosphor-gpio-keys" KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" -- cgit v1.2.3