diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-04-01 19:30:43 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-04-01 19:30:43 +0300 |
commit | 71fea8f590bfd07f9b80ea16a2050d3714272a1f (patch) | |
tree | b353c9fcce220646f1df6dd3732a4851c0ce998d /meta-phosphor | |
parent | 7d2e96db299dbfa82290164c9dc14376ab07b778 (diff) | |
parent | 8ef9fee7059052b64c0c4aa95f69036aa290c101 (diff) | |
download | openbmc-71fea8f590bfd07f9b80ea16a2050d3714272a1f.tar.xz |
Merge pull request #212 from shenki/kernel-4.4
meta-phosphor: Move to openbmc-20160321-1
Diffstat (limited to 'meta-phosphor')
-rw-r--r-- | meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb (renamed from meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb) | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb index 3e74f7cc1e..2e2c9ce875 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.4.bb @@ -2,15 +2,15 @@ DESCRIPTION = "Linux kernel for OpenBMC" SECTION = "kernel" LICENSE = "GPLv2" -KBRANCH ?= "dev-4.3" +KBRANCH ?= "dev-4.4" KCONFIG_MODE="--alldefconfig" SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}" -LINUX_VERSION ?= "4.3" +LINUX_VERSION ?= "4.4" LINUX_VERSION_EXTENSION ?= "-${SRCREV}" -SRCREV="openbmc-20160222-1" +SRCREV="openbmc-20160329-2" PV = "${LINUX_VERSION}+git${SRCPV}" @@ -18,13 +18,3 @@ COMPATIBLE_MACHINE_${MACHINE} = "openbmc" inherit kernel require recipes-kernel/linux/linux-yocto.inc - -do_patch_append() { - for DTB in "${KERNEL_DEVICETREE}"; do - DT=`basename ${DTB} .dtb` - if [ -r "${WORKDIR}/${DT}.dts" ]; then - cp ${WORKDIR}/${DT}.dts \ - ${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts - fi - done -} |