From fc726518f2fdf74cb00f8efe3d183e89269b33a4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 6 Feb 2015 12:23:19 -0200 Subject: linux-fslc.inc: Avoid duplication on assignments The linux-imx.inc already handles the base settings, this drops the assignments which were duplicate in linux-fslc.inc file. Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc.inc | 11 ++--------- recipes-kernel/linux/linux-imx.inc | 3 ++- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc index dc560b9..416956e 100644 --- a/recipes-kernel/linux/linux-fslc.inc +++ b/recipes-kernel/linux/linux-fslc.inc @@ -1,17 +1,10 @@ -# Copyright (C) 2012-2014 O.S. Systems Software LTDA. +# Copyright (C) 2012-2015 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -DEPENDS += "lzop-native bc-native" -PROVIDES = "virtual/kernel linux-mainline" - -inherit kernel - require recipes-kernel/linux/linux-imx.inc require recipes-kernel/linux/linux-dtb.inc -SRCBRANCH ?= "" +DEPENDS += "lzop-native bc-native" SRC_URI = "git://github.com/Freescale/linux-mainline.git;branch=${SRCBRANCH} \ file://defconfig" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index 1f12cb8..d790227 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2012, 2014 O.S. Systems Software LTDA. +# Copyright (C) 2012, 2015 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) LICENSE = "GPLv2" @@ -9,6 +9,7 @@ inherit kernel fsl-kernel-localversion # Put a local version until we have a true SRCREV to point to LOCALVERSION ?= "" SCMVERSION ?= "y" +SRCBRANCH ?= "" SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \ file://defconfig \ -- cgit v1.2.3-54-g00ecf