From be5466cc5137e4d2bc0bc3574d90da5fb1d4d304 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 6 Feb 2025 16:05:26 +0100 Subject: [PATCH] linux-dey: move LINUX_GIT_URI definition to digi-defaults.inc This doesn't change the behavior of the linux-dey recipe, all it does is make the LINUX_GIT_URI variable accessible to any meta-digi recipe. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 5 +++++ meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 19cd83ac3..dfbbd8926 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -96,6 +96,11 @@ DEY_SELINUX_POLICY ?= "1" # (use the '+=' operator, since other layers may append scripts to this list) BOOT_SCRIPTS += "boot.scr:boot.scr" +# Select internal or Github Linux repo +LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" +LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" +LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" + # This can be used to enable U-Boot update through swupdate SWUPDATE_UBOOTIMG ?= "false" SWUPDATE_UBOOTIMG_REDUNDANT ?= "false" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index cce001bf3..755704788 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -10,10 +10,6 @@ require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/li # CONFIG_KERNEL_LZO in defconfig DEPENDS += "${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'lzop-native', '', d)}" -# Select internal or Github Linux repo -LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" -LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" -LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \