diff options
Diffstat (limited to 'yocto-poky/meta/recipes-kernel/linux')
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc | 95 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb (renamed from yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb) | 14 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 23 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 23 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 10 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 23 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc | 4 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.14.bb | 44 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb | 22 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb (renamed from yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb) | 28 |
12 files changed, 110 insertions, 184 deletions
diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc b/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc index ee3a5e1b9..651a19e4a 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc +++ b/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc @@ -5,75 +5,70 @@ python __anonymous () { d.appendVar("PACKAGES", " kernel-devicetree") } -do_compile_append() { - if test -n "${KERNEL_DEVICETREE}"; then - for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '/dts/'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi - oe_runmake ${DTB} - done +normalize_dtb () { + DTB="$1" + if echo ${DTB} | grep -q '/dts/'; then + bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." + DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` fi + echo "${DTB}" } -do_install_append() { - if test -n "${KERNEL_DEVICETREE}"; then - for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '/dts/'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi - DTB_BASE_NAME=`basename ${DTB} .dtb` - DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}" - if [ ! -e "${DTB_PATH}" ]; then - DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}" - fi - install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb - done +get_real_dtb_path_in_kernel () { + DTB="$1" + DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}" + if [ ! -e "${DTB_PATH}" ]; then + DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}" fi + echo "${DTB_PATH}" +} + +do_compile_append() { + for DTB in ${KERNEL_DEVICETREE}; do + DTB=`normalize_dtb "${DTB}"` + oe_runmake ${DTB} + done +} + +do_install_append() { + for DTB in ${KERNEL_DEVICETREE}; do + DTB=`normalize_dtb "${DTB}"` + DTB_BASE_NAME=`basename ${DTB} .dtb` + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` + DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` + install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb + done } do_deploy_append() { - if test -n "${KERNEL_DEVICETREE}"; then - for DTB in ${KERNEL_DEVICETREE}; do - if echo ${DTB} | grep -q '/dts/'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` - fi - DTB_BASE_NAME=`basename ${DTB} .dtb` - DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}" - if [ ! -e "${DTB_PATH}" ]; then - DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}" - fi - install -d ${DEPLOYDIR} - install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.dtb - cd ${DEPLOYDIR} - ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb - cd - - done - fi + for DTB in ${KERNEL_DEVICETREE}; do + DTB=`normalize_dtb "${DTB}"` + DTB_BASE_NAME=`basename ${DTB} .dtb` + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` + DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` + install -d ${DEPLOYDIR} + install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.dtb + ln -sf ${DTB_NAME}.dtb ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.dtb + done } pkg_postinst_kernel-devicetree () { cd /${KERNEL_IMAGEDEST} - for DTB_FILE in ${KERNEL_DEVICETREE} + for DTB in ${KERNEL_DEVICETREE} do - DTB_BASE_NAME=`basename ${DTB_FILE} | awk -F "." '{print $1}'` + DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'` DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb /boot/devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true done } pkg_postrm_kernel-devicetree () { cd /${KERNEL_IMAGEDEST} - for DTB_FILE in ${KERNEL_DEVICETREE} + for DTB in ${KERNEL_DEVICETREE} do - DTB_BASE_NAME=`basename ${DTB_FILE} | awk -F "." '{print $1}'` + DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'` DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - update-alternatives --remove ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true + update-alternatives --remove ${DTB_BASE_NAME}.dtb /boot/devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true done } diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index afe482ac6..308526345 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -36,7 +36,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "4.2-rc+" +LINUX_VERSION ?= "4.6-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index b441bf681..a13895727 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -2,13 +2,13 @@ KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "3188436876d5eaff8d48f82064367d4a65c3aa97" -SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4" +SRCREV_machine ?= "28d8cfdbcb18a6eef202099cca66430fd3b6eae0" +SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.1.15" +LINUX_VERSION ?= "4.1.18" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index bfeabbec0..d81ca1387 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -1,16 +1,14 @@ -KBRANCH ?= "standard/preempt-rt/base" -KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" +KBRANCH ?= "standard/preempt-rt" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "8281915527ba8d79e59906c02f28e7aa11424723" -SRCREV_machine_qemuppc ?= "5e7d372ebc327f28656fc972fab55605eea8aec3" -SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4" +SRCREV_machine ?= "2bc112a6ccd16800a4c45e47ccb3018a1042abdf" +SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab" -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "3.14.36" +LINUX_VERSION ?= "4.4.3" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb deleted file mode 100644 index e13cb80ce..000000000 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ /dev/null @@ -1,23 +0,0 @@ -KBRANCH ?= "standard/tiny/base" -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "3.14.36" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" -SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "(qemux86)" - -# Functionality flags -KERNEL_FEATURES = "" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb deleted file mode 100644 index a6a58a2ed..000000000 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb +++ /dev/null @@ -1,23 +0,0 @@ -KBRANCH ?= "standard/tiny/base" -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "3.19.5" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine ?= "e152349de59b43b2a75f2c332b44171df461d5a0" -SRCREV_meta ?= "1016714868249d64fc16692fd7679672b1efa17b" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.19;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "(qemux86)" - -# Functionality flags -KERNEL_FEATURES = "" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 4caa2523b..28c72132a 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -1,23 +1,23 @@ -KBRANCH ?= "standard/tiny/base" +KBRANCH ?= "standard/tiny/common-pc" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.1.15" +LINUX_VERSION ?= "4.1.18" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51" -SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4" +SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" +SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" -COMPATIBLE_MACHINE = "(qemux86)" +COMPATIBLE_MACHINE = "(qemux86$)" # Functionality flags KERNEL_FEATURES = "" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb new file mode 100644 index 000000000..684e88098 --- /dev/null +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -0,0 +1,23 @@ +KBRANCH ?= "standard/tiny/common-pc" +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "4.4.3" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" +SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "(qemux86$)" + +# Functionality flags +KERNEL_FEATURES = "" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc b/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc index 81ffa24d0..6b161fc06 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc @@ -1,9 +1,11 @@ -DESCRIPTION = "Yocto Kernel" +SUMMARY = "Linux kernel" SECTION = "kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" + INC_PR = "r4" DEPENDS += "xz-native bc-native" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.14.bb deleted file mode 100644 index db93d23db..000000000 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "standard/qemuarm64" -KBRANCH_qemumips ?= "standard/mti-malta32" -KBRANCH_qemuppc ?= "standard/qemuppc" -KBRANCH_qemux86 ?= "standard/common-pc/base" -KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" -KBRANCH_qemumips64 ?= "standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "4817747912b5c50ce5c31ef25658340ca615e1b4" -SRCREV_machine_qemuarm64 ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" -SRCREV_machine_qemumips ?= "6ed76ec26b120f65f8547c8612b7334bd2745ec9" -SRCREV_machine_qemuppc ?= "a86ade84b2e142c0fd7536d96477107b6d07db5c" -SRCREV_machine_qemux86 ?= "d9bf859dfae6f88b88b157119c20ae4d5e51420a" -SRCREV_machine_qemux86-64 ?= "93b2b800d85c1565af7d96f3776dc38c85ae1902" -SRCREV_machine_qemumips64 ?= "a63d40b860a6d255005a541894d53729090b40ea" -SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" -SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" - -LINUX_VERSION ?= "3.14.36" -LINUX_VERSION_qemux86 ?= "3.14.39" -LINUX_VERSION_qemux86-64 ?= "3.14.39" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 1bb7336b5..aecb517ed 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -11,22 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "cf760f381c5e1e58d0c3372d66f4dfdc33f0984c" -SRCREV_machine_qemuarm64 ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51" -SRCREV_machine_qemumips ?= "aa46295ab927bd5c960930c377855dbc4e57b195" -SRCREV_machine_qemuppc ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51" -SRCREV_machine_qemux86 ?= "2e0ac7b6c4e3ada23a84756287e9b7051ace939a" -SRCREV_machine_qemux86-64 ?= "2e0ac7b6c4e3ada23a84756287e9b7051ace939a" -SRCREV_machine_qemumips64 ?= "949c0f2cbb4cf902478d009a7d38b6e4fb29e7c4" -SRCREV_machine ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51" -SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4" +SRCREV_machine_qemuarm ?= "232e2d88841c7e20857350275d80f5585ed93734" +SRCREV_machine_qemuarm64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" +SRCREV_machine_qemumips ?= "7d3690c0762f11e038f14310a50ca1cdc813cc22" +SRCREV_machine_qemuppc ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" +SRCREV_machine_qemux86 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" +SRCREV_machine_qemux86-64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" +SRCREV_machine_qemumips64 ?= "b71e4cd7d45f03048ad31e2a36dfe5a43f021b51" +SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" +SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.1.15" -LINUX_VERSION_qemux86 ?= "4.1.17" -LINUX_VERSION_qemux86-64 ?= "4.1.17" +LINUX_VERSION ?= "4.1.18" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb index baa575b11..3c5ee1bd4 100644 --- a/yocto-poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb +++ b/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -7,24 +7,24 @@ KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" KBRANCH_qemuarm64 ?= "standard/qemuarm64" KBRANCH_qemumips ?= "standard/mti-malta32" KBRANCH_qemuppc ?= "standard/qemuppc" -KBRANCH_qemux86 ?= "standard/common-pc" -KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" +KBRANCH_qemux86 ?= "standard/base" +KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "857048f10bfe7089ca6007e72431f1c098b07115" -SRCREV_machine_qemuarm64 ?= "e152349de59b43b2a75f2c332b44171df461d5a0" -SRCREV_machine_qemumips ?= "cedbbc7b5e72df2e820bb9e7885f12132c5e2fff" -SRCREV_machine_qemuppc ?= "23a83386e10986a63e6cef712a045445499d002b" -SRCREV_machine_qemux86 ?= "1583bf79b946cd5581d84d8c369b819a5ecb94b4" -SRCREV_machine_qemux86-64 ?= "1583bf79b946cd5581d84d8c369b819a5ecb94b4" -SRCREV_machine_qemumips64 ?= "3eb70cea3532e22ab1b6da9864446621229e6616" -SRCREV_machine ?= "151571a39785218a57c3ae3355cd63694890cc8d" -SRCREV_meta ?= "1016714868249d64fc16692fd7679672b1efa17b" +SRCREV_machine_qemuarm ?= "ec9167bcb0ccd4897177c5e235af68b5890aa326" +SRCREV_machine_qemuarm64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" +SRCREV_machine_qemumips ?= "900f98d3ab6498bc7f4ff6b7a489db3bca4e6417" +SRCREV_machine_qemuppc ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" +SRCREV_machine_qemux86 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" +SRCREV_machine_qemux86-64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" +SRCREV_machine_qemumips64 ?= "4b08dfb1fb3bc7659e8f3e13665597d9a9f0816d" +SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" +SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab" -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.19;destsuffix=${KMETA}" +SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "3.19.5" +LINUX_VERSION ?= "4.4.3" PV = "${LINUX_VERSION}+git${SRCPV}" |