From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QvcUM-0006yF-K8 for openembedded-core@lists.openembedded.org; Mon, 22 Aug 2011 23:56:59 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 22 Aug 2011 14:52:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,265,1312182000"; d="scan'208";a="43970272" Received: from unknown (HELO swold-MOBL.lan) ([10.255.13.234]) by fmsmga001.fm.intel.com with ESMTP; 22 Aug 2011 14:52:12 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Mon, 22 Aug 2011 14:51:55 -0700 Message-Id: <394f2d33c7f17eac833dc5d46956e2ad2de528ba.1314043945.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 10/19] linux-yocto: move more default values into linux-yocto.inc X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Aug 2011 21:56:59 -0000 From: Bruce Ashfield During the preparation of some linux-yocto extension documentation it was clear that some variables are being defined in each recipe, when they don't have to be. Moving the defaults into linux-yocto.in and allowing them to be overidden in recipes simpifies the reuse of the base infrastructure. Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto.inc | 7 +++++++ meta/recipes-kernel/linux/linux-yocto_3.0.bb | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 595795b..11b77ce 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -12,6 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" # Set this to 'preempt_rt' in the local.conf if you want a real time kernel LINUX_KERNEL_TYPE ?= standard +KMETA ?= meta +SRCREV_FORMAT ?= "meta_machine" + +LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" +KERNEL_REVISION_CHECKING ?= "t" +YOCTO_KERNEL_META_DATA ?= t + do_patch[depends] = "kern-tools-native:do_populate_sysroot" addtask kernel_configme before do_configure after do_patch diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 44f1ebe..6e6f386 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -9,10 +9,8 @@ KMACHINE_qemumips = "yocto/standard/mti-malta32-be" KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" KBRANCH = ${KMACHINE} -KMETA = meta LINUX_VERSION ?= "3.0.1" -LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2" SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134" @@ -31,14 +29,11 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1; COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags -KERNEL_REVISION_CHECKING ?= "t" KERNEL_FEATURES="features/netfilter" KERNEL_FEATURES_append=" features/taskstats" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" -YOCTO_KERNEL_META_DATA=t - # extra tasks addtask kernel_link_vmlinux after do_compile before do_install addtask validate_branches before do_patch after do_kernel_checkout -- 1.7.6