pango: fix markup-parse test case
PATCH 1/6 pango: fix markup-parse test case
The test case expects that printf(0x0) is (null) but for us this it is (NULL).
Use case-insensitive diff as the rest of the tests don't care about case.
--- .../pango/pango/insensitive-diff.patch | 28 ++++++++++++++++++++++ meta/recipes-graphics/pango/pango_1.42.4.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/pango/pango/insensitive-diff.patch
meta/recipes-graphics/pango/pango/insensitive-diff.patch new file +28 -0
@@ -0,0 +1,28 @@ +Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed +as (null) or (NULL). + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44] +Signed-off-by: Ross Burton <[email protected]> + +diff --git a/tests/markup-parse.c b/tests/markup-parse.c +index 633f3e89..36d2c776 100644 +--- a/tests/markup-parse.c ++++ b/tests/markup-parse.c +@@ -217,7 +217,7 @@ diff_with_file (const char *file1, + GString *string, + GError **error) + { +- const char *command[] = { "diff", "-u", file1, NULL, NULL }; ++ const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL }; + char *diff, *tmpfile; + int fd; + +@@ -237,7 +237,7 @@ diff_with_file (const char *file1, + goto done; + } + close (fd); +- command[3] = tmpfile; ++ command[4] = tmpfile; + + /* run diff command */ + g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error);
meta/recipes-graphics/pango/pango_1.42.4.bb +2 -1
@@ -16,7 +16,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection SRC_URI += "file://run-ptest \ -" + file://insensitive-diff.patch" + SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
Signature · 1 line
2.11.0
PATCH 2/6 packagegroup-self-hosted: remove lrzsz
A X/Y/ZMODEM transfer tool is not a required package for self-hosted builds.
--- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +0 -1
@@ -128,7 +128,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ libaio \ libusb1 \ libxml2 \ - lrzsz \ lsof \ lzo \ man \
Signature · 1 line
2.11.0
PATCH 3/6 packagegroup-core-tools-testapps: remove lrzsz
In reply to Ross BurtonWe can assume that modern boards don't need X/Y/ZMODEM transfer tools for testing purposes. The few users that need this tool for testing can add it themselves.
--- meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +0 -1
@@ -38,7 +38,6 @@ X11TOOLS = "\ RDEPENDS_${PN} = "\ blktool \ - lrzsz \ ${KEXECTOOLS} \ alsa-utils-amixer \ alsa-utils-aplay \
Signature · 1 line
2.11.0
PATCH 4/6 mtd-utils: add lzo PACKAGECONFIG
In reply to Ross BurtonLZO support is optional so add a PACKAGECONFIG to control this.
Also clean up the xattr PACKAGECONFIG to explicitly enable/disable.
--- meta/recipes-devtools/mtd/mtd-utils_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-devtools/mtd/mtd-utils_git.bb +4 -3
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ inherit autotools pkgconfig update-alternatives -DEPENDS = "zlib lzo e2fsprogs util-linux" +DEPENDS = "zlib e2fsprogs util-linux" RDEPENDS_mtd-utils-tests += "bash" PV = "2.0.2+${SRCPV}"
@@ -25,8 +25,9 @@ EXTRA_OECONF += "--enable-install-tests" # xattr support creates an additional compile-time dependency on acl because # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr # regardless whether acl is enabled or disabled in the distro should be okay. -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" -PACKAGECONFIG[xattr] = ",,acl," +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} lzo" +PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo" +PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr,acl" CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT"
Signature · 1 line
2.11.0
PATCH 5/6 util-linux: remove spurious lzo-native dependency
In reply to Ross BurtonThis was added with no explanation in 2010 (17f3c548c) and doesn't appear to be needed.
--- meta/recipes-core/util-linux/util-linux.inc | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +0 -2
@@ -21,8 +21,6 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c #gtk-doc is not enabled as it requires xmlto which requires util-linux inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "zlib ncurses virtual/crypt" -DEPENDS_append_class-native = " lzo-native" -DEPENDS_append_class-nativesdk = " lzo-native" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \
Signature · 1 line
2.11.0
PATCH 6/6 squashfs-tools: add PACKAGECONFIGs for all the tunables
In reply to Ross BurtonUpstream lets you control what compression algorithms are used, so add PACKAGECONFIGs for them all.
Instead of bundling a copy of the SevenZIP SDK from 2009 (!), reuse XZ. This means we can drop Public Domain from the license list.
Also -e was removed from EXTRA_OEMAKE in 2016 (oe-core aeb653) so the fiddling to work around that can be removed.
--- .../squashfs-tools/squashfs-tools_git.bb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +12 -10
@@ -2,16 +2,12 @@ # and I don't think the kernel supports it any more. SUMMARY = "Tools for manipulating SquashFS filesystems" SECTION = "base" -LICENSE = "GPL-2 & PD" -LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://../../7zC.txt;beginline=12;endline=16;md5=2056cd6d919ebc3807602143c7449a7c \ -" -DEPENDS = "attr zlib xz lzo lz4" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PV = "4.3+gitr${SRCPV}" SRCREV = "9c1db6d13a51a2e009f0027ef336ce03624eac0d" SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ - http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2;name=lzma \ file://0001-mksquashfs.c-get-inline-functions-work-with-C99.patch;striplevel=2 \ file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \ file://fix-compat.patch \
@@ -23,14 +19,20 @@ SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e S = "${WORKDIR}/git/squashfs-tools" -# EXTRA_OEMAKE is typically: -e MAKEFLAGS= -# the -e causes problems as CFLAGS is modified in the Makefile, so -# we redefine EXTRA_OEMAKE here -EXTRA_OEMAKE = "MAKEFLAGS= LZMA_SUPPORT=1 LZMA_DIR=../.. XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1" +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" + +PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr" +PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib" +PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz" +PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo" +PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4" +PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz" +PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" do_compile() { oe_runmake mksquashfs unsquashfs } + do_install () { install -d ${D}${sbindir} install -m 0755 mksquashfs ${D}${sbindir}/
Signature · 1 line
2.11.0