dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-11-16 10:18:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

linux-mainline: fix 'devtool modify' command fail

Browse Source 
Traceback (most recent call last):
  File "${TOPDIR}/../src/poky/scripts/devtool", line 338, in <module>
    ret = main()
  File "${TOPDIR}/../src/poky/scripts/devtool", line 325, in main
    ret = args.func(args, config, basepath, workspace)
  File "${TOPDIR}/../src/poky/scripts/lib/devtool/standard.py", line 834, in modify
    if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch):
TypeError: 'in <string>' requires string as left operand, not NoneType

Where 'kernelVersion' is None that cause an error.
In the code: "kernelVersion = rd.getVar('LINUX_VERSION')"
So LINUX_VERSION should be initialized

Signed-off-by: Ilja Byckevich <iljabyckevich@gmail.com>
This commit is contained in:
Ilja Byckevich 2023-02-02 12:38:29 +03:00
parent fde5948e85
commit 02d905b476
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-kernel/linux/linux-mainline.inc
View File

@ -18,6 +18,8 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
LINUX_VERSION ?= "${PV}"
S = "${WORKDIR}/linux-${PV}" S = "${WORKDIR}/linux-${PV}"
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \

2
recipes-kernel/linux/linux-sunxi_3.4.bb
View File

@ -9,6 +9,8 @@ PV = "3.4.104"
PR = "r1" PR = "r1"
SRCREV = "d47d367036be38c5180632ec8a3ad169a4593a88" SRCREV = "d47d367036be38c5180632ec8a3ad169a4593a88"
LINUX_VERSION ?= "${PV}"
MACHINE_KERNEL_PR:append = "a" MACHINE_KERNEL_PR:append = "a"
SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=https \ SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=https \