diff mbox series

vim: fix race when installing the Swedish tutorial

Message ID 20260211145147.3456921-1-ross.burton@arm.com
State Under Review
Headers show
Series vim: fix race when installing the Swedish tutorial | expand

Commit Message

Ross Burton Feb. 11, 2026, 2:51 p.m. UTC 
A mkdir might not happen, resulting in an install failure.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...001-translation-sv-add-missing-mkdir.patch | 52 +++++++++++++++++++
 meta/recipes-support/vim/vim.inc              |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 meta/recipes-support/vim/files/0001-translation-sv-add-missing-mkdir.patch
diff mbox series

Patch

diff --git a/meta/recipes-support/vim/files/0001-translation-sv-add-missing-mkdir.patch b/meta/recipes-support/vim/files/0001-translation-sv-add-missing-mkdir.patch
new file mode 100644
index 0000000000..37337c3d9d
--- /dev/null
+++ b/meta/recipes-support/vim/files/0001-translation-sv-add-missing-mkdir.patch
@@ -0,0 +1,52 @@ 
+From 2dd7e39942f4f7740c3a645148521d3b6b443c41 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Wed, 11 Feb 2026 14:39:06 +0000
+Subject: [PATCH] translation(sv): add missing mkdir
+
+The installtutor target doesn't explicitly create the Swedish directory
+that it is going to put files into:
+
+  make[1]: Entering directory 'vim-9.1.2128/src'
+  /bin/sh install-sh -c -d DESTDIR/usr/share/vim/vim91
+  chmod 755 DESTDIR/usr/share/vim/vim91
+  /bin/sh install-sh -c -d DESTDIR/usr/share/vim/vim91/tutor/en
+  chmod 755 DESTDIR/usr/share/vim/vim91/tutor/en
+  /bin/sh install-sh -c -d DESTDIR/usr/share/vim/vim91/tutor/sr
+  chmod 755 DESTDIR/usr/share/vim/vim91/tutor/sr
+  /bin/sh install-sh -c -d DESTDIR/usr/share/vim/vim91/tutor/it
+  chmod 755 DESTDIR/usr/share/vim/vim91/tutor/it
+  /bin/sh install-sh -c -d DESTDIR/usr/share/vim/vim91/tutor/ru
+  chmod 755 DESTDIR/usr/share/vim/vim91/tutor/ru
+  cp ../runtime/tutor/README* ../runtime/tutor/tutor* DESTDIR/usr/share/vim/vim91/tutor
+  cp ../runtime/tutor/en/* DESTDIR/usr/share/vim/vim91/tutor/en/
+  cp ../runtime/tutor/it/* DESTDIR/usr/share/vim/vim91/tutor/it/
+  cp ../runtime/tutor/ru/* DESTDIR/usr/share/vim/vim91/tutor/ru/
+  cp ../runtime/tutor/sr/* DESTDIR/usr/share/vim/vim91/tutor/sr/
+  cp ../runtime/tutor/sv/* DESTDIR/usr/share/vim/vim91/tutor/sv/
+  cp: target 'DESTDIR/usr/share/vim/vim91/tutor/sv/': No such file or directory
+
+Add the missing dependency on $(DEST_TUTOR)/sv to ensure this directory
+is created.
+
+Upstream-Status: Submitted [https://github.com/vim/vim/pull/19385]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 75d8ff6c1c..b4c31bed60 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2487,7 +2487,7 @@ installgtutorbin: $(DEST_BIN)
+ 	$(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor
+ 	chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor
+ 
+-installtutor: $(DEST_RT) $(DEST_TUTOR)/en $(DEST_TUTOR)/it $(DEST_TUTOR)/sr $(DEST_TUTOR)/ru
++installtutor: $(DEST_RT) $(DEST_TUTOR)/en $(DEST_TUTOR)/it $(DEST_TUTOR)/sr $(DEST_TUTOR)/sv $(DEST_TUTOR)/ru
+ 	-$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
+ 	-$(INSTALL_DATA) $(TUTORSOURCE)/en/* $(DEST_TUTOR)/en/
+ 	-$(INSTALL_DATA) $(TUTORSOURCE)/it/* $(DEST_TUTOR)/it/
+-- 
+2.43.0
+
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index a9f0661f2a..cb106cba1d 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -16,6 +16,7 @@  SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https;tag=v${PV}
            file://disable_acl_header_check.patch \
            file://0001-src-Makefile-improve-reproducibility.patch \
            file://no-path-adjust.patch \
+           file://0001-translation-sv-add-missing-mkdir.patch \
            "
 
 PV .= ".2128"