From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Martin Jansa <Martin.Jansa@gmail.com>
Subject: [PATCH] vulkan-samples: add lfs=0 to SRC_URI to avoid git smudge errors in do_unpack
Date: Mon, 17 Oct 2022 16:05:58 +0200 [thread overview]
Message-ID: <20221017140558.632766-1-Martin.Jansa@gmail.com> (raw)
* we don't need other_lib/ios/Debug-iphoneos/libSDL2.a from
https://github.com/KhronosGroup/KTX-Software.git so we can explicitly
disable LFS here to avoid do_unpack error, bitbake will then use
GIT_LFS_SKIP_SMUDGE=1 to override smudge setting in gitconfig,
otherwise we would need bitbake patch to fetch LFS objects from the
submodules as well
* do_fetch won't fetch LFS objects without explicitly requesting lfs in SRC_URI
then do_unpack might run git smudge when enabled in .gitconfig (or /etc/gitconfig) with:
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
and do_unpack fails as in:
http://errors.yoctoproject.org/Errors/Details/672888/
The default /etc/gitconfig in ubuntu has this added automatically by
git-lfs postinst:
root@ljama:~# rm /etc/gitconfig
root@ljama:~# git lfs install --skip-repo --system
Git LFS initialized.
root@ljama:~# cat /etc/gitconfig
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
root@ljama:~# cat /var/lib/dpkg/info/git-lfs.postinst
set -e
# Set up /etc/gitconfig for git-lfs. The --skip-repo option prevents failure if
# / is a Git repository with existing non-git-lfs hooks.
git lfs install --skip-repo --system > /dev/null 2>&1
according to
https://changelogs.ubuntu.com/changelogs/pool/universe/g/git-lfs/git-lfs_3.0.2-1/changelog
it was added in:
git-lfs (2.6.0-1) unstable; urgency=medium
* New upstream release
* Bump standards version to 4.2.1
* Add postinst/prerm to set up/remove git-lfs gitconfig
FWIW: vulkan-samples still fail to build with DEBUG_BUILD enabled:
http://errors.yoctoproject.org/Errors/Details/672892/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 332411b312..d0b3458e1b 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
-SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https \
+SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https;lfs=0 \
file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
file://debugfix.patch \
file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \
--
2.38.0
reply other threads:[~2022-10-17 14:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221017140558.632766-1-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox