mirror of
https://git.yoctoproject.org/poky
synced 2026-03-12 02:09:39 +01:00
6a0d24ba1c
Pulls in several CVE fixes. Added a patch to avoid timer_create cross compile issue (and submitted upstream). Also submit the race fix upstream. We disable timer_create in the native case since some systems have it and some don't so this makes us consistent. (From OE-Core rev: 8b42e405fc630537398116a1429a9bc7cb2152ab) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d0c1de084c7ce030d47a428e4bbfbc4ce2996057) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
po/Makefile: Avoid race over LINGUAS file
|
|
|
|
The creation of the LINGUAS file is duplicated for each desktop file
|
|
which can lead the commands to race against each other. One target might
|
|
remove it before another has been able to use it. Rework the makefile to
|
|
avoid this as the expense of leaving the file on disk.
|
|
|
|
Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
|
|
|
|
Upstream-Status: Submitted [https://github.com/vim/vim/pull/10776]
|
|
|
|
Index: git/src/po/Makefile
|
|
===================================================================
|
|
--- git.orig/src/po/Makefile
|
|
+++ git/src/po/Makefile
|
|
@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM
|
|
# Delete the temporary files
|
|
rm *.js
|
|
|
|
-vim.desktop: vim.desktop.in $(POFILES)
|
|
+LINGUAS:
|
|
echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
|
|
+
|
|
+vim.desktop: vim.desktop.in $(POFILES) LINGUAS
|
|
$(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop
|
|
- rm -f LINGUAS
|
|
if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi
|
|
mv tmp_vim.desktop vim.desktop
|
|
|
|
-gvim.desktop: gvim.desktop.in $(POFILES)
|
|
- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
|
|
+gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS
|
|
$(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop
|
|
- rm -f LINGUAS
|
|
if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi
|
|
mv tmp_gvim.desktop gvim.desktop
|
|
|