Hello, On 23/07/2021 00:45:05+0200, Alexander Kanavin wrote: > Drop no-x11.gplv3.patch (the libraries are now > dynamically enabled from configure.in). >
This update causes failures with wic because mcopy fails with: mcopy: No directory slots Full log here: https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/3686/steps/11/logs/stdio 12 builds failed so this should be easily reproducible. > Signed-off-by: Alexander Kanavin <[email protected]> > --- > .../mtools/disable-hardcoded-configs.patch | 4 ++-- > .../mtools/mtools/no-x11.gplv3.patch | 18 ------------------ > .../{mtools_4.0.32.bb => mtools_4.0.33.bb} | 3 +-- > 3 files changed, 3 insertions(+), 22 deletions(-) > delete mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > rename meta/recipes-devtools/mtools/{mtools_4.0.32.bb => mtools_4.0.33.bb} > (91%) > > diff --git > a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > index 81d76d060e..90573dcb1a 100644 > --- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > +++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch > @@ -1,4 +1,4 @@ > -From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 > +From 7efdb47246413f938e3b2d8378ce9c363d98b371 Mon Sep 17 00:00:00 2001 > From: Ed Bartosh <[email protected]> > Date: Tue, 13 Jun 2017 14:55:52 +0300 > Subject: [PATCH] Disabled reading host configs. > @@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh <[email protected]> > 1 file changed, 8 deletions(-) > > diff --git a/config.c b/config.c > -index bb13682..9186c77 100644 > +index 173eae0..0654cc1 100644 > --- a/config.c > +++ b/config.c > @@ -836,14 +836,6 @@ void read_config(void) > diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > deleted file mode 100644 > index 9cb3e39f5c..0000000000 > --- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch > +++ /dev/null > @@ -1,18 +0,0 @@ > -Disable building with X11 support. > - > -Upstream-Status: Inappropriate [disable feature] > - > -Signed-off-by: Scott Garman <[email protected]> > - > -diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in > ---- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700 > -+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800 > -@@ -146,7 +146,7 @@ > - CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ > -I@srcdir@ $(USERCFLAGS) > - LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ > - ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) > --X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS) > -+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS) > - X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) > - > - all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5 > diff --git a/meta/recipes-devtools/mtools/mtools_4.0.32.bb > b/meta/recipes-devtools/mtools/mtools_4.0.33.bb > similarity index 91% > rename from meta/recipes-devtools/mtools/mtools_4.0.32.bb > rename to meta/recipes-devtools/mtools/mtools_4.0.33.bb > index 501875037a..fd9febb01d 100644 > --- a/meta/recipes-devtools/mtools/mtools_4.0.32.bb > +++ b/meta/recipes-devtools/mtools/mtools_4.0.33.bb > @@ -24,11 +24,10 @@ RRECOMMENDS_${PN}_libc-glibc = "\ > glibc-gconv-ibm866 \ > glibc-gconv-ibm869 \ > " > -SRC_URI[sha256sum] = > "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" > +SRC_URI[sha256sum] = > "1cb10f8e1e20302f86eaa9c5db262f4559d1dc94bd11fdda7692bc2d1beab954" > > SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ > file://mtools-makeinfo.patch \ > - file://no-x11.gplv3.patch \ > file://clang_UNUSED.patch \ > " > > -- > 2.31.1 > > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154126): https://lists.openembedded.org/g/openembedded-core/message/154126 Mute This Topic: https://lists.openembedded.org/mt/84390487/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
