From 626b6ab48682b211c22ede5a6e63513c85f93e58 Mon Sep 17 00:00:00 2001
From: "Wu, Zhenyu" <wuzhenyu@ustc.edu>
Date: Tue, 22 Oct 2024 23:21:49 +0200
Subject: [PATCH] patch 9.1.0809: filetype: petalinux config files not
 recognized

Problem:  filetype: petalinux config files not recognized
Solution: detect 'project-spec/*.conf' files as bitbake filetype
          (Wu, Zhenyu)

References:
https://www.amd.com/en/products/software/adaptive-socs-and-fpgas/embedded-software/petalinux-sdk.html

closes: #15926

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 runtime/filetype.vim          | 2 +-
 src/testdir/test_filetype.vim | 3 ++-
 src/version.c                 | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 29dbc4b290..618d30671c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -283,7 +283,7 @@ au BufNewFile,BufRead *.blade.php		setf blade
 au BufNewFile,BufRead *.bl			setf blank
 
 " Bitbake
-au BufNewFile,BufRead *.bb,*.bbappend,*.bbclass,*/build/conf/*.conf,*/meta{-*,}/conf/*.conf	setf bitbake
+au BufNewFile,BufRead *.bb,*.bbappend,*.bbclass,*/build/conf/*.conf,*/meta{-*,}/conf/*.conf,*/project-spec/configs/*.conf	setf bitbake
 
 " Blkid cache file
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4348cd1918..f81d18fe62 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -133,7 +133,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     bib: ['file.bib'],
     bicep: ['file.bicep', 'file.bicepparam'],
     bindzone: ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file', 'foobar.zone'],
-    bitbake: ['file.bb', 'file.bbappend', 'file.bbclass', 'build/conf/local.conf', 'meta/conf/layer.conf', 'build/conf/bbappend.conf', 'meta-layer/conf/distro/foo.conf'],
+    bitbake: ['file.bb', 'file.bbappend', 'file.bbclass', 'build/conf/local.conf', 'meta/conf/layer.conf', 'build/conf/bbappend.conf', 'meta-layer/conf/distro/foo.conf',
+      'project-spec/configs/zynqmp-generic-xczu7ev.conf'],
     blade: ['file.blade.php'],
     blank: ['file.bl'],
     blueprint: ['file.blp'],
diff --git a/src/version.c b/src/version.c
index 5b4a853076..f97eb8c2c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    809,
 /**/
     808,
 /**/