From c539cb5c979a0985fda113edee2c9f4aa30d26e6 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 26 May 2014 13:40:09 -0400 Subject: beaglebone: enable the nowayout option for the watchdog Bumping the meta SRCREV for the following fix: [ The default watchdog behaviour is to stop the timer if the process managing it closes the file /dev/watchdog. The system would not reboot if watchdog daemon crashes due to a bug in it or get killed by other malicious code. So we prefer to enable nowayout option for the watchdong. With this enabled, there is no way of disabling the watchdog once it has been started. This option is also enabled in the predecessor of this BSP (beagleboard) ] [YOCTO: 3937] (From OE-Core rev: 7006412c285a4a6c75d5349f60dc71b0b735ff90) Signed-off-by: Kevin Hao Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index 2e22430754..995df3e0ea 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb @@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" SRCREV_machine ?= "08229402523bdb153dceed0a7260180837396e7f" SRCREV_machine_qemuppc ?= "08229402523bdb153dceed0a7260180837396e7f" -SRCREV_meta ?= "62f236c734996f240d91daee2cb6a05669c7326c" +SRCREV_meta ?= "183622e8095545999a64bd72adedea2dffb6ec4b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb index 626add9dc3..b26ae25016 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.14.4" KMETA = "meta" SRCREV_machine ?= "cb22733185cd9db3e8945dadb899d9eb3831b9ad" -SRCREV_meta ?= "6fe191e807c9f6f3df57a72c5fc2ffb147f3129a" +SRCREV_meta ?= "183622e8095545999a64bd72adedea2dffb6ec4b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index 1179640b00..14647e9c45 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -17,7 +17,7 @@ SRCREV_machine_qemux86 ?= "4aa41764bf8dba2044ff9fae806d61cac7cdd9de" SRCREV_machine_qemux86-64 ?= "cb22733185cd9db3e8945dadb899d9eb3831b9ad" SRCREV_machine_qemumips64 ?= "342ccacd4e28d1cc7e30277ee4ac6caa3086ff2f" SRCREV_machine ?= "cb22733185cd9db3e8945dadb899d9eb3831b9ad" -SRCREV_meta ?= "6fe191e807c9f6f3df57a72c5fc2ffb147f3129a" +SRCREV_meta ?= "183622e8095545999a64bd72adedea2dffb6ec4b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -- cgit v1.2.3-54-g00ecf