From 65d6e3747e53cf4e6531e182f25442775b8cde43 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 13 Mar 2021 23:00:26 +0300 Subject: linux-linaro-qcom.inc: allow recipes to override the DESCRIPTION Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux/linux-linaro-qcom.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-linaro-qcom.inc b/recipes-kernel/linux/linux-linaro-qcom.inc index 4e78597..d8b8dcc 100644 --- a/recipes-kernel/linux/linux-linaro-qcom.inc +++ b/recipes-kernel/linux/linux-linaro-qcom.inc @@ -2,7 +2,7 @@ # Copyright (C) 2012, 2013 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Linux kernel for MSM platforms" +DESCRIPTION ??= "Linux kernel for MSM platforms" LICENSE = "GPLv2" inherit kernel -- cgit From cc96662db56c68a2452c075cf0cc1ca7195afe7f Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Mon, 25 Jan 2021 03:48:16 +0300 Subject: linux-linaro-qcomlt_5.7,-dev: drop unused ERROR_QA_remove Remove unused removal of 'arch' from ERROR_QA: kernel build no longer include WiFi firmware, so this is unused. Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux/linux-linaro-qcomlt-dev.bb | 3 --- recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb | 3 --- 2 files changed, 6 deletions(-) diff --git a/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb b/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb index b402431..23a6d5c 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb @@ -21,6 +21,3 @@ SRCREV ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-l LINUX_VERSION = "5.11+" PV = "${LINUX_VERSION}+git${SRCPV}" - -# Wifi firmware has a recognizable arch :( -ERROR_QA_remove = "arch" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb index 88b33be..6332b34 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb @@ -24,6 +24,3 @@ SRCBRANCH ?= "release/qcomlt-5.7" SRCREV ?= "4af49ea41ecf17e5e6243f3ac81dfc2f84d8a3a1" COMPATIBLE_MACHINE = "(qcom)" - -# Wifi firmware has a recognizable arch :( -ERROR_QA_remove = "arch" -- cgit From 85ff172c66f756e0b1649a4bd546c2de1bf586af Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 22 Apr 2021 17:11:31 +0300 Subject: linux-linaro-qcom.inc: use 'arm' override for 32-bit machines Use 'arm' override for apq8064 and sdx55 instead of specifying them one-by-one. Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux/linux-linaro-qcom.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-linaro-qcom.inc b/recipes-kernel/linux/linux-linaro-qcom.inc index d8b8dcc..3c90401 100644 --- a/recipes-kernel/linux/linux-linaro-qcom.inc +++ b/recipes-kernel/linux/linux-linaro-qcom.inc @@ -17,8 +17,7 @@ SRC_URI = "${LINUX_LINARO_QCOM_GIT};branch=${SRCBRANCH}" S = "${WORKDIR}/git" KERNEL_DEFCONFIG_aarch64 ?= "${S}/arch/arm64/configs/defconfig" -KERNEL_DEFCONFIG_apq8064 ?= "${S}/arch/arm/configs/qcom_defconfig" -KERNEL_DEFCONFIG_sdx55 ?= "${S}/arch/arm/configs/qcom_defconfig" +KERNEL_DEFCONFIG_arm ?= "${S}/arch/arm/configs/qcom_defconfig" KERNEL_CONFIG_FRAGMENTS += "${S}/kernel/configs/distro.config" kernel_conf_variable() { -- cgit From 7829b0f0f6919053c7f28ab54a97634d26a00106 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 17 Feb 2021 17:38:55 +0300 Subject: linux-linaro-qcomlt: move common settings to the include file Move common linux-linaro-qcomlt settings to the include file, allowing recipes to contain just the 'reqiure' line and SRCREV. Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux/linux-linaro-qcom.inc | 12 +++++++++--- recipes-kernel/linux/linux-linaro-qcomlt-dev.bb | 7 ++----- recipes-kernel/linux/linux-linaro-qcomlt_5.10.bb | 11 +---------- recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb | 6 ------ recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb | 10 +--------- recipes-kernel/linux/linux-linaro-qcomlt_5.9.bb | 9 --------- 6 files changed, 13 insertions(+), 42 deletions(-) diff --git a/recipes-kernel/linux/linux-linaro-qcom.inc b/recipes-kernel/linux/linux-linaro-qcom.inc index 3c90401..d7d8b48 100644 --- a/recipes-kernel/linux/linux-linaro-qcom.inc +++ b/recipes-kernel/linux/linux-linaro-qcom.inc @@ -1,16 +1,20 @@ -# Copyright (C) 2014 Linaro +# Copyright (C) 2014-2021 Linaro # Copyright (C) 2012, 2013 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION ??= "Linux kernel for MSM platforms" +DESCRIPTION ??= "Linaro Qualcomm Landing team ${PV} Kernel" LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -# Put a local version until we have a true SRCREV to point to LOCALVERSION ?= "+linaro" SCMVERSION ?= "y" +SRCBRANCH = "release/qcomlt-${PV}" + +COMPATIBLE_MACHINE = "(qcom)" + LINUX_LINARO_QCOM_GIT ?= "git://git.linaro.org/landing-teams/working/qualcomm/kernel.git;protocol=https" SRC_URI = "${LINUX_LINARO_QCOM_GIT};branch=${SRCBRANCH}" @@ -20,6 +24,8 @@ KERNEL_DEFCONFIG_aarch64 ?= "${S}/arch/arm64/configs/defconfig" KERNEL_DEFCONFIG_arm ?= "${S}/arch/arm/configs/qcom_defconfig" KERNEL_CONFIG_FRAGMENTS += "${S}/kernel/configs/distro.config" +require recipes-kernel/linux/linux-qcom-bootimg.inc + kernel_conf_variable() { CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" if test "$2" = "n" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb b/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb index 23a6d5c..9aae535 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt-dev.bb @@ -5,13 +5,10 @@ # To enable it add the following line to conf/local.conf: # PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt-dev" -DESCRIPTION = "Linaro Qualcomm Landing team Integration Kernel ${PV}" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc -SRCBRANCH ?= "integration-linux-qcomlt" +DESCRIPTION = "Linaro Qualcomm Landing team Integration Kernel ${PV}" +SRCBRANCH = "integration-linux-qcomlt" # Set default SRCREV. it is statically set to the korg v3.7 tag, and # hence prevent network access during parsing. If linux-linaro-qcomlt-dev diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.10.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.10.bb index 57ae852..f1652f0 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.10.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.10.bb @@ -1,15 +1,6 @@ # Copyright (C) 2014-2020 Linaro # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Linaro Qualcomm Landing team 5.10 Kernel" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc - -LOCALVERSION ?= "-linaro-lt-qcom" - -SRCBRANCH = "release/qcomlt-5.10" -SRCREV = "6afb1155f01df9871e14e4189d83d31000b308ee" -COMPATIBLE_MACHINE = "(qcom)" +SRCREV = "9ab492e76768cd1bd9f2da52004ed537c8b329f3" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb index 254b94a..2587152 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb @@ -1,13 +1,7 @@ # Copyright (C) 2014-2021 Linaro # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Linaro Qualcomm Landing team 5.12 Kernel" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc - -LOCALVERSION ?= "-linaro-lt-qcom" SRCBRANCH = "release/rb5/qcomlt-5.12" SRCREV = "deeb40c41728645cd6971b1d7bd08281238caba0" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb index 6332b34..dcf8220 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.7.bb @@ -1,14 +1,10 @@ # Copyright (C) 2014-2019 Linaro # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Linaro Qualcomm Landing team 5.7 Kernel" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +require recipes-kernel/linux/linux-linaro-qcom.inc inherit python3native -require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc - SRC_URI_append_qrb5165-rb5 = " \ file://qrb5165-rb5.dts;subdir=git/arch/arm64/boot/dts/qcom \ file://qrb5165-rb5-enable.patch \ @@ -19,8 +15,4 @@ SRC_URI_append_qrb5165-rb5 = " \ file://0001-arm64-dts-qcom-sm8250-Add-support-for-SDC2.patch \ " -LOCALVERSION ?= "-linaro-lt-qcom" -SRCBRANCH ?= "release/qcomlt-5.7" SRCREV ?= "4af49ea41ecf17e5e6243f3ac81dfc2f84d8a3a1" - -COMPATIBLE_MACHINE = "(qcom)" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.9.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.9.bb index 118ff78..baf2a08 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.9.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.9.bb @@ -1,18 +1,9 @@ # Copyright (C) 2014-2019 Linaro # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Linaro Qualcomm Landing team 5.9 Kernel" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc - -LOCALVERSION ?= "-linaro-lt-qcom" -SRCBRANCH ?= "release/qcomlt-5.9" SRCREV ?= "b5ff44498a19a685aa10a07ec67e3d12bc95a33a" SRCBRANCH_sm8250 = "release/rb5/qcomlt-5.9" SRCREV_sm8250 = "6d5a9a5da79684f69e4c66a7cf9108ab4e77025f" - -COMPATIBLE_MACHINE = "(qcom)" -- cgit From ccbbcd8be95d663419a3d34e7e3698abafbed943 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 22 Apr 2021 18:43:19 +0300 Subject: linux-linaro-qcom: simplify config handling Simplify handling of kernel config: - call sed directly from kernel_conf_variable function - split do_confugure into prepend and append functions to be wrapped around kernel_do_configure (removing make oldconfig call) Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux/linux-linaro-qcom.inc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes-kernel/linux/linux-linaro-qcom.inc b/recipes-kernel/linux/linux-linaro-qcom.inc index d7d8b48..95959c6 100644 --- a/recipes-kernel/linux/linux-linaro-qcom.inc +++ b/recipes-kernel/linux/linux-linaro-qcom.inc @@ -27,7 +27,7 @@ KERNEL_CONFIG_FRAGMENTS += "${S}/kernel/configs/distro.config" require recipes-kernel/linux/linux-qcom-bootimg.inc kernel_conf_variable() { - CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" + sed -e "/CONFIG_$1[ =]/d;" -i ${B}/.config if test "$2" = "n" then echo "# CONFIG_$1 is not set" >> ${B}/.config @@ -37,18 +37,15 @@ kernel_conf_variable() { } do_configure_prepend() { - echo "" > ${B}/.config - CONF_SED_SCRIPT="" - - kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\"" - kernel_conf_variable LOCALVERSION_AUTO y - if [ -f '${WORKDIR}/defconfig' ]; then - sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config' + cp '${WORKDIR}/defconfig' '${B}/.config' else - sed -e "${CONF_SED_SCRIPT}" < '${KERNEL_DEFCONFIG}' >> '${B}/.config' + cp '${KERNEL_DEFCONFIG}' '${B}/.config' fi + kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\"" + kernel_conf_variable LOCALVERSION_AUTO y + if [ "${SCMVERSION}" = "y" ]; then # Add GIT revision to the local version head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` @@ -82,7 +79,8 @@ do_configure_prepend() { # Now that all the fragments are located merge them. ( cd ${WORKDIR} && ${S}/scripts/kconfig/merge_config.sh -m -r -O ${B} ${B}/.config ${KERNEL_CONFIG_FRAGMENTS} 1>&2 ) fi +} - yes '' | oe_runmake -C ${S} O=${B} oldconfig +do_configure_append() { oe_runmake -C ${S} O=${B} savedefconfig && cp ${B}/defconfig ${WORKDIR}/defconfig.saved } -- cgit