From: Alexander Kanavin <[email protected]> There's been an intermittent build fail that looks like a race: https://bugzilla.yoctoproject.org/show_bug.cgi?id=16000
While I can't say for sure if this is fixing the issue, there's no harm in adding a backport that rearranges the faulty code, and someone can then try to add a real fix on top of it. Or the race goes away and we're good. Signed-off-by: Alexander Kanavin <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 9dbd2141b52b24421927d64cd74ec43f6085c4f2) Signed-off-by: Yoann Congal <[email protected]> --- ...s-Fix-double-build-by-disabling-.d-f.patch | 78 +++++++++++++++++++ meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb | 4 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch new file mode 100644 index 0000000000..20009c1022 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch @@ -0,0 +1,78 @@ +From a789ffae9de93eb70c355a81f9dd2ebf5d6b17a7 Mon Sep 17 00:00:00 2001 +From: softworkz <[email protected]> +Date: Mon, 23 Jun 2025 14:56:19 +0200 +Subject: [PATCH] fftools/resources: Fix double-build by disabling .d file + generation + +Signed-off-by: softworkz <[email protected]> + +Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f52d9dd8693bc4628520258f18f89b4a3bf85533] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + ffbuild/common.mak | 6 ++---- + fftools/Makefile | 1 + + fftools/resources/Makefile | 12 +++++++++--- + 3 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/ffbuild/common.mak b/ffbuild/common.mak +index ddf4892..81e8a46 100644 +--- a/ffbuild/common.mak ++++ b/ffbuild/common.mak +@@ -229,11 +229,9 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) + SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) + HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) + PTXOBJS = $(filter %.ptx.o,$(OBJS)) +-RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS)) + $(HOBJS): CCFLAGS += $(CFLAGS_HEADERS) + checkheaders: $(HOBJS) +-.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) $(RESOURCEOBJS:.o=) +- ++.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) + alltools: $(TOOLS) + + $(HOSTOBJS): %.o: %.c +@@ -252,7 +250,7 @@ $(TOOLOBJS): | tools + + OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS)) + +-CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.gz *.css.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb ++CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.min.gz *.css.min *.css.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb + LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a + + define RULES +diff --git a/fftools/Makefile b/fftools/Makefile +index b3c08ae..bdb44fc 100644 +--- a/fftools/Makefile ++++ b/fftools/Makefile +@@ -36,6 +36,7 @@ OBJS-ffmpeg += \ + fftools/textformat/tw_buffer.o \ + fftools/textformat/tw_stdout.o \ + $(OBJS-resman) \ ++ $(RESOBJS) \ + + OBJS-ffprobe += \ + fftools/textformat/avtextformat.o \ +diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile +index 8579a52..3c93648 100644 +--- a/fftools/resources/Makefile ++++ b/fftools/resources/Makefile +@@ -4,10 +4,16 @@ clean:: + vpath %.html $(SRC_PATH) + vpath %.css $(SRC_PATH) + +-# Uncomment to prevent deletion during build +-#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c +- + OBJS-resman += \ + fftools/resources/resman.o \ ++ ++ ++RESOBJS += \ + fftools/resources/graph.html.o \ + fftools/resources/graph.css.o \ ++ ++ ++$(RESOBJS): CCDEP = ++$(RESOBJS): CC_DEPFLAGS = ++ ++.SECONDARY: $(RESOBJS:.o=.gz) $(RESOBJS:.o=.c) $(RESOBJS:%.css.o=%.css.min) $(RESOBJS:%.css.o=%.css.min.gz) $(RESOBJS:%.html.o=%.html.gz) $(RESOBJS:.o=) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb index ecaced7690..5e8d7bde55 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb @@ -22,7 +22,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"; +SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ + file://0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch \ + " SRC_URI[sha256sum] = "b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229666): https://lists.openembedded.org/g/openembedded-core/message/229666 Mute This Topic: https://lists.openembedded.org/mt/117361351/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
