btrfs-tools: update to 4.19.1
PATCH 1/13 btrfs-tools: update to 4.19.1
---
...el-lib-bitops-Fix-big-endian-compila.patch | 55 -------------------
...fs-tools_4.19.bb => btrfs-tools_4.19.1.bb} | 3 +-
2 files changed, 1 insertion(+), 57 deletions(-)
delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.19.bb => btrfs-tools_4.19.1.bb} (92%)meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch deleted +0 -55
@@ -1,55 +0,0 @@ -From 920c515478b441eaca31e33a18b95ceaa49ace19 Mon Sep 17 00:00:00 2001 -From: Rosen Penev <[email protected]> -Date: Mon, 5 Nov 2018 11:06:41 -0800 -Subject: [PATCH] btrfs-progs: kernel-lib: bitops: Fix big endian compilation - -Replaced bswap with _ variants bswap_32 etc. While it's a glibc -extension, all of the popular libc implementations (glibc, uClibc, musl, -BIONIC) seem to support it. - -Added static inline to two functions to match little endian variants. This -fixes a linking error experienced when compiling on gcc 7.3.0 with LTO, -possibly a bug that was fixed later. - -Upstream-Status: Backport [https://gitlab.com/kdave/btrfs-progs/commit/ed570e2df335063280c9d3affd8bb89919a1ac0d.patch] -Reviewed-by: Nikolay Borisov <[email protected]> -Signed-off-by: Rosen Penev <[email protected]> -Signed-off-by: David Sterba <[email protected]> -Signed-off-by: Alexander Kanavin <[email protected]> ---- - kernel-lib/bitops.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h -index b1fd6f53..2c51a265 100644 ---- a/kernel-lib/bitops.h -+++ b/kernel-lib/bitops.h -@@ -178,9 +178,9 @@ static inline unsigned long find_next_zero_bit(const unsigned long *addr, - static inline unsigned long ext2_swab(const unsigned long y) - { - #if BITS_PER_LONG == 64 -- return (unsigned long) bswap64((u64) y); -+ return (unsigned long) bswap_64((u64) y); - #elif BITS_PER_LONG == 32 -- return (unsigned long) bswap32((u32) y); -+ return (unsigned long) bswap_32((u32) y); - #else - #error BITS_PER_LONG not defined - #endif -@@ -218,14 +218,14 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1, - return min(start + __ffs(ext2_swab(tmp)), nbits); - } - --unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, -+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, - unsigned long offset) - { - return _find_next_bit_le(addr, NULL, size, offset, ~0UL); - } - - --unsigned long find_next_bit_le(const void *addr, unsigned long size, -+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, - unsigned long offset) - { - return _find_next_bit_le(addr, NULL, size, offset, 0UL);
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb +1 -2
@@ -14,12 +14,11 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "d72d913291683188ddf5d758db02f1bc3b05d2f7" +SRCREV = "167651ca29ec522cff0d81b52dc0cc4ae4e3f535" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Makefile-build-mktables-using-native-gcc.patch \ file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ - file://0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch \ " inherit autotools-brokensep pkgconfig manpages distutils3-base
Signature · 1 line
2.17.1
PATCH 2/13 meson: update to 0.49.0
Drop upstreamed gi-flags.patch and gtkdoc-flags.patch, rebase the rest.
---
meta/recipes-devtools/meson/meson.inc | 10 ++-
...0001-Make-CPU-family-warnings-fatal.patch} | 27 ++++----
...sues-that-arise-when-cross-compiling.patch | 61 ++-----------------
...-not-manipulate-the-environment-when.patch | 52 ++++++++--------
...port-building-allarch-recipes-again.patch} | 20 +++---
...ction-determine-g-ir-scanner-and-g-i.patch | 37 +++++------
.../meson/meson/gi-flags.patch | 35 -----------
.../meson/meson/gtkdoc-flags.patch | 44 -------------
.../{meson_0.47.2.bb => meson_0.49.0.bb} | 1 +
...on_0.47.2.bb => nativesdk-meson_0.49.0.bb} | 0
10 files changed, 83 insertions(+), 204 deletions(-)
rename meta/recipes-devtools/meson/meson/{0002-Make-CPU-family-warnings-fatal.patch => 0001-Make-CPU-family-warnings-fatal.patch} (50%)
rename meta/recipes-devtools/meson/meson/{0001-Support-building-allarch-recipes-again.patch => 0002-Support-building-allarch-recipes-again.patch} (52%)
delete mode 100644 meta/recipes-devtools/meson/meson/gi-flags.patch
delete mode 100644 meta/recipes-devtools/meson/meson/gtkdoc-flags.patch
rename meta/recipes-devtools/meson/{meson_0.47.2.bb => meson_0.49.0.bb} (97%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.47.2.bb => nativesdk-meson_0.49.0.bb} (100%)meta/recipes-devtools/meson/meson.inc +4 -6
@@ -9,17 +9,15 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \ file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ file://0003-native_bindir.patch \ - file://gi-flags.patch \ - file://gtkdoc-flags.patch \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ " -SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" -SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" +SRC_URI[sha256sum] = "fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551" +SRC_URI[md5sum] = "3c35b91e8040901034809576d54007c6" SRC_URI_append_class-native = " \ - file://0002-Make-CPU-family-warnings-fatal.patch \ - file://0001-Support-building-allarch-recipes-again.patch \ + file://0001-Make-CPU-family-warnings-fatal.patch \ + file://0002-Support-building-allarch-recipes-again.patch \ " UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch renamed from meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch +15 -12
@@ -1,7 +1,7 @@ -From 2e8553fc01e62ebc4faa240bf20984a8a0ac7387 Mon Sep 17 00:00:00 2001 +From d058d0f1d8833d99e8a3d3b9bcc383db23b52671 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH] Make CPU family warnings fatal +Subject: [PATCH 1/2] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <[email protected]>
@@ -11,11 +11,11 @@ Signed-off-by: Ross Burton <[email protected]> 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index d29a77f..267acf9 100644 +index 2ccd31e..5fcf9df 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -239,9 +239,7 @@ def detect_cpu_family(compilers): - return 'x86_64' +@@ -265,9 +265,7 @@ def detect_cpu_family(compilers): + # below. if trial not in known_cpu_families: - mlog.warning('Unknown CPU family {!r}, please report this at '
@@ -25,12 +25,15 @@ index d29a77f..267acf9 100644 return trial -@@ -1014,7 +1012,7 @@ class CrossBuildInfo: - raise EnvironmentException('Malformed value in cross file variable %s.' % entry) +@@ -1232,7 +1230,7 @@ class MachineInfo: - if entry == 'cpu_family' and res not in known_cpu_families: -- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) + cpu_family = literal['cpu_family'] + if cpu_family not in known_cpu_families: +- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family) ++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family) - if self.ok_type(res): - self.config[s][entry] = res + endian = literal['endian'] + if endian not in ('little', 'big'): +-- +2.17.1 +
meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +6 -55
80 lines not on this page · raw message
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +26 -26
68 lines not on this page · raw message
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch renamed from meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch +12 -8
@@ -1,25 +1,29 @@ -From d80d02a3ca6e21fa3d055c88c05234c2eb4db128 Mon Sep 17 00:00:00 2001 +From ffab5c5046da29fc20b074d21f6de46520cee58c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <[email protected]> Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH] Support building allarch recipes again +Subject: [PATCH 2/2] Support building allarch recipes again This registers "allarch" as a known CPU family. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Peter Kjellerstedt <[email protected]> + --- mesonbuild/environment.py | 1 + 1 file changed, 1 insertion(+) -Index: meson-0.47.2/mesonbuild/environment.py -=================================================================== ---- meson-0.47.2.orig/mesonbuild/environment.py -+++ meson-0.47.2/mesonbuild/environment.py -@@ -75,6 +75,7 @@ from .compilers import ( +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 5fcf9df..b4fc0dc 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -72,6 +72,7 @@ from .compilers import ( build_filename = 'meson.build' known_cpu_families = ( + 'allarch', 'aarch64', + 'arc', 'arm', - 'e2k', +-- +2.17.1 +
meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch +19 -18
@@ -1,4 +1,4 @@ -From 0b860cb8a22ae876b6088939dbabca216bc29431 Mon Sep 17 00:00:00 2001 +From 9ccaed380780178c4dab3a681f652ac7cd27452d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 4 Aug 2017 16:18:47 +0300 Subject: [PATCH] gobject-introspection: determine g-ir-scanner and
@@ -12,28 +12,29 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <[email protected]> --- - mesonbuild/modules/gnome.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + mesonbuild/modules/gnome.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index b29bab9..dc4c401 100644 +index 7c5a363..0002498 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule): - raise MesonException('Gir takes one argument') +@@ -744,15 +744,15 @@ class GnomeModule(ExtensionModule): if kwargs.get('install_dir'): raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"') + - giscanner = self.interpreter.find_program_impl('g-ir-scanner') - gicompiler = self.interpreter.find_program_impl('g-ir-compiler') - girtarget = args[0] - while hasattr(girtarget, 'held_object'): - girtarget = girtarget.held_object -@@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule): - self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', - state.environment, - {'native': True}) -+ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - pkgargs = self.gir_dep.get_compile_args() - except Exception: - raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') +- + girtargets = [self._unwrap_gir_target(arg, state) for arg in args] + + if len(girtargets) > 1 and any([isinstance(el, build.Executable) for el in girtargets]): + raise MesonException('generate_gir only accepts a single argument when one of the arguments is an executable') + + self.gir_dep, pkgargs = self._get_gir_dep(state) ++ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) ++ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) ++ + + ns = kwargs.pop('namespace') + nsversion = kwargs.pop('nsversion')
meta/recipes-devtools/meson/meson/gi-flags.patch deleted +0 -35
@@ -1,35 +0,0 @@ -Pass the correct cflags/ldflags to the gobject-introspection tools. - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/4261] -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index cb69641e..bb4449a0 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -579,7 +579,10 @@ class GnomeModule(ExtensionModule): - external_ldflags += list(dep_external_ldflags) - scan_command += ['--cflags-begin'] - scan_command += cflags -- scan_command += state.environment.coredata.get_external_args(lang) -+ if state.environment.is_cross_build(): -+ scan_command += state.environment.cross_info.config["properties"].get(lang + '_args', "") -+ else: -+ scan_command += state.environment.coredata.get_external_args(lang) - scan_command += ['--cflags-end'] - # need to put our output directory first as we need to use the - # generated libraries instead of any possibly installed system/prefix -@@ -614,7 +614,12 @@ class GnomeModule(ExtensionModule): - scan_command.append('-L' + d) - scan_command += ['--library', libname] - -- for link_arg in state.environment.coredata.get_external_link_args(lang): -+ if state.environment.is_cross_build(): -+ link_args = state.environment.cross_info.config["properties"].get(lang + '_link_args', "") -+ else: -+ link_args = state.environment.coredata.get_external_link_args(lang) -+ -+ for link_arg in link_args: - if link_arg.startswith('-L'): - scan_command.append(link_arg) - scan_command += list(external_ldflags)
meta/recipes-devtools/meson/meson/gtkdoc-flags.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-devtools/meson/meson_0.49.0.bb renamed from meta/recipes-devtools/meson/meson_0.47.2.bb +1 -0
@@ -1,3 +1,4 @@ include meson.inc BBCLASSEXTEND = "native" +
meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.47.2.bb +0 -0
Signature · 1 line
2.17.1
PATCH 3/13 systemd: backport a patch to fix meson 0.49.0 issue
In reply to Alexander Kanavin--- meta/recipes-core/systemd/systemd-boot_239.bb | 1 + ...-meson-rename-Ddebug-to-Ddebug-extra.patch | 45 +++++++++++++++++++ meta/recipes-core/systemd/systemd_239.bb | 1 + 3 files changed, 47 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch
meta/recipes-core/systemd/systemd-boot_239.bb +1 -0
@@ -6,6 +6,7 @@ DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" SRC_URI += "file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0006-remove-nobody-user-group-checking.patch \ file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ + file://0001-meson-rename-Ddebug-to-Ddebug-extra.patch \ " inherit meson pkgconfig gettext
meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-core/systemd/systemd_239.bb +1 -0
@@ -35,6 +35,7 @@ SRC_URI += "file://touchscreen.rules \ file://0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch \ file://0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch \ file://0001-timesync-changes-type-of-drift_freq-to-int64_t.patch \ + file://0001-meson-rename-Ddebug-to-Ddebug-extra.patch \ " # patches made for musl are only applied on TCLIBC is musl
Signature · 1 line
2.17.1
PATCH 4/13 libdazzle: fix a build issue with meson 0.49.0
In reply to Alexander Kanavin--- ...ine-so-that-gir-compilation-succeeds.patch | 26 +++++++++++++++++++ .../libdazzle/libdazzle_3.30.2.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 11 Dec 2018 12:39:30 +0100 +Subject: [PATCH] Add a define so that gir compilation succeeds + +For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 6ff8a6a..f0b2887 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -132,7 +132,7 @@ if get_option('with_introspection') + install_dir_gir: girdir, + install_dir_typelib: typelibdir, + export_packages: libdazzle_package, +- extra_args: [ '--c-include=dazzle.h', '--quiet' ], ++ extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ], + ) + + if get_option('with_vapi')
meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb +1 -0
@@ -7,6 +7,7 @@ inherit gnomebase upstream-version-is-even vala gobject-introspection DEPENDS = "glib-2.0-native glib-2.0 gtk+3" +SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch" SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5"
Signature · 1 line
2.17.1
Re: [PATCH 04/13] libdazzle: fix a build issue with meson 0.49.0
Quoted 1 line · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
Hi Alexander,
Have you ever meet build failure on qemumips with libdazzle:
389 /home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot/usr/include/glib-2.0/gobject/gobject.h:725: syntax error, unexpected ')' in ' ((__typeof__(new_object)) (g_object_ref) (new_object));' at ')'
390 qemu: uncaught target signal 11 (Segmentation fault) - core dumped
391 /home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot/usr/bin/g-ir-scanner-qemuwrapper: line 6: 24294 Segmentati on fault (core dumped) PSEUDO_UNLOAD=1 qemu-mips -r 3.2.0 -L /home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe- sysroot -E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot//usr /lib:/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot//lib "$@"
392 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the recipe should help.
393 (typically like this: GIR_EXTRA_LIBS_PATH="${B}/something/.libs" )
394 Command '['/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/recipe-sysroot/usr/bin/g-ir-scanner-qemuwrapper', '/home/kkang /buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/build/tmp-introspecta3rexhyk/Dazzle-1.0', '--introspect-dump=/home/kkang/buildarea/W RLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/build/tmp-introspecta3rexhyk/functions.txt,/home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-D ec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/build/tmp-introspecta3rexhyk/dump.xml']' returned non-zero exit status 1
395 ninja: build stopped: subcommand failed.
396 WARNING: /home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/temp/run.do_compile.23419:1 exit 1 from 'ninja -v -j 32' 397 ERROR: Function failed: do_compile (log file is located at /home/kkang/buildarea/WRLX-1019/systemd-oe-selftest-Dec24/tmp-glibc/work/mips32r2-wrs-linux/libdazzle/3.30.2-r0/temp/log.do_co mpile.23419)
The first error has been fixed in gobject-introspection 1.58.2. But I didn't find out the root cause of "qemu: uncaught target signal 11 (Segmentation fault) - core dumped".
Regards,
Kai
Quoted 50 lines
--- ...ine-so-that-gir-compilation-succeeds.patch | 26 +++++++++++++++++++ .../libdazzle/libdazzle_3.30.2.bb | 1 + 2 files changed, 27 insertions(+)create mode 100644
meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patchmeta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch new file +26
-0@@ -0,0 +1,26 @@ +From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 11 Dec 2018 12:39:30 +0100 +Subject: [PATCH] Add a define so that gir compilation succeeds + +For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 6ff8a6a..f0b2887 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -132,7 +132,7 @@ if get_option('with_introspection') + install_dir_gir: girdir, + install_dir_typelib: typelibdir, + export_packages: libdazzle_package, +- extra_args: [ '--c-include=dazzle.h', '--quiet' ], ++ extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ], + ) + + if get_option('with_vapi')meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb +1
-0@@ -7,6 +7,7 @@ inherit gnomebase upstream-version-is-even vala gobject-introspection DEPENDS = "glib-2.0-native glib-2.0 gtk+3" +SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch" SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5"
Signature · 1 line
Kai Kang
Re: [PATCH 04/13] libdazzle: fix a build issue with meson 0.49.0
Quoted 3 lines · Kang Kai
The first error has been fixed in gobject-introspection 1.58.2. But I didn't find out the root cause of "qemu: uncaught target signal 11 (Segmentation fault) - core dumped".
Same issue here - and it used to work for me :( Unfortunately I don't really know how to debug this - typically we just add arch-specific configuration flags that disable introspection.
However, the crash may mean that libdazzle won't work on target mips hardware either.
Alex
PATCH 5/13 dnf: upgrade 4.0.9 -> 4.0.10
In reply to Alexander Kanavin---
meta/recipes-devtools/dnf/{dnf_4.0.9.bb => dnf_4.0.10.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.0.9.bb => dnf_4.0.10.bb} (98%)meta/recipes-devtools/dnf/dnf_4.0.10.bb renamed from meta/recipes-devtools/dnf/dnf_4.0.9.bb +1 -1
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0030-Run-python-scripts-using-env.patch \ " -SRCREV = "689a4c515738226f3dc85edb2035d23233ff41d8" +SRCREV = "622e6d6fab05f0b15460c5b734f9e7b5935864f2" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 6/13 createrepo-c: update to 0.12.0
In reply to Alexander KanavinDrop 0001-Correctly-install-the-shared-library.patch as upstream fixed the issue.
--- ...Correctly-install-the-shared-library.patch | 28 ------------------- ...PYTHON_INSTALL_DIR-by-running-python.patch | 14 ++++------ .../createrepo-c/createrepo-c_git.bb | 7 ++--- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From fef835e1fdedc72c97d9c3e5704302e56e1bdef0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 2 Jan 2017 17:23:59 +0200 -Subject: [PATCH] Correctly install the shared library - -Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/78] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f3635e8..46dc037 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -110,7 +110,8 @@ CONFIGURE_FILE("deltarpms.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/deltarpms.h" @ONLY) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (LIB_SUFFIX "64") - ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") --SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") - - INSTALL(FILES ${headers} DESTINATION "include/createrepo_c") - INSTALL(FILES "createrepo_c.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") --- -2.11.0 -
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +6 -8
@@ -1,27 +1,25 @@ -From bef487b5c2515062c5dd73c21082ce42f69aa717 Mon Sep 17 00:00:00 2001 +From 4644d18157296257284bedd857f4610f1037d50e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 30 Dec 2016 18:31:02 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- src/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 9f1ac64..eae0cbb 100644 +index 3d873f7..e977b2f 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -19,7 +19,7 @@ else() - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) - endif() +@@ -21,7 +21,7 @@ if (NOT SKBUILD) + endif () + endif (NOT SKBUILD) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") --- -2.11.0 -
meta/recipes-devtools/createrepo-c/createrepo-c_git.bb +3 -4
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ - file://0001-Correctly-install-the-shared-library.patch \ " -PV = "0.11.1+git${SRCPV}" -SRCREV = "434a40babdde57ab405e9a1085a30e9575ea0c92" +PV = "0.12.0" +SRCREV = "8884a469680b7fb4a10fcbd49dbfef99b035c44b" S = "${WORKDIR}/git"
@@ -19,7 +18,7 @@ DEPENDS_append_class-native = " file-replacement-native" inherit cmake pkgconfig bash-completion distutils3-base -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 7/13 libdnf: upgrade 0.22.3 -> 0.24.1
In reply to Alexander Kanavin---
.../libdnf/{libdnf_0.22.3.bb => libdnf_0.24.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.22.3.bb => libdnf_0.24.1.bb} (95%)meta/recipes-devtools/libdnf/libdnf_0.24.1.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.22.3.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ file://0001-Add-WITH_TESTS-option.patch \ " -SRCREV = "5c198ea2357c5779cf83050e5291646c3b186446" +SRCREV = "04b71d78a2170e930a3c248d48a231b19f823064" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 8/13 lighttpd: upgrade 1.4.51 -> 1.4.52
In reply to Alexander Kanavin---
.../lighttpd/{lighttpd_1.4.51.bb => lighttpd_1.4.52.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/lighttpd/{lighttpd_1.4.51.bb => lighttpd_1.4.52.bb} (96%)meta/recipes-extended/lighttpd/lighttpd_1.4.52.bb renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb +2 -2
@@ -20,8 +20,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "6e68c19601af332fa3c5f174245f59bf" -SRC_URI[sha256sum] = "2af9fdb265d1f025bfa634e13770239712ecbd585e4975b8226edf1df74e9c82" +SRC_URI[md5sum] = "34f5c79137325ba31484bed1e54e66e6" +SRC_URI[sha256sum] = "27bc0991c530b7c6335e6efff2181934d3c1a1c516f7401ea71d8302cefda764" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
Signature · 1 line
2.17.1
PATCH 9/13 boost: update to 1.69.0
In reply to Alexander KanavinDrop upstreamed reproducibility-add-file-directive-to-assembler.patch
Drop signals library as upstream has removed it:
https://www.boost.org/users/history/version_1_69_0.html
---
...native_1.68.0.bb => bjam-native_1.69.0.bb} | 0
.../{boost-1.68.0.inc => boost-1.69.0.inc} | 4 +-
meta/recipes-support/boost/boost.inc | 1 -
...-instruction-set-flags-we-do-that-o.patch} | 23 +-
...lity-add-file-directive-to-assembler.patch | 243 ------------------
.../{boost_1.68.0.bb => boost_1.69.0.bb} | 6 +-
6 files changed, 14 insertions(+), 263 deletions(-)
rename meta/recipes-support/boost/{bjam-native_1.68.0.bb => bjam-native_1.69.0.bb} (100%)
rename meta/recipes-support/boost/{boost-1.68.0.inc => boost-1.69.0.inc} (85%)
rename meta/recipes-support/boost/boost/{0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch => 0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch} (93%)
delete mode 100644 meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch
rename meta/recipes-support/boost/{boost_1.68.0.bb => boost_1.69.0.bb} (56%)meta/recipes-support/boost/bjam-native_1.69.0.bb renamed from meta/recipes-support/boost/bjam-native_1.68.0.bb +0 -0
meta/recipes-support/boost/boost-1.69.0.inc renamed from meta/recipes-support/boost/boost-1.68.0.inc +2 -2
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "7fbd1890f571051f2a209681d57d486a" -SRC_URI[sha256sum] = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7" +SRC_URI[md5sum] = "a1332494397bf48332cb152abfefcec2" +SRC_URI[sha256sum] = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost.inc +0 -1
@@ -21,7 +21,6 @@ BOOST_LIBS = "\ random \ regex \ serialization \ - signals \ system \ timer \ test \
meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch renamed from meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +10 -13
@@ -1,21 +1,20 @@ -From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <[email protected]> -Date: Tue, 13 Dec 2016 10:29:32 -0700 -Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that - ourselves +From 3e4eb02eb5951058bc6f8dffbf049eb189df8291 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 18 Dec 2018 15:42:57 +0100 +Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson <[email protected]> - +Signed-off-by: Alexander Kanavin <[email protected]> --- - tools/build/src/tools/gcc.jam | 127 ------------------------------------------ - 1 file changed, 127 deletions(-) + tools/build/src/tools/gcc.jam | 128 ---------------------------------- + 1 file changed, 128 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index e3b1b952..e4fc6c32 100644 +index c57c773f..28618fb1 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1152,131 +1152,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; }
@@ -65,6 +64,7 @@ index e3b1b952..e4fc6c32 100644 -cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; -cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; -cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; +-cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ; -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
@@ -146,6 +146,3 @@ index e3b1b952..e4fc6c32 100644 -cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; --- -2.15.1 -
meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch deleted +0 -243
243 lines not on this page · raw message
meta/recipes-support/boost/boost_1.69.0.bb renamed from meta/recipes-support/boost/boost_1.68.0.bb +2 -4
@@ -1,11 +1,9 @@ require boost-${PV}.inc require boost.inc -SRC_URI += "\ - file://arm-intrinsics.patch \ +SRC_URI += "file://arm-intrinsics.patch \ file://boost-CVE-2012-2677.patch \ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ - file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://reproducibility-add-file-directive-to-assembler.patch \ + file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ "
Signature · 1 line
2.17.1
PATCH 10/13 gobject-introspection: upgrade 1.58.1 -> 1.58.2
In reply to Alexander Kanavin---
...-Relocate-the-repository-directory-for-native-builds.patch | 2 +-
...ntrospection_1.58.1.bb => gobject-introspection_1.58.2.bb} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.58.1.bb => gobject-introspection_1.58.2.bb} (98%)meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +1 -1
@@ -1,4 +1,4 @@ -From 2882e091e7b905441beef51dbed968f4dd7ffd7c Mon Sep 17 00:00:00 2001 +From 47a596165e253edb45eb48a35e50f488182e13fd Mon Sep 17 00:00:00 2001 From: Sascha Silbe <[email protected]> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.2.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb +2 -2
@@ -23,8 +23,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ file://0001-Port-cross-compilation-support-to-meson.patch \ " -SRC_URI[md5sum] = "101b04fb0184f9a0c718d450c056d68c" -SRC_URI[sha256sum] = "4954681fa5c5ed95451d914de89de1263a5b35158b1ded1a8b870042c0d0df89" +SRC_URI[md5sum] = "8479d6c543173721ce948484d0cd1d64" +SRC_URI[sha256sum] = "2a5e0f69459af7ca4c41b8f4e19d9c80ddf877834bb0e7fdd420e2495ae2eda8" SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
Signature · 1 line
2.17.1
PATCH 11/13 libcomps: upgrade 0.1.8 -> 0.1.9
In reply to Alexander Kanavin--- meta/recipes-devtools/libcomps/libcomps_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/libcomps/libcomps_git.bb +2 -2
@@ -9,8 +9,8 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0001-Add-crc32.c-to-sources-list.patch \ " -PV = "0.1.8+git${SRCPV}" -SRCREV = "01a4759894cccff64d2561614a58281adf5ce859" +PV = "0.1.9" +SRCREV = "58be208122179ca6e4edc0635a26f02bf733d6a9" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 12/13 webkitgtk: upgrade 2.22.4 -> 2.22.5
In reply to Alexander Kanavin---
.../webkit/{webkitgtk_2.22.4.bb => webkitgtk_2.22.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-sato/webkit/{webkitgtk_2.22.4.bb => webkitgtk_2.22.5.bb} (97%)meta/recipes-sato/webkit/webkitgtk_2.22.5.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.22.4.bb +2 -2
@@ -22,8 +22,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://detect-gstreamer-gl.patch \ " -SRC_URI[md5sum] = "9f08d09cfc21c761a431a545549f301a" -SRC_URI[sha256sum] = "fab5be2883802352ae0e735dd1eff4bc18abaff7ac78689cec72eb2f611943b8" +SRC_URI[md5sum] = "96a731522b800f38e70f85c22f8de477" +SRC_URI[sha256sum] = "99d3863f418a7c3a3e37e5062950dbf2d91fb106ec1633459b0ef6f2d5f6cb13" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.17.1
PATCH 13/13 librepo: upgrade 1.9.2 -> 1.9.3
In reply to Alexander Kanavin---
...gpgme-variables-with-pkg-config-not-with-cmake-m.patch | 8 ++++----
.../librepo/{librepo_1.9.2.bb => librepo_1.9.3.bb} | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/librepo/{librepo_1.9.2.bb => librepo_1.9.3.bb} (84%)meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +4 -4
@@ -1,4 +1,4 @@ -From 9f44d2f4aaf706027fe5a02f6d83547ff343f09c Mon Sep 17 00:00:00 2001 +From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 30 Dec 2016 18:23:27 +0200 Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0f7271f..d71373f 100644 +index e949dbe..c954b2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,7 +30,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) +@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) FIND_PACKAGE(CURL REQUIRED)
@@ -23,5 +23,5 @@ index 0f7271f..d71373f 100644 +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) - INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) + IF (WITH_ZCHUNK)
meta/recipes-devtools/librepo/librepo_1.9.3.bb renamed from meta/recipes-devtools/librepo/librepo_1.9.2.bb +2 -2
@@ -7,7 +7,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "313a7644d03f9657ee0c7aa747d1db260f8e2fc0" +SRCREV = "f1212bd4a55467ab8578c87f98ed363cccd5907a" S = "${WORKDIR}/git"
@@ -15,7 +15,7 @@ DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" inherit cmake distutils3-base pkgconfig -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF" +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF -DWITH_ZCHUNK=OFF" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
✗ patchtest: failure for "btrfs-tools: update to 4.19.1..." and 12 more
In reply to Alexander Kanavin== Series Details ==
Series: "btrfs-tools: update to 4.19.1..." and 12 more
Revision: 1
URL : https://patchwork.openembedded.org/series/15402/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 14c291e1fb)
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
Re: ✗ patchtest: failure for "btrfs-tools: update to 4.19.1..." and 12 more
Quoted 3 lines · Patchwork
* Issue Series does not apply on top of target branch [
test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at14c291e1fb)
Rebased patchset is here (trivial conflict in systemd recipe):
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alex