From 4b78ad59dfa280989181f6775668b3b7e5d2c419 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 26 Sep 2013 12:35:40 -0400 Subject: [PATCH] Revert "linux: Inherit new machine_kernel_pr class" This adds a new mandatory dependency on meta-openembedded layer. While we are still trying to resolve an existing optional dependency, not bring a new one. The MACHINE_KERNEL_PR requirement will need to be handled differently. This reverts commit 1450f1938007bede786160c501c8fd268b661c5e. --- recipes-kernel/linux/linux-am335x-psp_3.2.bb | 2 +- recipes-kernel/linux/linux-ti-glsdk_3.8.bb | 2 +- recipes-kernel/linux/linux-ti-staging_3.8.bb | 2 +- recipes-kernel/linux/linux-ti-staging_git.bb | 2 +- recipes-kernel/linux/linux.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-kernel/linux/linux-am335x-psp_3.2.bb b/recipes-kernel/linux/linux-am335x-psp_3.2.bb index cf1b2dd4..eaf788f0 100644 --- a/recipes-kernel/linux/linux-am335x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-am335x-psp_3.2.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "ti33x" DEFAULT_PREFERENCE = "-1" -inherit kernel machine_kernel_pr +inherit kernel require setup-defconfig.inc # Stage the power management firmware before building the kernel diff --git a/recipes-kernel/linux/linux-ti-glsdk_3.8.bb b/recipes-kernel/linux/linux-ti-glsdk_3.8.bb index d7aebea3..5fd17f83 100644 --- a/recipes-kernel/linux/linux-ti-glsdk_3.8.bb +++ b/recipes-kernel/linux/linux-ti-glsdk_3.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" KERNEL_IMAGETYPE = "uImage" -inherit kernel machine_kernel_pr +inherit kernel require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/setup-defconfig.inc diff --git a/recipes-kernel/linux/linux-ti-staging_3.8.bb b/recipes-kernel/linux/linux-ti-staging_3.8.bb index 8e6d1981..833fb48a 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.8.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" KERNEL_IMAGETYPE = "uImage" -inherit kernel machine_kernel_pr +inherit kernel require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/setup-defconfig.inc diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb index b75e6509..778ea7f9 100644 --- a/recipes-kernel/linux/linux-ti-staging_git.bb +++ b/recipes-kernel/linux/linux-ti-staging_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for TI devices" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -inherit kernel machine_kernel_pr +inherit kernel require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/setup-defconfig.inc diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index e0d414ce..ac51dae7 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -inherit kernel siteinfo machine_kernel_pr +inherit kernel siteinfo # Enable OABI compat for people stuck with obsolete userspace ARM_KEEP_OABI ?= "1"