cairo: disable some features explicitly
PATCH 1/9 cairo: disable some features explicitly
These are disabled out of the box but only because the dependencies are not present. Explicitly disable them to be clear.
--- meta/recipes-graphics/cairo/cairo_1.18.2.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-graphics/cairo/cairo_1.18.2.bb +2 -0
@@ -57,6 +57,8 @@ PACKAGECONFIG[xcb] = "-Dxcb=enabled,-Dxcb=disabled,libxcb" # cairo-trace is GPLv3 so add an option to remove it PACKAGECONFIG[trace] = "" +EXTRA_OEMESON = "-Dsymbol-lookup=disabled -Dspectre=disabled -Dtests=disabled" + do_install:append () { if ! ${@bb.utils.contains('PACKAGECONFIG', 'trace', 'true', 'false', d)}; then rm ${D}${bindir}/cairo-trace ${D}${libdir}/cairo/libcairo-trace.so
Signature · 1 line
2.34.1
PATCH 2/9 glib-2.0: don't use deprecated Meson option values
true/false for these options is deprecated, use enabled/disabled.
--- meta/recipes-core/glib-2.0/glib.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib.inc +2 -1
@@ -46,7 +46,8 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,gobject-introspection-native gobject-introspection glib-2.0-initial" -EXTRA_OEMESON = "-Ddtrace=false -Dsystemtap=false" +EXTRA_OEMESON = "-Ddtrace=disabled -Dsystemtap=disabled" + EXTRA_OEMESON:append:class-target = " ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''}" do_configure:prepend() {
Signature · 1 line
2.34.1
PATCH 3/9 glib-2.0: explicitly disable sysprof
In reply to Ross BurtonWe can't build this combination right now because of a circular dependency, but it's good to make it explicit.
--- meta/recipes-core/glib-2.0/glib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib.inc +1 -1
@@ -46,7 +46,7 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,gobject-introspection-native gobject-introspection glib-2.0-initial" -EXTRA_OEMESON = "-Ddtrace=disabled -Dsystemtap=disabled" +EXTRA_OEMESON = "-Ddtrace=disabled -Dsystemtap=disabled -Dsysprof=disabled" EXTRA_OEMESON:append:class-target = " ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''}"
Signature · 1 line
2.34.1
PATCH 4/9 gstreamer1.0-libav: explicitly disable documentation
In reply to Ross BurtonWe can't build documentation when doing a cross build, so disable it explicitly to be clear.
--- meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.6.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.6.bb +1 -0
@@ -22,6 +22,7 @@ inherit meson pkgconfig upstream-version-is-even EXTRA_OEMESON += " \ -Dtests=disabled \ + -Ddoc=disabled \ " FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
Signature · 1 line
2.34.1
PATCH 5/9 json-glib: don't use deprecated gtk_doc option flag
In reply to Ross BurtonThe correct meson flag for the documentation is 'documentation'.
--- meta/recipes-gnome/json-glib/json-glib_1.10.0.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-gnome/json-glib/json-glib_1.10.0.bb +1 -0
@@ -14,6 +14,7 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit gnomebase lib_package gobject-introspection gi-docgen gettext ptest-gnome manpages upstream-version-is-even GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' +GIDOCGEN_MESON_OPTION = 'documentation' GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' GIDOCGEN_MESON_DISABLE_FLAG = 'disabled'
Signature · 1 line
2.34.1
PATCH 6/9 libpciaccess: remove redundant feature check
In reply to Ross BurtonThis recipe once included the xorg common .inc file but had to reset several variables. It no longer includes that file but there's a lot of cruft to remove: the LICENSE being "MIT & MIT" and the features_check class not checking for any features, specifically.
--- .../xorg-lib/libpciaccess_0.18.1.bb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb +4 -11
@@ -1,26 +1,19 @@ SUMMARY = "Generic PCI access library for X" - DESCRIPTION = "libpciaccess provides functionality for X to access the \ PCI bus and devices in a platform-independent way." HOMEPAGE = "http://www.x.org" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - SECTION = "x11/libs" + LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" + DEPENDS = "util-macros" SRC_URI = "${XORG_MIRROR}/individual/lib/${BP}.tar.xz" - -inherit features_check pkgconfig meson - -REQUIRED_DISTRO_FEATURES ?= "x11" - SRC_URI[sha256sum] = "4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76" -LICENSE = "MIT & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" - -REQUIRED_DISTRO_FEATURES = "" +inherit pkgconfig meson BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.34.1
PATCH 7/9 libpciaccess: add (and enable) the option for compressed pci.ids file
In reply to Ross BurtonA small dependency allows the 1.3MB pci.ids file to be compressed down to 300K.
--- meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb +3 -0
@@ -16,4 +16,7 @@ SRC_URI[sha256sum] = "4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765 inherit pkgconfig meson +PACKAGECONFIG ?= "zlib" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.34.1
PATCH 8/9 pango: don't use deprecated gtk_doc option flag
In reply to Ross BurtonThe correct meson flag for the documentation is 'documentation'.
--- meta/recipes-graphics/pango/pango_1.54.0.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-graphics/pango/pango_1.54.0.bb +1 -0
@@ -28,6 +28,7 @@ PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" PACKAGECONFIG[thai] = "-Dlibthai=enabled,-Dlibthai=disabled,libthai" GIR_MESON_OPTION = 'introspection' +GIDOCGEN_MESON_OPTION = 'documentation' LEAD_SONAME = "libpango-1.0*"
Signature · 1 line
2.34.1
PATCH 9/9 systemd: don't use deprecated meson option values
In reply to Ross Burton--- meta/recipes-core/systemd/systemd_256.7.bb | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-)
meta/recipes-core/systemd/systemd_256.7.bb +37 -37
@@ -130,68 +130,68 @@ TARGET_CC_ARCH:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 -D_LARGEFILE64_SOURCE" # systemd-serialgetty.bb - not enabled by default. PACKAGECONFIG[serial-getty-generator] = "" -PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" -PACKAGECONFIG[audit] = "-Daudit=true,-Daudit=false,audit" +PACKAGECONFIG[acl] = "-Dacl=enabled,-Dacl=disabled,acl" +PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit" PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" -PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=true,-Dbpf-framework=false,clang-native bpftool-native libbpf,libbpf" -PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" +PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=enabled,-Dbpf-framework=disabled,clang-native bpftool-native libbpf,libbpf" +PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" -PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup" -PACKAGECONFIG[cryptsetup-plugins] = "-Dlibcryptsetup-plugins=true,-Dlibcryptsetup-plugins=false,cryptsetup,,cryptsetup" -PACKAGECONFIG[tpm2] = "-Dtpm2=true,-Dtpm2=false,tpm2-tss,tpm2-tss libtss2 libtss2-tcti-device" +PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=enabled,-Dlibcryptsetup=disabled,cryptsetup,,cryptsetup" +PACKAGECONFIG[cryptsetup-plugins] = "-Dlibcryptsetup-plugins=enabled,-Dlibcryptsetup-plugins=disabled,cryptsetup,,cryptsetup" +PACKAGECONFIG[tpm2] = "-Dtpm2=enabled,-Dtpm2=disabled,tpm2-tss,tpm2-tss libtss2 libtss2-tcti-device" # If multiple compression libraries are enabled, the format to use for compression is chosen implicitly, # so if you want to compress with e.g. lz4 you cannot enable zstd, so you cannot read zstd-compressed journal files. # This option allows to enable all compression formats for reading, but choosing a specific one for writing. PACKAGECONFIG[default-compression-lz4] = "-Dlz4=true -Ddefault-compression=lz4,,lz4" PACKAGECONFIG[default-compression-xz] = "-Dxz=true -Ddefault-compression=xz,,xz" PACKAGECONFIG[default-compression-zstd] = "-Dzstd=true -Ddefault-compression=zstd,,zstd" -PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" -PACKAGECONFIG[efi] = "-Defi=true -Dbootloader=true,-Defi=false -Dbootloader=false,python3-pyelftools-native" -PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils,,libelf libdw" +PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" +PACKAGECONFIG[efi] = "-Defi=true -Dbootloader=enabled,-Defi=false -Dbootloader=disabled,python3-pyelftools-native" +PACKAGECONFIG[elfutils] = "-Delfutils=enabled,-Delfutils=disabled,elfutils,,libelf libdw" PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" -PACKAGECONFIG[repart] = "-Drepart=true,-Drepart=false" -PACKAGECONFIG[homed] = "-Dhomed=true,-Dhomed=false" +PACKAGECONFIG[repart] = "-Drepart=enabled,-Drepart=disabled" +PACKAGECONFIG[homed] = "-Dhomed=enabled,-Dhomed=disabled" # Sign the journal for anti-tampering -PACKAGECONFIG[gcrypt] = "-Dgcrypt=true,-Dgcrypt=false,libgcrypt" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[gcrypt] = "-Dgcrypt=enabled,-Dgcrypt=disabled,libgcrypt" +PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false" PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false" PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false" PACKAGECONFIG[idn] = "-Didn=true,-Didn=false" PACKAGECONFIG[ima] = "-Dima=true,-Dima=false" # importd requires journal-upload/xz/zlib/bzip2/gcrypt -PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false,glib-2.0" +PACKAGECONFIG[importd] = "-Dimportd=enabled,-Dimportd=disabled,glib-2.0" # Update NAT firewall rules -PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables" +PACKAGECONFIG[iptc] = "-Dlibiptc=enabled,-Dlibiptc=disabled,iptables" PACKAGECONFIG[journal-color] = ",,,less" -PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" -PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod,libkmod" +PACKAGECONFIG[journal-upload] = "-Dlibcurl=enabled,-Dlibcurl=disabled,curl" +PACKAGECONFIG[kmod] = "-Dkmod=enabled,-Dkmod=disabled,kmod,libkmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" -PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn,,libidn" -PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2,,libidn2" +PACKAGECONFIG[libidn] = "-Dlibidn=enabled,-Dlibidn=disabled,libidn,,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=enabled,-Dlibidn2=disabled,libidn2,,libidn2" # Link udev shared with systemd helper library. # If enabled the udev package depends on the systemd package (which has the needed shared library). PACKAGECONFIG[link-udev-shared] = "-Dlink-udev-shared=true,-Dlink-udev-shared=false" PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" -PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" +PACKAGECONFIG[lz4] = "-Dlz4=enabled,-Dlz4=disabled,lz4" PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" +PACKAGECONFIG[manpages] = "-Dman=enabled,-Dman=disabled,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=enabled,-Dmicrohttpd=disabled,libmicrohttpd" PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname" PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" PACKAGECONFIG[no-dns-fallback] = "-Ddns-servers=" PACKAGECONFIG[no-ntp-fallback] = "-Dntp-servers=" PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false,,libnss-systemd" -PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" -PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false" +PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=enabled,-Dnss-mymachines=disabled" +PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=enabled,-Dnss-resolve=disabled" PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false" -PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl" -PACKAGECONFIG[p11kit] = "-Dp11kit=true,-Dp11kit=false,p11-kit" -PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}" -PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2" -PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" +PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" +PACKAGECONFIG[p11kit] = "-Dp11kit=enabled,-Dp11kit=disabled,p11-kit" +PACKAGECONFIG[pam] = "-Dpam=enabled,-Dpam=disabled,libpam,${PAM_PLUGINS}" +PACKAGECONFIG[pcre2] = "-Dpcre2=enabled,-Dpcre2=disabled,libpcre2" +PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled" # If polkit is disabled and networkd+hostnamed are in use, enabling this option and # using dbus-broker will allow networkd to be authorized to change the # hostname without acquiring additional privileges
@@ -199,13 +199,13 @@ PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" PACKAGECONFIG[pstore] = "-Dpstore=true,-Dpstore=false" PACKAGECONFIG[pni-names] = ",,," -PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" +PACKAGECONFIG[qrencode] = "-Dqrencode=enabled,-Dqrencode=disabled,qrencode,,qrencode" PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false" PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false" -PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" +PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,initscripts-sushell" PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" PACKAGECONFIG[sysext] = "-Dsysext=true, -Dsysext=false" PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false"
@@ -227,10 +227,10 @@ PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setu PACKAGECONFIG[wheel-group] = "-Dwheel-group=true, -Dwheel-group=false" PACKAGECONFIG[xdg-autostart] = "-Dxdg-autostart=true,-Dxdg-autostart=false" # Verify keymaps on locale change -PACKAGECONFIG[xkbcommon] = "-Dxkbcommon=true,-Dxkbcommon=false,libxkbcommon" -PACKAGECONFIG[xz] = "-Dxz=true,-Dxz=false,xz" -PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib" -PACKAGECONFIG[zstd] = "-Dzstd=true,-Dzstd=false,zstd" +PACKAGECONFIG[xkbcommon] = "-Dxkbcommon=enabled,-Dxkbcommon=disabled,libxkbcommon" +PACKAGECONFIG[xz] = "-Dxz=enabled,-Dxz=disabled,xz" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" +PACKAGECONFIG[zstd] = "-Dzstd=enabled,-Dzstd=disabled,zstd" RESOLV_CONF ??= ""
Signature · 1 line
2.34.1
Re: [OE-core] [PATCH 9/9] systemd: don't use deprecated meson option values
Hi,
Do you have a test to catch these cases? Would be nice to see that too.
I saw these systemd warnings in the past but they changed from one version to another and they are not systematically and correctly used in upstream systemd so I decided not to bother with this change.
It would take a lot of work to test all combinations so that nothing breaks.
Cheers,
-Mikko
Re: [OE-core] [PATCH 9/9] systemd: don't use deprecated meson option values
Quoted 5 lines · Mikko Rapeli
Hi,
Do you have a test to catch these cases? Would be nice to see that too.
Sort of…
$ grep DEPRECATION:\ Option tmp/work/*/*/temp/log.do_configure
In systemd specifically there’s a few deprecation options we’re using anyway, but this stops it warning about all the ones we should just update.
Ross
Re: [OE-core] [PATCH 9/9] systemd: don't use deprecated meson option values
In reply to Mikko RapeliQuoted 5 lines · Mikko Rapeli
I saw these systemd warnings in the past but they changed from one version to another and they are not systematically and correctly used in upstream systemd so I decided not to bother with this change.
It would take a lot of work to test all combinations so that nothing breaks.
Not sure what you mean by all combination - all of these options are passed in one way or another (either enabled or disabled), so the values are tested.
In case it’s not obvious, this series is the ‘obviously correct’ piece of a oe-core build with meson’s auto options forcibly enabled. More patches incoming.
Ross