mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2024-12-26 04:58:22 +01:00
Merge branch 'master' into master
This commit is contained in:
commit
370007f1c8
@ -1,6 +1,5 @@
|
|||||||
SECTION = "kernel"
|
SECTION = "kernel"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
|
|
||||||
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
|
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
|
||||||
|
|
||||||
inherit kernel
|
inherit kernel
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
SECTION = "kernel"
|
|
||||||
DESCRIPTION = "Mainline Longterm Linux kernel"
|
|
||||||
LICENSE = "GPLv2"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
|
|
||||||
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
|
|
||||||
|
|
||||||
inherit kernel
|
|
||||||
|
|
||||||
require linux.inc
|
|
||||||
|
|
||||||
# Since we're not using git, this doesn't make a difference, but we need to fill
|
|
||||||
# in something or kernel-yocto.bbclass will fail.
|
|
||||||
KBRANCH ?= "master"
|
|
||||||
|
|
||||||
# Pull in the devicetree files into the rootfs
|
|
||||||
RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
|
|
||||||
|
|
||||||
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/linux-${PV}"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "6287e6d6658e593a2978dc718f7de3f3"
|
|
||||||
SRC_URI[sha256sum] = "b4784571bd7f3dc10ae3dc4414876dbd73fc6750401299b206670ce3e5c4bb43"
|
|
||||||
|
|
||||||
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
|
|
||||||
file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
|
|
||||||
file://defconfig \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI_append_orange-pi-zero += "\
|
|
||||||
file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
|
|
||||||
"
|
|
@ -2,5 +2,7 @@ require linux-mainline.inc
|
|||||||
|
|
||||||
DESCRIPTION = "Mainline Longterm Linux kernel"
|
DESCRIPTION = "Mainline Longterm Linux kernel"
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "98c8187b801f006ba203db0669e307a5"
|
SRC_URI[md5sum] = "98c8187b801f006ba203db0669e307a5"
|
||||||
SRC_URI[sha256sum] = "a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7"
|
SRC_URI[sha256sum] = "a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7"
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
require linux-mainline.inc
|
|
||||||
|
|
||||||
DESCRIPTION = "Mainline Stable Linux kernel"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "3ea50025d8c679a327cf2fc225d81a46"
|
|
||||||
SRC_URI[sha256sum] = "2bef3edcf44c746383045f4a809b2013e18c52319c827875ed8e89138951cab2"
|
|
@ -3,6 +3,7 @@ require linux-mainline.inc
|
|||||||
DESCRIPTION = "Mainline Stable Linux kernel"
|
DESCRIPTION = "Mainline Stable Linux kernel"
|
||||||
|
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "199f037b5adc4ca158dc281b60a226f6"
|
SRC_URI[md5sum] = "199f037b5adc4ca158dc281b60a226f6"
|
||||||
|
Loading…
Reference in New Issue
Block a user