diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2023-09-28 08:59:36 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2023-09-28 08:59:36 -0600 |
| commit | ba62425b8ce9e64b7bc3637e09d06df3e7cd24f2 (patch) | |
| tree | ab9789a97d1e72b99c3d78f12865c440dfcc3f99 /meta-xilinx-core/recipes-kernel/linux | |
| parent | 6c89f01f87beb4d52cbce1bcc06589221eeeef44 (diff) | |
| parent | 0c8d380e1741c5bb6cfa3786dc9a330811c0e6bf (diff) | |
| download | meta-xilinx-ba62425b8ce9e64b7bc3637e09d06df3e7cd24f2.tar.gz | |
Merge remote-tracking branch 'github/rel-v2023.1'
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-kernel/linux')
| -rw-r--r-- | meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | 2 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index 14dd2ace..2355d090 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | |||
| @@ -3,7 +3,7 @@ LINUX_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', | |||
| 3 | PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}" | 3 | PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}" |
| 4 | 4 | ||
| 5 | # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits | 5 | # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits |
| 6 | KBRANCH ?= "xlnx_rebase_v5.15_LTS" | 6 | KBRANCH ?= "undefined" |
| 7 | SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" | 7 | SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" |
| 8 | 8 | ||
| 9 | FILESOVERRIDES:append := ":${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}" | 9 | FILESOVERRIDES:append := ":${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}" |
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb index 6740a459..d229f21c 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | LINUX_VERSION = "6.1.5" | 1 | LINUX_VERSION = "6.1.30" |
| 2 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" | 2 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" |
| 3 | KBRANCH="xlnx_rebase_v6.1_LTS" | 3 | KBRANCH="xlnx_rebase_v6.1_LTS_2023.1_update" |
| 4 | SRCREV = "716921b6d7dc9db49660369428fb61ca96947ccb" | 4 | SRCREV = "9299ac26ca514a0ccd9f6ae01f50e816d7e79dfa" |
| 5 | SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" | 5 | SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" |
| 6 | 6 | ||
| 7 | KCONF_AUDIT_LEVEL="0" | 7 | KCONF_AUDIT_LEVEL="0" |