From 64d91cb68c72abd219a9bf8f341e63e277e51f75 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Wed, 5 May 2021 08:45:55 -0400 Subject: [PATCH] Big Upgrade: GNOME 40 Yocto 3.3 meta-rust meta-clang meta-intel Updated Recipes * colord 1.4.5 * dconf 0.40.0 * gdm 40.0 * geoclue 2.5.7 * geocode-glib 3.26.2 * gevix2_ 0.12.1 * gjs 1.68.0 * glib2 2.68.0 * gnome-autoar 0.3.1 * gnome-backgrounds 40.0 * gnome-control-center 40.0 * gnome-desktop 40.0 * gnome-disk-utility 40.1 * gnome-keyring 40.0 * gnome-screenshot 40.0 * gnome-session 40.1.1 * gnome-settings-daemon 40.0.1 * gnome-shell 40.0 * gnome-system-monitor 40.1 * gnome-terminal 3.40.1 * gsettings-desktop-schemas 40.0 * ibus 1.5.23 * iwd 1.13 * kernel 5.12.1 * keyutils 1.6.1 * libgee 0.20.4 * libgit2 1.1.0 * libgweather 40.0 * libhandy 1.2.0 (poky) * libseccomp 2.5.1 * libssh2 1.9.0 (poky) * lvm2 2.03.11 * meson 0.57.1 (poky) * mutter 40.0 * nano 5.6 * NetworkManager 1.30.2 * network-manager-applet 1.18.0 * nspr 4.29 * pango 1.48.2 (poky) * plymouth 0.9.5+git * udisks 2.9.2 * upower 0.99.11 * vte 0.64.0 * yelp-tools 3.32.2 * yelp-xsl 3.36.0 --- meta-citadel/conf/distro/citadel-distro.conf | 5 +- meta-citadel/conf/layer.conf | 2 +- .../bbappends/gcc-cross_9.%.bbappend | 20 -- .../bbappends/geoclue_%.bbappend | 1 + .../bbappends/iptables/iptables.rules | 1 + .../bbappends/libbytesize_%.bbappend | 2 +- ...b_1.13.1.bbappend => libxcb_1.14.bbappend} | 0 .../recipes-citadel/bbappends/lvm2_%.bbappend | 5 - .../recipes-citadel/bbappends/mesa_%.bbappend | 1 - .../networkmanager}/NetworkManager.conf | 0 .../networkmanager}/watch-resolvconf.path | 1 - .../networkmanager}/watch-resolvconf.service | 0 .../bbappends/networkmanager_%.bbappend | 10 + .../ovmf/python3.9-fix-ucs2-lookup.patch | 46 ---- ....9-workaround-array-tostring-removal.patch | 47 ---- .../recipes-citadel/bbappends/ovmf_%.bbappend | 9 - .../bbappends/plymouth.bbappend | 2 + ...13.%.bbappend => pulseaudio_14.%.bbappend} | 0 .../bbappends/systemd-conf_%.bbappend | 2 +- .../bbappends/systemd_%.bbappend | 2 +- .../citadel-config/citadel-config-gnome.bb | 5 +- .../citadel-config/citadel-config.bb | 28 +- .../files/00-storage-tmpfiles.conf | 31 +-- .../gsettings/90_citadel.gschema.override | 3 +- .../citadel-config/files/iwd/main.conf | 5 - .../citadel-config/files/pulse/cookie | Bin 0 -> 256 bytes .../files/systemd/launch-default-realm.path | 2 +- .../files/systemd/watch-run-user.path | 2 +- .../files/systemd/watch-run-user.service | 1 + .../citadel-config/files/udev/scsi-alpm.rules | 1 - .../recipes-citadel/images/citadel-image.inc | 2 +- .../images/citadel-installer-image.bb | 6 +- .../images/citadel-rootfs-image.bb | 10 - .../packagegroups/packagegroup-gnome.bb | 1 - .../citadel-tools/citadel-tools_0.1.0.bb | 18 +- .../images/citadel-initramfs-image.bb | 1 - ...el_5.10.11.bb => citadel-kernel_5.12.1.bb} | 2 +- .../citadel-kernel/files/defconfig | 260 ++++++++++++------ ...ryptsetup_2.3.4.bb => cryptsetup_2.3.5.bb} | 6 +- .../files/fix_library_install_path.patch | 28 ++ .../keyutils-use-relative-path-for-link.patch | 28 -- .../{keyutils_1.5.10.bb => keyutils_1.6.1.bb} | 34 ++- ...ibblockdev_2.24.bb => libblockdev_2.25.bb} | 3 +- .../recipes-support/libgit2/libgit2_0.27.4.bb | 24 -- .../libseccomp/files/run-ptest | 4 + .../libseccomp/libseccomp_2.3.3.bb | 12 - .../libseccomp/libseccomp_2.5.1.bb | 54 ++++ .../recipes-support/libssh2/libssh2_1.8.0.bb | 26 -- ...per_2.03.06.bb => libdevmapper_2.03.11.bb} | 0 meta-citadel/recipes-support/lvm2/lvm2.inc | 9 +- ...led-No-medium-found-will-print-out-i.patch | 32 --- ...findmnt-bin-lsblk-bin-sort-not-found.patch | 20 +- .../lvm2/{lvm2_2.03.06.bb => lvm2_2.03.11.bb} | 1 - .../nano/{nano_3.0.bb => nano_5.6.bb} | 7 +- .../nspr/{nspr_4.26.bb => nspr_4.29.bb} | 4 +- ...figure-option-to-disable-ARM-HW-cryp.patch | 36 ++- ...ix-Do-not-use-NULL-where-0-is-needed.patch | 46 ---- .../nss/nss/nss-fix-nsinstall-build.patch | 2 +- .../nss/{nss_3.56.bb => nss_3.64.bb} | 26 +- .../udisks/udisks2/non-gnu-libc.patch | 26 -- .../{udisks2_git.bb => udisks2_2.9.2.bb} | 15 +- .../wireguard-tools_0.0.20180708.bb | 34 --- .../wireguard-tools_1.0.20200319.bb | 27 -- .../wireguard-tools/wireguard.inc | 16 -- .../wireguard-module_1.0.20210219.bb | 34 +++ .../wireguard-tools_1.0.20210315.bb} | 15 +- .../wireguard.inc} | 6 +- .../gtk-layer-shell/gtk-layer-shell_0.5.1.bb | 1 + .../recipes-sway/wdisplays/wdisplays_git.bb | 2 +- meta-clang | 2 +- meta-gnome/conf/layer.conf | 2 +- ...001-Remove-config-dir-from-unit-file.patch | 21 -- ...p_srcdir-instead-of-abs_srcdir-for-e.patch | 35 +++ .../iwd/iwd/0002-arc4-implementation.patch | 147 ---------- .../iwd/{iwd_1.7.bb => iwd_1.13.bb} | 11 +- ...10.bb => networkmanager-openvpn_1.8.14.bb} | 19 +- ...e.ac-Fix-pkgconfig-sysroot-locations.patch | 22 ++ ...to-build-in-cross-compile-environmen.patch | 40 --- ...ttings-settings-property-documentati.patch | 59 ++++ ...d-to-var-libdir-rather-than-hardcod-.patch | 30 ++ ...Fix-build-with-musl-systemd-specific.patch | 154 +++++++++++ ...Fix-build-with-musl-systemd-specific.patch | 26 ++ .../networkmanager/networkmanager_1.26.4.bb | 143 ---------- .../networkmanager/networkmanager_1.30.2.bb | 181 ++++++++++++ meta-gnome/recipes-devtools/meson/meson.inc | 33 --- .../0001-Make-CPU-family-warnings-fatal.patch | 41 --- ...g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch | 37 --- ...sues-that-arise-when-cross-compiling.patch | 36 --- ...y-do-not-substitute-python-s-install.patch | 45 --- ...-not-manipulate-the-environment-when.patch | 43 --- ...pport-building-allarch-recipes-again.patch | 26 -- .../meson/meson/0003-native_bindir.patch | 125 --------- .../meson/meson/cross-prop-default.patch | 23 -- .../meson/meson/disable-rpath-handling.patch | 35 --- .../meson/meson/meson-setup.py | 31 --- .../meson/meson/meson-wrapper | 14 - .../recipes-devtools/meson/meson_0.55.1.bb | 4 - .../meson/nativesdk-meson_0.55.1.bb | 65 ----- .../yasm/0001-Do-not-use-AC_HEADER_STDC.patch | 39 +++ meta-gnome/recipes-devtools/yasm/yasm_git.bb | 4 +- ...n-cd_icc_create_from_edid-to-avoid-u.patch | 17 +- .../recipes-freedesktop/colord/colord.inc | 6 +- .../geoclue/geoclue_2.4.7.bb | 22 -- .../geoclue/geoclue_2.5.7.bb | 47 ++++ ...o-systemd-tty-ask-password-agent-con.patch | 34 +++ .../{plymouth_0.9.5.bb => plymouth.bb} | 54 ++-- .../polkit/polkit_0.118.bb | 2 +- .../upower/upower_0.99.10.bb | 21 -- .../upower/upower_0.99.11.bb | 35 +++ .../{dconf_0.38.0.bb => dconf_0.40.0.bb} | 4 +- .../gdm/{gdm_3.38.0.bb => gdm_40.0.bb} | 10 +- .../geocode-glib/geocode-glib_3.26.0.bb | 21 -- .../geocode-glib/geocode-glib_3.26.2.bb | 20 ++ .../recipes-gnome/gexiv2/gexiv2_0.12.0.bb | 12 - .../recipes-gnome/gexiv2/gexiv2_0.12.1.bb | 19 ++ .../gjs/{gjs_1.66.0.bb => gjs_1.68.0.bb} | 8 +- ...t-write-bindir-into-pkg-config-files.patch | 4 +- ...-gio-querymodules-as-libexec_PROGRAM.patch | 2 +- ...-correctly-when-building-with-mingw3.patch | 22 +- ...degen.py-bump-timeout-to-100-seconds.patch | 26 ++ ...on-Run-atomics-test-on-clang-as-well.patch | 2 +- ...ble-more-tests-while-cross-compiling.patch | 20 +- .../glib-2.0/glib-2.0/relocate-modules.patch | 14 +- ...{glib-2.0_2.66.1.bb => glib-2.0_2.68.0.bb} | 13 +- meta-gnome/recipes-gnome/glib-2.0/glib.inc | 6 +- .../gnome-autoar/gnome-autoar_0.2.4.bb | 19 -- .../gnome-autoar/gnome-autoar_0.3.1.bb | 17 ++ ...ds_3.38.0.bb => gnome-backgrounds_40.0.bb} | 13 +- .../gnome-bluetooth/gnome-bluetooth_3.34.3.bb | 2 +- ...s-for-Citadel-and-disabling-GOA-CUPS.patch | 12 +- ...3.38.3.bb => gnome-control-center_40.0.bb} | 7 +- ...esktop_3.38.3.bb => gnome-desktop_40.0.bb} | 9 +- ...y_3.38.0.bb => gnome-disk-utility_40.1.bb} | 8 +- .../gnome-keyring/gnome-keyring_3.36.0.bb | 46 ---- ...hot_3.38.0.bb => gnome-screenshot_40.0.bb} | 12 +- ...sion_3.38.0.bb => gnome-session_40.1.1.bb} | 8 +- ...8.0.bb => gnome-settings-daemon_40.0.1.bb} | 21 +- ...001-Remove-calendar-server-fix-build.patch | 2 +- ...me-shell_3.38.3.bb => gnome-shell_40.0.bb} | 18 +- ...3.38.0.bb => gnome-system-monitor_40.1.bb} | 9 +- ...nal_3.38.0.bb => gnome-terminal_3.40.1.bb} | 6 +- ...0.bb => gsettings-desktop-schemas_40.0.bb} | 9 +- meta-gnome/recipes-gnome/gtk+/gtk+3.inc | 160 ----------- .../recipes-gnome/gtk+/gtk+3_3.24.20.bb | 20 -- meta-gnome/recipes-gnome/gtk4/gtk4.inc | 75 +++++ .../gtk4}/0001-Hardcoded-libtool.patch | 0 ...t-try-to-initialize-GL-without-libGL.patch | 0 ...-Add-disable-opengl-configure-option.patch | 0 .../gtk+3 => gtk4/gtk4}/link_fribidi.patch | 0 .../gtk+3 => gtk4/gtk4}/sort-resources.patch | 0 meta-gnome/recipes-gnome/gtk4/gtk4_4.1.2.bb | 15 + .../recipes-gnome/libgee/libgee_0.20.3.bb | 16 -- .../recipes-gnome/libgee/libgee_0.20.4.bb | 22 ++ .../libgweather/libgweather_3.36.1.bb | 20 -- .../libgweather/libgweather_40.0.bb | 45 +++ .../recipes-gnome/libhandy/libhandy_1.0.0.bb | 13 - .../{mutter_3.38.3.bb => mutter_40.0.bb} | 16 +- .../network-manager-applet_1.18.0.bb | 29 ++ .../network-manager-applet_1.8.24.bb | 16 -- .../yelp-tools/yelp-tools_3.28.0.bb | 15 - .../recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb | 15 - .../recipes-gnome/yelp/yelp-tools_3.32.2.bb | 21 ++ .../recipes-gnome/yelp/yelp-xsl_3.36.0.bb | 21 ++ meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb | 35 +++ .../ell/0001-pem.c-do-not-use-rawmemchr.patch | 27 ++ meta-gnome/recipes-support/ell/ell_0.39.bb | 24 ++ .../gsound/gsound/0001-Set-vapidir.patch | 28 ++ .../recipes-support/gsound/gsound_1.0.2.bb | 14 +- .../recipes-support/ibus/ibus-native.bb | 34 +++ meta-gnome/recipes-support/ibus/ibus.bb | 37 +++ meta-gnome/recipes-support/ibus/ibus.inc | 36 +++ ...start-dbus-we-do-not-have-dbus-lauch.patch | 34 +++ .../ibus/0001-strip-out-dbus-build-dep.patch | 36 --- ...0002-decorate-automake-for-valaflags.patch | 55 ---- .../0003-use-wayland-display-on-wayland.patch | 62 ----- .../recipes-support/ibus/ibus_1.5.22.bb | 47 ---- .../recipes-support/libnma/libnma_1.8.30.bb | 27 ++ .../0005-Remove-Abort-Panic-Strategy.patch | 20 ++ .../recipes-support/mozjs78/mozjs78_78.0.1.bb | 17 +- .../unicode-ucd/files/license.html | 98 +++++++ .../unicode-ucd/unicode-ucd_12.1.0.bb | 7 +- ...EXITCODE-macro-for-non-glibc-systems.patch | 42 +++ .../vte/vte_0.64.0.bb} | 19 +- .../xserver-xorg-cvt-native_1.20.5.bb | 2 +- meta-intel | 2 +- meta-rust | 2 +- poky | 2 +- 187 files changed, 2148 insertions(+), 2342 deletions(-) delete mode 100644 meta-citadel/recipes-citadel/bbappends/gcc-cross_9.%.bbappend create mode 100644 meta-citadel/recipes-citadel/bbappends/geoclue_%.bbappend rename meta-citadel/recipes-citadel/bbappends/{libxcb_1.13.1.bbappend => libxcb_1.14.bbappend} (100%) delete mode 100644 meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend rename {meta-gnome/recipes-connectivity/networkmanager/files => meta-citadel/recipes-citadel/bbappends/networkmanager}/NetworkManager.conf (100%) rename {meta-gnome/recipes-connectivity/networkmanager/files => meta-citadel/recipes-citadel/bbappends/networkmanager}/watch-resolvconf.path (76%) rename {meta-gnome/recipes-connectivity/networkmanager/files => meta-citadel/recipes-citadel/bbappends/networkmanager}/watch-resolvconf.service (100%) delete mode 100644 meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-fix-ucs2-lookup.patch delete mode 100644 meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-workaround-array-tostring-removal.patch delete mode 100644 meta-citadel/recipes-citadel/bbappends/ovmf_%.bbappend create mode 100644 meta-citadel/recipes-citadel/bbappends/plymouth.bbappend rename meta-citadel/recipes-citadel/bbappends/{pulseaudio_13.%.bbappend => pulseaudio_14.%.bbappend} (100%) create mode 100644 meta-citadel/recipes-citadel/citadel-config/files/pulse/cookie delete mode 100644 meta-citadel/recipes-citadel/citadel-config/files/udev/scsi-alpm.rules rename meta-citadel/recipes-kernel/citadel-kernel/{citadel-kernel_5.10.11.bb => citadel-kernel_5.12.1.bb} (93%) rename meta-citadel/recipes-support/cryptsetup/{cryptsetup_2.3.4.bb => cryptsetup_2.3.5.bb} (95%) create mode 100644 meta-citadel/recipes-support/keyutils/files/fix_library_install_path.patch delete mode 100644 meta-citadel/recipes-support/keyutils/files/keyutils-use-relative-path-for-link.patch rename meta-citadel/recipes-support/keyutils/{keyutils_1.5.10.bb => keyutils_1.6.1.bb} (58%) rename meta-citadel/recipes-support/libblockdev/{libblockdev_2.24.bb => libblockdev_2.25.bb} (97%) delete mode 100644 meta-citadel/recipes-support/libgit2/libgit2_0.27.4.bb create mode 100644 meta-citadel/recipes-support/libseccomp/files/run-ptest delete mode 100644 meta-citadel/recipes-support/libseccomp/libseccomp_2.3.3.bb create mode 100644 meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb delete mode 100644 meta-citadel/recipes-support/libssh2/libssh2_1.8.0.bb rename meta-citadel/recipes-support/lvm2/{libdevmapper_2.03.06.bb => libdevmapper_2.03.11.bb} (100%) delete mode 100644 meta-citadel/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch rename meta-citadel/recipes-support/lvm2/{lvm2_2.03.06.bb => lvm2_2.03.11.bb} (97%) rename meta-citadel/recipes-support/nano/{nano_3.0.bb => nano_5.6.bb} (79%) rename meta-citadel/recipes-support/nspr/{nspr_4.26.bb => nspr_4.29.bb} (97%) delete mode 100644 meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch rename meta-citadel/recipes-support/nss/{nss_3.56.bb => nss_3.64.bb} (90%) delete mode 100644 meta-citadel/recipes-support/udisks/udisks2/non-gnu-libc.patch rename meta-citadel/recipes-support/udisks/{udisks2_git.bb => udisks2_2.9.2.bb} (80%) delete mode 100644 meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb delete mode 100644 meta-citadel/recipes-support/wireguard-tools/wireguard-tools_1.0.20200319.bb delete mode 100644 meta-citadel/recipes-support/wireguard-tools/wireguard.inc create mode 100644 meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb rename meta-citadel/recipes-support/{wireguard-tools/wireguard-tools_0.0.20191219.bb => wireguard/wireguard-tools_1.0.20210315.bb} (62%) rename meta-citadel/recipes-support/{wireguard-tools/wireguard-tools.inc => wireguard/wireguard.inc} (68%) delete mode 100644 meta-gnome/recipes-connectivity/iwd/iwd/0001-Remove-config-dir-from-unit-file.patch create mode 100644 meta-gnome/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch delete mode 100644 meta-gnome/recipes-connectivity/iwd/iwd/0002-arc4-implementation.patch rename meta-gnome/recipes-connectivity/iwd/{iwd_1.7.bb => iwd_1.13.bb} (84%) rename meta-gnome/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.2.10.bb => networkmanager-openvpn_1.8.14.bb} (55%) create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb create mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb delete mode 100644 meta-gnome/recipes-devtools/meson/meson.inc delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch delete mode 100644 meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch delete mode 100755 meta-gnome/recipes-devtools/meson/meson/meson-setup.py delete mode 100755 meta-gnome/recipes-devtools/meson/meson/meson-wrapper delete mode 100644 meta-gnome/recipes-devtools/meson/meson_0.55.1.bb delete mode 100644 meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb create mode 100644 meta-gnome/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch delete mode 100644 meta-gnome/recipes-freedesktop/geoclue/geoclue_2.4.7.bb create mode 100644 meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb create mode 100644 meta-gnome/recipes-freedesktop/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch rename meta-gnome/recipes-freedesktop/plymouth/{plymouth_0.9.5.bb => plymouth.bb} (51%) delete mode 100644 meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb create mode 100644 meta-gnome/recipes-freedesktop/upower/upower_0.99.11.bb rename meta-gnome/recipes-gnome/dconf/{dconf_0.38.0.bb => dconf_0.40.0.bb} (76%) rename meta-gnome/recipes-gnome/gdm/{gdm_3.38.0.bb => gdm_40.0.bb} (82%) delete mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb delete mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb rename meta-gnome/recipes-gnome/gjs/{gjs_1.66.0.bb => gjs_1.68.0.bb} (68%) create mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch rename meta-gnome/recipes-gnome/glib-2.0/{glib-2.0_2.66.1.bb => glib-2.0_2.68.0.bb} (73%) delete mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb create mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb rename meta-gnome/recipes-gnome/gnome-backgrounds/{gnome-backgrounds_3.38.0.bb => gnome-backgrounds_40.0.bb} (51%) rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_3.38.3.bb => gnome-control-center_40.0.bb} (88%) rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop_3.38.3.bb => gnome-desktop_40.0.bb} (74%) rename meta-gnome/recipes-gnome/gnome-disk-utility/{gnome-disk-utility_3.38.0.bb => gnome-disk-utility_40.1.bb} (72%) delete mode 100644 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb rename meta-gnome/recipes-gnome/gnome-screenshot/{gnome-screenshot_3.38.0.bb => gnome-screenshot_40.0.bb} (52%) rename meta-gnome/recipes-gnome/gnome-session/{gnome-session_3.38.0.bb => gnome-session_40.1.1.bb} (78%) rename meta-gnome/recipes-gnome/gnome-settings-daemon/{gnome-settings-daemon_3.38.0.bb => gnome-settings-daemon_40.0.1.bb} (70%) rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_3.38.3.bb => gnome-shell_40.0.bb} (88%) rename meta-gnome/recipes-gnome/gnome-system-monitor/{gnome-system-monitor_3.38.0.bb => gnome-system-monitor_40.1.bb} (69%) rename meta-gnome/recipes-gnome/gnome-terminal/{gnome-terminal_3.38.0.bb => gnome-terminal_3.40.1.bb} (73%) rename meta-gnome/recipes-gnome/gsettings-desktop-schema/{gsettings-desktop-schemas_3.38.0.bb => gsettings-desktop-schemas_40.0.bb} (78%) delete mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+3.inc delete mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.20.bb create mode 100644 meta-gnome/recipes-gnome/gtk4/gtk4.inc rename meta-gnome/recipes-gnome/{gtk+/gtk+3 => gtk4/gtk4}/0001-Hardcoded-libtool.patch (100%) rename meta-gnome/recipes-gnome/{gtk+/gtk+3 => gtk4/gtk4}/0002-Do-not-try-to-initialize-GL-without-libGL.patch (100%) rename meta-gnome/recipes-gnome/{gtk+/gtk+3 => gtk4/gtk4}/0003-Add-disable-opengl-configure-option.patch (100%) rename meta-gnome/recipes-gnome/{gtk+/gtk+3 => gtk4/gtk4}/link_fribidi.patch (100%) rename meta-gnome/recipes-gnome/{gtk+/gtk+3 => gtk4/gtk4}/sort-resources.patch (100%) create mode 100644 meta-gnome/recipes-gnome/gtk4/gtk4_4.1.2.bb delete mode 100644 meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb create mode 100644 meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb delete mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb create mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb delete mode 100644 meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb rename meta-gnome/recipes-gnome/mutter/{mutter_3.38.3.bb => mutter_40.0.bb} (87%) create mode 100644 meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.18.0.bb delete mode 100644 meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.24.bb delete mode 100644 meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb delete mode 100644 meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb create mode 100644 meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb create mode 100644 meta-gnome/recipes-support/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch create mode 100644 meta-gnome/recipes-support/ell/ell_0.39.bb create mode 100644 meta-gnome/recipes-support/gsound/gsound/0001-Set-vapidir.patch create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch delete mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch delete mode 100644 meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch delete mode 100644 meta-gnome/recipes-support/ibus/ibus/0003-use-wayland-display-on-wayland.patch delete mode 100644 meta-gnome/recipes-support/ibus/ibus_1.5.22.bb create mode 100644 meta-gnome/recipes-support/libnma/libnma_1.8.30.bb create mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0005-Remove-Abort-Panic-Strategy.patch create mode 100644 meta-gnome/recipes-support/unicode-ucd/files/license.html create mode 100644 meta-gnome/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch rename meta-gnome/{recipes-gnome/vte/vte_0.62.0.bb => recipes-support/vte/vte_0.64.0.bb} (70%) diff --git a/meta-citadel/conf/distro/citadel-distro.conf b/meta-citadel/conf/distro/citadel-distro.conf index 9bb6831..24a0eb3 100644 --- a/meta-citadel/conf/distro/citadel-distro.conf +++ b/meta-citadel/conf/distro/citadel-distro.conf @@ -2,7 +2,7 @@ DISTRO = "citadel-distro" DISTRO_NAME = "Subgraph OS Citadel" DISTRO_VERSION = "1.0" -CITADEL_DEFAULT_DISTRO_FEATURES = "acl alsa argp bluetooth ext2 largefile systemd usbhost wifi xattr pci x11 usrmerge wayland opengl pam" +CITADEL_DEFAULT_DISTRO_FEATURES = "acl alsa argp bluetooth ext2 largefile systemd usbhost wifi xattr pci x11 usrmerge wayland opengl pam polkit seccomp" DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${CITADEL_DEFAULT_DISTRO_FEATURES}" @@ -37,6 +37,8 @@ BUILD_REPRODUCIBLE_BINARIES = "1" INHERIT += "reproducible_build" +PREFERRED_RPROVIDER_libdevmapper-native = "libdevmapper-native" + # Override meta-rust dependencies. # # Instead of bringing in all of openembedded, we imported the two recipes @@ -48,4 +50,5 @@ INHERIT += "reproducible_build" LAYERDEPENDS_rust-layer = "core" require conf/distro/include/security_flags.inc +require conf/distro/include/rust_versions.inc diff --git a/meta-citadel/conf/layer.conf b/meta-citadel/conf/layer.conf index 904b0b6..b4ba1d4 100644 --- a/meta-citadel/conf/layer.conf +++ b/meta-citadel/conf/layer.conf @@ -15,7 +15,7 @@ BBFILE_COLLECTIONS += "citadel" BBFILE_PATTERN_citadel = "^${LAYERDIR}/" BBFILE_PRIORITY_citadel = "5" -LAYERSERIES_COMPAT_citadel = "dunfell" +LAYERSERIES_COMPAT_citadel = "hardknott" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-citadel/recipes-citadel/bbappends/gcc-cross_9.%.bbappend b/meta-citadel/recipes-citadel/bbappends/gcc-cross_9.%.bbappend deleted file mode 100644 index c378e79..0000000 --- a/meta-citadel/recipes-citadel/bbappends/gcc-cross_9.%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ - -# headers needed to compile gcc plugins, needed for grsec gcc plugins during kernel build -do_install_append () { - cp ${S}/include/libiberty.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/mem-stats-traits.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/hash-traits.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/hash-map-traits.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/mem-stats.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/memory-block.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/config/i386/linux64.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/config/i386 - cp ${S}/gcc/brig-builtins.def ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/expr.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/tree-vrp.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/builtins.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/backend.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/poly-int.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/poly-int-types.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - cp ${S}/gcc/wide-int-bitmask.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/ - -} diff --git a/meta-citadel/recipes-citadel/bbappends/geoclue_%.bbappend b/meta-citadel/recipes-citadel/bbappends/geoclue_%.bbappend new file mode 100644 index 0000000..6f57541 --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/geoclue_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG = "lib" diff --git a/meta-citadel/recipes-citadel/bbappends/iptables/iptables.rules b/meta-citadel/recipes-citadel/bbappends/iptables/iptables.rules index 15af1b8..8b2b035 100644 --- a/meta-citadel/recipes-citadel/bbappends/iptables/iptables.rules +++ b/meta-citadel/recipes-citadel/bbappends/iptables/iptables.rules @@ -4,5 +4,6 @@ :OUTPUT DROP [0:0] -A INPUT -m state --state ESTABLISHED -j ACCEPT -A OUTPUT -p udp -m udp --sport 68 --dport 67 -j ACCEPT +-A OUTPUT -p udp -m owner --uid-owner 996 -j ACCEPT -A OUTPUT -j LOG --log-uid --log-prefix 'iptables' COMMIT diff --git a/meta-citadel/recipes-citadel/bbappends/libbytesize_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libbytesize_%.bbappend index 340ba2b..6019e0c 100644 --- a/meta-citadel/recipes-citadel/bbappends/libbytesize_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/libbytesize_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG = "" +#PACKAGECONFIG = "" diff --git a/meta-citadel/recipes-citadel/bbappends/libxcb_1.13.1.bbappend b/meta-citadel/recipes-citadel/bbappends/libxcb_1.14.bbappend similarity index 100% rename from meta-citadel/recipes-citadel/bbappends/libxcb_1.13.1.bbappend rename to meta-citadel/recipes-citadel/bbappends/libxcb_1.14.bbappend diff --git a/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend b/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend index a76b75c..825cf96 100644 --- a/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend @@ -1,7 +1,2 @@ -PACKAGECONFIG = "odirect udev" - # files/lvm.conf is customized to prevent writing to /etc FILESEXTRAPATHS_prepend := "${THISDIR}/lvm2:" - - -#FILES_${PN}-dev += "${libdir}/liblvm2cmd.so*" diff --git a/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend b/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend deleted file mode 100644 index d04c6af..0000000 --- a/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append = " gallium " diff --git a/meta-gnome/recipes-connectivity/networkmanager/files/NetworkManager.conf b/meta-citadel/recipes-citadel/bbappends/networkmanager/NetworkManager.conf similarity index 100% rename from meta-gnome/recipes-connectivity/networkmanager/files/NetworkManager.conf rename to meta-citadel/recipes-citadel/bbappends/networkmanager/NetworkManager.conf diff --git a/meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.path b/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path similarity index 76% rename from meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.path rename to meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path index 4f7fbaf..09bdb8f 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.path +++ b/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path @@ -2,7 +2,6 @@ Description=Watch /run/NetworkManager [Path] -PathExists=/run/NetworkManager/resolv.conf PathChanged=/run/NetworkManager MakeDirectory=true diff --git a/meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.service b/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service similarity index 100% rename from meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.service rename to meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service diff --git a/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend b/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend index b718d74..34d127f 100644 --- a/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend @@ -1,6 +1,8 @@ # Append recipe from meta-openembedded/meta-networking +FILESEXTRAPATHS_prepend := "${THISDIR}/networkmanager:" SRC_URI += "\ + file://NetworkManager.conf \ file://watch-resolvconf.path \ file://watch-resolvconf.service \ " @@ -8,6 +10,14 @@ SRC_URI += "\ SYSTEMD_SERVICE_${PN} += "watch-resolvconf.path" do_install_append() { + install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/ install -m 644 ${WORKDIR}/watch-resolvconf.path ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/watch-resolvconf.service ${D}${systemd_system_unitdir} } +PACKAGECONFIG = "nss systemd polkit" +PACKAGECONFIG[wifi] = "" +EXTRA_OECONF = "\ + --with-iwd \ + --enable-wifi=yes \ + --without-iptables \ +" diff --git a/meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-fix-ucs2-lookup.patch b/meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-fix-ucs2-lookup.patch deleted file mode 100644 index 7478894..0000000 --- a/meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-fix-ucs2-lookup.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 64a1a0c2b29860e9e2d5afdbcb2336f38fba5909 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Tue, 4 Aug 2020 17:04:50 -0400 -Subject: [PATCH] BaseTools: fix ucs-2 lookup on python 3.9 - -python3.9 changed/fixed codec.register behavior to always replace -hyphen with underscore for passed in codec names: - - https://bugs.python.org/issue37751 - -So the custom Ucs2Search needs to be adapted to handle 'ucs_2' in -addition to existing 'ucs-2' for back compat. - -This fixes test failures on python3.9, example: - -====================================================================== -FAIL: testUtf16InUniFile (CheckUnicodeSourceFiles.Tests) ----------------------------------------------------------------------- -Traceback (most recent call last): - File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 375, in PreProcess - FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path)) - File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 303, in OpenUniFile - UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding) - File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 312, in VerifyUcs2Data - Ucs2Info = codecs.lookup('ucs-2') -LookupError: unknown encoding: ucs-2 - -Signed-off-by: Cole Robinson ---- - BaseTools/Source/Python/AutoGen/UniClassObject.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py -index b2895f7e5c6..883c2356e0c 100644 ---- a/BaseTools/Source/Python/AutoGen/UniClassObject.py -+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py -@@ -152,7 +152,7 @@ def encode(self, input, errors='strict'): - - TheUcs2Codec = Ucs2Codec() - def Ucs2Search(name): -- if name == 'ucs-2': -+ if name in ['ucs-2', 'ucs_2']: - return codecs.CodecInfo( - name=name, - encode=TheUcs2Codec.encode, - diff --git a/meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-workaround-array-tostring-removal.patch b/meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-workaround-array-tostring-removal.patch deleted file mode 100644 index bc821ad..0000000 --- a/meta-citadel/recipes-citadel/bbappends/ovmf/python3.9-workaround-array-tostring-removal.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 43bec9ea3d56f3662ede78023baa2a791b66acac Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Wed, 12 Aug 2020 01:28:18 +0800 -Subject: [PATCH] BaseTools: Work around array.array.tostring() removal in - python 3.9 - -In python3, array.array.tostring() was a compat alias for tobytes(). -tostring() was removed in python 3.9. - -Convert this to use tolist() which should be valid for all python -versions. - -This fixes this build error on python3.9: - -(Python 3.9.0b5 on linux) Traceback (most recent call last): - File "/root/edk2/edk2-edk2-stable202002/BaseTools/BinWrappers/PosixLike/../../Source/Python/Trim/Trim.py", line 593, in Main - GenerateVfrBinSec(CommandOptions.ModuleName, CommandOptions.DebugDir, CommandOptions.OutputFile) - File "/root/edk2/edk2-edk2-stable202002/BaseTools/BinWrappers/PosixLike/../../Source/Python/Trim/Trim.py", line 449, in GenerateVfrBinSec - VfrUniOffsetList = GetVariableOffset(MapFileName, EfiFileName, VfrNameList) - File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 88, in GetVariableOffset - return _parseForGCC(lines, efifilepath, varnames) - File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 151, in _parseForGCC - efisecs = PeImageClass(efifilepath).SectionHeaderList - File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 1638, in __init__ - if ByteArray.tostring() != b'PE\0\0': -AttributeError: 'array.array' object has no attribute 'tostring' - -Signed-off-by: Cole Robinson -Reviewed-by: Yuwei Chen -Reviewed-by: Bob Feng ---- - BaseTools/Source/Python/Common/Misc.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py -index ad556710802..4be7957138a 100755 ---- a/BaseTools/Source/Python/Common/Misc.py -+++ b/BaseTools/Source/Python/Common/Misc.py -@@ -1635,7 +1635,7 @@ def __init__(self, PeFile): - ByteArray = array.array('B') - ByteArray.fromfile(PeObject, 4) - # PE signature should be 'PE\0\0' -- if ByteArray.tostring() != b'PE\0\0': -+ if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]: - self.ErrorInfo = self.FileName + ' has no valid PE signature PE00' - return - diff --git a/meta-citadel/recipes-citadel/bbappends/ovmf_%.bbappend b/meta-citadel/recipes-citadel/bbappends/ovmf_%.bbappend deleted file mode 100644 index 67f80b8..0000000 --- a/meta-citadel/recipes-citadel/bbappends/ovmf_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ - -FILESEXTRAPATHS_prepend := "${THISDIR}/ovmf:" - -# Fixes build failure when host Python updated to 3.9 - -SRC_URI += "\ - file://python3.9-fix-ucs2-lookup.patch \ - file://python3.9-workaround-array-tostring-removal.patch \ -" diff --git a/meta-citadel/recipes-citadel/bbappends/plymouth.bbappend b/meta-citadel/recipes-citadel/bbappends/plymouth.bbappend new file mode 100644 index 0000000..eac3502 --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/plymouth.bbappend @@ -0,0 +1,2 @@ +PACKAGECONFIG = "pango drm" + diff --git a/meta-citadel/recipes-citadel/bbappends/pulseaudio_13.%.bbappend b/meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend similarity index 100% rename from meta-citadel/recipes-citadel/bbappends/pulseaudio_13.%.bbappend rename to meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend diff --git a/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend b/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend index a4b2fca..02274c6 100644 --- a/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend @@ -1,4 +1,4 @@ -CONFFILES_${PN} += "${sysconfdir}/machine-id" +FILES_${PN} += "${sysconfdir}/machine-id" do_install_append() { install -d ${D}${sysconfdir} diff --git a/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend b/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend index cf40709..cc388ec 100644 --- a/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend @@ -6,7 +6,7 @@ RDEPENDS_${PN}_remove = "update-rc.d" ALTERNATIVE_${PN}_remove = "resolv-conf" -GROUPADD_PARAM_${PN} += "; -r kvm" +GROUPADD_PARAM_${PN} += "-r wheel; -r kvm; -r render" PACKAGECONFIG = "\ efi acl ldconfig pam usrmerge rfkill backlight binfmt hostnamed localed logind machined myhostname \ nss polkit randomseed seccomp timedated utmp timesyncd kmod sysusers gshadow cryptsetup \ diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb index fcde21f..df6d398 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb @@ -26,12 +26,11 @@ do_compile() { do_install() { install -d ${D}${datadir}/glib-2.0/schemas install -d ${D}${sysconfdir}/skel/.config/dconf - install -m 0755 -d ${D}${datadir}/factory/skel - install -m 0755 -d ${D}${datadir}/factory/skel/.config/dconf + install -m 0755 -d ${D}${datadir}/factory/storage/citadel-state/citadel-dconf install -m 644 ${S}/gsettings/90_citadel.gschema.override ${D}${datadir}/glib-2.0/schemas install -m 644 ${WORKDIR}/dconf-output/user ${D}${sysconfdir}/skel/.config/dconf - install -m 644 ${WORKDIR}/dconf-output/citadel ${D}${datadir}/factory/skel/.config/dconf/user + install -m 644 ${WORKDIR}/dconf-output/citadel ${D}${datadir}/factory/storage/citadel-state/citadel-dconf/user } FILES_${PN} = "/" diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb index 6d2fdda..366bcca 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb @@ -25,7 +25,6 @@ SYSCTL_CONFIG = "\ UDEV_RULES = "\ file://udev/citadel-network.rules \ file://udev/pci-pm.rules \ - file://udev/scsi-alpm.rules \ " DEFAULT_PASSWORD = "\ file://citadel-setpassword.sh \ @@ -60,6 +59,7 @@ SRC_URI = "\ file://apt-cacher-ng/acng.conf \ file://apt-cacher-ng/security.conf \ file://iwd/main.conf \ + file://pulse/cookie \ ${DEFAULT_REALM_UNITS} \ ${MODPROBE_CONFIG} \ ${SYSCTL_CONFIG} \ @@ -89,12 +89,14 @@ do_install() { install -m 0755 -d ${D}${sysconfdir}/skel/.config/nvim install -m 0755 -d ${D}${sysconfdir}/tmpfiles.d install -m 0755 -d ${D}${sysconfdir}/udev/rules.d -# install -m 0755 -d ${D}${sysconfdir}/NetworkManager install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d install -m 0755 -d ${D}${sysconfdir}/modprobe.d install -m 0755 -d ${D}${sysconfdir}/sudoers.d install -m 0755 -d ${D}${sysconfdir}/iwd - install -m 0755 -d ${D}${datadir}/factory/skel + install -m 0755 -d ${D}${datadir}/factory/home/root + install -m 0755 -d ${D}${datadir}/factory/home/citadel + install -m 0755 -d ${D}${datadir}/factory/home/citadel/.local/share/applications + install -m 0755 -d ${D}${datadir}/factory/home/citadel/.config/pulse install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager/system-connections install -m 0755 -d ${D}${datadir}/citadel @@ -141,16 +143,28 @@ do_install() { install -m 0755 ${WORKDIR}/citadel-ifconfig.sh ${D}${libexecdir} install -m 0644 ${WORKDIR}/udev/pci-pm.rules ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/udev/scsi-alpm.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/citadel-installer.session ${D}${datadir}/gnome-session/sessions/ install -m 0644 ${WORKDIR}/citadel-installer.json ${D}${datadir}/gnome-shell/modes/ install -m 0644 ${WORKDIR}/citadel-installer-ui.desktop ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/citadel-installer.desktop ${D}${datadir}/wayland-sessions/ - install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${datadir}/factory/skel/.bashrc - install -m 0644 ${WORKDIR}/share/dot.profile ${D}${datadir}/factory/skel/.profile - install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${datadir}/factory/skel/.vimrc + install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${datadir}/factory/home/root/.bashrc + install -m 0644 ${WORKDIR}/share/dot.profile ${D}${datadir}/factory/home/root/.profile + install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${datadir}/factory/home/root/.vimrc + + install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${datadir}/factory/home/citadel/.bashrc + install -m 0644 ${WORKDIR}/share/dot.profile ${D}${datadir}/factory/home/citadel/.profile + install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${datadir}/factory/home/citadel/.vimrc + + + # To avoid these warnings: + # + # [pulseaudio] authkey.c: Failed to open cookie file '/home/citadel/.config/pulse/cookie': No such file or directory + # + + install -m 0600 ${WORKDIR}/pulse/cookie ${D}${datadir}/factory/home/citadel/.config/pulse/cookie + install -m 0644 ${WORKDIR}/polkit/citadel.rules ${D}${sysconfdir}/polkit-1/rules.d/ diff --git a/meta-citadel/recipes-citadel/citadel-config/files/00-storage-tmpfiles.conf b/meta-citadel/recipes-citadel/citadel-config/files/00-storage-tmpfiles.conf index 92a55d2..61d8174 100644 --- a/meta-citadel/recipes-citadel/citadel-config/files/00-storage-tmpfiles.conf +++ b/meta-citadel/recipes-citadel/citadel-config/files/00-storage-tmpfiles.conf @@ -1,19 +1,14 @@ -C /var/cache - - - - -C /var/lib/AccountsService - - - - -C /var/lib/NetworkManager - - - - -C /var/lib/colord - - - - -C /var/lib/dbus - - - - -C /var/lib/dhcp - - - - -C /var/lib/gdm - - - - -C /var/lib/plymouth - - - - -C /var/lib/upower - - - - -C /var/log - - - - -C /var/spool - - - - -C /home - - - - -C /home/citadel - - - - -C /home/root - - - - -d /storage/citadel-state/citadel-dconf 0755 citadel citadel -d /home/citadel/.config 0755 citadel citadel -L /home/citadel/.config/dconf - - - - /storage/citadel-state/citadel-dconf -f /storage/citadel-state/resolv.conf 0644 root root +C /var/lib/AccountsService +C /var/lib/NetworkManager +C /var/lib/plymouth +C /var/lib/upower + +d /storage/citadel-state 0755 root root +f /storage/citadel-state/resolv.conf 0644 root root +C /storage/citadel-state/citadel-dconf +Z /storage/citadel-state/citadel-dconf - citadel citadel + +C /home +L /home/citadel/.config/dconf - - - - /storage/citadel-state/citadel-dconf +Z /home/citadel - citadel citadel diff --git a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override index 9396949..96cf8be 100644 --- a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override +++ b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override @@ -3,7 +3,7 @@ natural-scroll=true tap-to-click=true [org.gnome.desktop.background] -picture-uri='file:///usr/share/backgrounds/gnome/Icetwigs.jpg' +picture-uri='file:///usr/share/backgrounds/gnome/Loveles.jpg' [org.gnome.desktop.screensaver] picture-uri='file:////usr/share/gnome-control-center/pixmaps/noise-texture-light.png' @@ -41,7 +41,6 @@ antialiasing='rgba' [org.gnome.settings-daemon.plugins.power] sleep-inactive-ac-timeout=0 - [org.gnome.desktop.input-sources] xkb-options=['ctrl:nocaps'] diff --git a/meta-citadel/recipes-citadel/citadel-config/files/iwd/main.conf b/meta-citadel/recipes-citadel/citadel-config/files/iwd/main.conf index b47186d..e69de29 100644 --- a/meta-citadel/recipes-citadel/citadel-config/files/iwd/main.conf +++ b/meta-citadel/recipes-citadel/citadel-config/files/iwd/main.conf @@ -1,5 +0,0 @@ -# -# Only needed until this is fixed: https://lkml.org/lkml/2020/10/14/1101 -# -[General] -ControlPortOverNL80211=False diff --git a/meta-citadel/recipes-citadel/citadel-config/files/pulse/cookie b/meta-citadel/recipes-citadel/citadel-config/files/pulse/cookie new file mode 100644 index 0000000000000000000000000000000000000000..69624f4eba40a683084aaac5bef1ca55a05a2468 GIT binary patch literal 256 zcmV+b0ssEL$LGhkBWQ2x-Q)K`I=imXWxnto<{#LZi#?yZ4&BN7>_?mIrtsK9IDV+n zaZCv5LJ5oVT-J>LsL-jCF#y9w-f^O%uqY)c@pfsMV_BmVuT5|Du~DiDX3hoVu1Hbs z1}& ${IMAGE_ROOTFS}/syslinux/syslinux.cfg for m in ${SYSLINUX_MODULES}; do - install ${RECIPE_SYSROOT_NATIVE}/usr/share/syslinux/$m ${IMAGE_ROOTFS}/syslinux + install ${RECIPE_SYSROOT}/usr/share/syslinux/$m ${IMAGE_ROOTFS}/syslinux done } @@ -170,7 +170,7 @@ write_installer_image() { bbdebug 1 dd if=${BOOT_IMAGE} of=${INSTALLER_IMAGE} seek=${offset} count=${BOOT_IMAGE_SECTORS} conv=sparse,nocreat,notrunc dd if=${BOOT_IMAGE} of=${INSTALLER_IMAGE} seek=${offset} count=${BOOT_IMAGE_SECTORS} conv=sparse,nocreat,notrunc - dd bs=440 count=1 conv=notrunc if=${RECIPE_SYSROOT_NATIVE}/usr/share/syslinux/mbr.bin of=${INSTALLER_IMAGE} + dd bs=440 count=1 conv=notrunc if=${RECIPE_SYSROOT}/usr/share/syslinux/mbr.bin of=${INSTALLER_IMAGE} parted -s ${INSTALLER_IMAGE} unit s print } diff --git a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb index ffe2327..84525f8 100644 --- a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb +++ b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb @@ -32,10 +32,6 @@ set_disable_root_password() { setup_var() { install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/var - install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/home - - install -m 0755 -d ${IMAGE_ROOTFS}/home/citadel/.local/share/applications - chown -R 1000:1000 ${IMAGE_ROOTFS}/home/citadel/.local rmdir ${IMAGE_ROOTFS}/var/log/journal @@ -46,12 +42,6 @@ setup_var() { mv ${IMAGE_ROOTFS}/var/run ${IMAGE_ROOTFS}/usr/share/factory/var mv ${IMAGE_ROOTFS}/var/lock ${IMAGE_ROOTFS}/usr/share/factory/var - cp -r ${IMAGE_ROOTFS}/usr/share/factory/skel/.??* ${IMAGE_ROOTFS}/home/citadel - cp -r ${IMAGE_ROOTFS}/usr/share/factory/skel/.??* ${IMAGE_ROOTFS}/home/root - mv ${IMAGE_ROOTFS}/home/citadel ${IMAGE_ROOTFS}/usr/share/factory/home - mv ${IMAGE_ROOTFS}/home/root ${IMAGE_ROOTFS}/usr/share/factory/home - - ln -sf /opt/share/icons/Paper ${IMAGE_ROOTFS}/usr/share/icons/Paper ln -sf /opt/share/icons/Adwaita ${IMAGE_ROOTFS}/usr/share/icons/Adwaita ln -sf /opt/share/backgrounds/gnome ${IMAGE_ROOTFS}/usr/share/backgrounds/gnome diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb index 690ea30..c0c86a0 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb @@ -18,7 +18,6 @@ RDEPENDS_${PN} = "\ mutter \ gjs \ gvfs \ - gnome-keyring \ gnome-session \ gnome-shell \ hicolor-icon-theme \ diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb index 8875fab..67c1580 100644 --- a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb +++ b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb @@ -7,7 +7,7 @@ inherit cargo systemd # # Update this when changes are pushed to github # -SRCREV = "ee7d0ef16655fbd518f84e220b081d9f4e86da85" +SRCREV = "f665490a4d8bce26c2b70fba94731c60c581ddbd" GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https" @@ -227,26 +227,26 @@ do_install() { install -d ${D}${systemd_system_unitdir} # Services desktop sync - install -m 644 ${B}/systemd/citadel-desktop-watcher.path ${D}${systemd_system_unitdir} - install -m 644 ${B}/systemd/citadel-desktop-watcher.service ${D}${systemd_system_unitdir} - install -m 644 ${B}/systemd/citadel-current-watcher.path ${D}${systemd_system_unitdir} - install -m 644 ${B}/systemd/citadel-current-watcher.service ${D}${systemd_system_unitdir} + install -m 644 ${S}/systemd/citadel-desktop-watcher.path ${D}${systemd_system_unitdir} + install -m 644 ${S}/systemd/citadel-desktop-watcher.service ${D}${systemd_system_unitdir} + install -m 644 ${S}/systemd/citadel-current-watcher.path ${D}${systemd_system_unitdir} + install -m 644 ${S}/systemd/citadel-current-watcher.service ${D}${systemd_system_unitdir} # Unit to run: citadel-boot boot-automount - install -m 644 ${B}/systemd/citadel-boot-automount.service ${D}${systemd_system_unitdir} + install -m 644 ${S}/systemd/citadel-boot-automount.service ${D}${systemd_system_unitdir} # realmsd - install -m 644 ${B}/data/citadel-realmsd.service ${D}${systemd_system_unitdir} + install -m 644 ${S}/data/citadel-realmsd.service ${D}${systemd_system_unitdir} install -m 755 -T ${TARGET_BIN}/realmsd ${D}${libexecdir}/citadel-realmsd install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 644 ${B}/data/com.subgraph.realms.Manager.conf ${D}${sysconfdir}/dbus-1/system.d + install -m 644 ${S}/data/com.subgraph.realms.Manager.conf ${D}${sysconfdir}/dbus-1/system.d # citadel-realms-ui install -m 755 ${TARGET_BIN}/citadel-realms-ui ${D}${libexecdir} # citadel-installer-ui install -m 755 ${TARGET_BIN}/citadel-installer-ui ${D}${libexecdir} - install -m 644 ${B}/data/com.subgraph.installer.Manager.conf ${D}${sysconfdir}/dbus-1/system.d + install -m 644 ${S}/data/com.subgraph.installer.Manager.conf ${D}${sysconfdir}/dbus-1/system.d # /usr/libexec/citadel-tool install -m 755 ${TARGET_BIN}/citadel-tool ${D}${libexecdir} diff --git a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb index bc67b99..35d5950 100644 --- a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb +++ b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb @@ -76,7 +76,6 @@ PACKAGE_INSTALL = "\ kernel-module-hid-sensor-hub \ kernel-module-hid-speedlink \ kernel-module-hid-uclogic \ - kernel-module-i2c-hid \ kernel-module-intel-hid \ kernel-module-intel-ish-ipc \ kernel-module-intel-ishtp \ diff --git a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.10.11.bb b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.12.1.bb similarity index 93% rename from meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.10.11.bb rename to meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.12.1.bb index 99420e0..a38bdb8 100644 --- a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.10.11.bb +++ b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.12.1.bb @@ -9,7 +9,7 @@ SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz\ file://defconfig \ " -SRC_URI[sha256sum] = "02ef2b56b00fc5145701c603a5235e1265772e40d488a936b27ba65fe78e710f" +SRC_URI[sha256sum] = "c0fc1cf5b8c90cde68d7d4361afd3b37422c0b590773ea67861b8b092efe5f37" LINUX_VERSION ?= "${PV}" S = "${WORKDIR}/linux-${LINUX_VERSION}" diff --git a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig index f82fc3f..d3f6cc9 100644 --- a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig +++ b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.11 Kernel Configuration +# Linux/x86 5.12.1 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Debian 9.3.0-20) 9.3.0" +CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90300 -CONFIG_LD_VERSION=235010000 +CONFIG_GCC_VERSION=100201 CONFIG_CLANG_VERSION=0 +CONFIG_LD_IS_BFD=y +CONFIG_LD_VERSION=23502 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -102,6 +103,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y CONFIG_PREEMPTION=y +CONFIG_PREEMPT_DYNAMIC=y # # CPU/Task time and stats accounting @@ -180,7 +182,7 @@ CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y -# CONFIG_CGROUP_BPF is not set +CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_DEBUG is not set CONFIG_SOCK_CGROUP_DATA=y CONFIG_NAMESPACES=y @@ -240,9 +242,11 @@ CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_BPF_SYSCALL=y CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y +CONFIG_USERMODE_DRIVER=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set @@ -258,7 +262,6 @@ CONFIG_PERF_EVENTS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y -# CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -301,7 +304,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_64_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -360,7 +362,7 @@ CONFIG_X86_VMX_FEATURE_NAMES=y CONFIG_PROCESSOR_SELECT=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_HYGON=y +# CONFIG_CPU_SUP_HYGON is not set # CONFIG_CPU_SUP_CENTAUR is not set # CONFIG_CPU_SUP_ZHAOXIN is not set CONFIG_HPET_TIMER=y @@ -384,7 +386,6 @@ CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MCE_INJECT=m -CONFIG_X86_THERMAL_VECTOR=y # # Performance monitoring @@ -434,6 +435,7 @@ CONFIG_X86_UMIP=y CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +# CONFIG_X86_SGX is not set CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set @@ -502,6 +504,7 @@ CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y +# CONFIG_ACPI_FPDT is not set CONFIG_ACPI_LPIT=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set @@ -522,6 +525,7 @@ CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=y CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_PLATFORM_PROFILE=m CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y # CONFIG_ACPI_TABLE_UPGRADE is not set # CONFIG_ACPI_DEBUG is not set @@ -547,7 +551,6 @@ CONFIG_ACPI_APEI=y # CONFIG_ACPI_CONFIGFS is not set # CONFIG_PMIC_OPREGION is not set CONFIG_X86_PM_TIMER=y -# CONFIG_SFI is not set # # CPU Frequency scaling @@ -680,6 +683,7 @@ CONFIG_KVM=y CONFIG_KVM_WERROR=y CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m +# CONFIG_KVM_XEN is not set # CONFIG_KVM_MMU_AUDIT is not set CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y @@ -691,9 +695,6 @@ CONFIG_AS_TPAUSE=y # CONFIG_HOTPLUG_SMT=y CONFIG_GENERIC_ENTRY=y -# CONFIG_OPROFILE is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set @@ -742,14 +743,20 @@ CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y +CONFIG_LTO_NONE=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y CONFIG_HAVE_MOVE_PMD=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y @@ -758,6 +765,8 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y @@ -777,7 +786,10 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y +CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_HAS_ELFCORE_COMPAT=y # # GCOV-based kernel profiling @@ -809,7 +821,6 @@ CONFIG_MODULE_SIG_SHA1=y CONFIG_MODULE_SIG_HASH="sha1" # CONFIG_MODULE_COMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set -# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -948,9 +959,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_ARCH_HAS_PTE_DEVMAP=y CONFIG_HMM_MIRROR=y CONFIG_VMAP_PFN=y -CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set +# CONFIG_GUP_TEST is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y @@ -1257,7 +1267,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=y CONFIG_BRIDGE_EBT_SNAT=y CONFIG_BRIDGE_EBT_LOG=y CONFIG_BRIDGE_EBT_NFLOG=y -# CONFIG_BPFILTER is not set +CONFIG_BPFILTER=y +CONFIG_BPFILTER_UMH=m # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set @@ -1268,6 +1279,7 @@ CONFIG_STP=y CONFIG_BRIDGE=y # CONFIG_BRIDGE_IGMP_SNOOPING is not set # CONFIG_BRIDGE_MRP is not set +# CONFIG_BRIDGE_CFM is not set CONFIG_HAVE_NET_DSA=y # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set @@ -1300,12 +1312,14 @@ CONFIG_NET_SWITCHDEV=y # CONFIG_NET_NCSI is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y +CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_XPS=y # CONFIG_CGROUP_NET_PRIO is not set CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y # CONFIG_BPF_JIT is not set +# CONFIG_BPF_STREAM_PARSER is not set CONFIG_NET_FLOW_LIMIT=y # @@ -1387,7 +1401,6 @@ CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_WIMAX is not set CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y @@ -1427,7 +1440,6 @@ CONFIG_PCIEASPM_POWERSAVE=y # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y # CONFIG_PCIE_PTM is not set -# CONFIG_PCIE_BW is not set CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_QUIRKS=y @@ -1487,12 +1499,14 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_PCI_SW_SWITCHTEC is not set # end of PCI switch controller drivers +# CONFIG_CXL_BUS is not set # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set # # Generic Driver Options # +CONFIG_AUXILIARY_BUS=y # CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y @@ -1553,6 +1567,12 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=y +CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_842 is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" # CONFIG_ZRAM_WRITEBACK is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_BLK_DEV_UMEM is not set @@ -1561,7 +1581,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=4 # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m -# CONFIG_BLK_DEV_SKD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set @@ -1589,8 +1608,7 @@ CONFIG_BLK_DEV_NVME=y # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set # CONFIG_PHANTOM is not set -CONFIG_TIFM_CORE=m -# CONFIG_TIFM_7XX1 is not set +# CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HP_ILO is not set @@ -1641,6 +1659,7 @@ CONFIG_INTEL_MEI_HDCP=m # CONFIG_VMWARE_VMCI is not set # CONFIG_GENWQE is not set # CONFIG_ECHO is not set +# CONFIG_BCM_VK is not set # CONFIG_MISC_ALCOR_PCI is not set # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set @@ -1724,7 +1743,6 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128 # CONFIG_SCSI_SNIC is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FDOMAIN_PCI is not set -# CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set @@ -1920,6 +1938,7 @@ CONFIG_VIRTIO_NET=y # # Distributed Switch Architecture drivers # +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set # end of Distributed Switch Architecture drivers CONFIG_ETHERNET=y @@ -1944,7 +1963,6 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m -# CONFIG_NET_VENDOR_AURORA is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2024,6 +2042,7 @@ CONFIG_MLX5_MPFS=y CONFIG_MLX5_ESWITCH=y # CONFIG_MLX5_CORE_IPOIB is not set CONFIG_MLX5_SW_STEERING=y +# CONFIG_MLX5_SF is not set # CONFIG_MLXSW_CORE is not set # CONFIG_MLXFW is not set # CONFIG_NET_VENDOR_MICREL is not set @@ -2075,6 +2094,7 @@ CONFIG_NET_VENDOR_SOCIONEXT=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_NET_VENDOR_XILINX=y +# CONFIG_XILINX_EMACLITE is not set # CONFIG_XILINX_AXI_EMAC is not set # CONFIG_XILINX_LL_TEMAC is not set # CONFIG_FDDI is not set @@ -2186,8 +2206,8 @@ CONFIG_USB_NET_RNDIS_HOST=m # CONFIG_USB_VL600 is not set # CONFIG_USB_NET_CH9200 is not set # CONFIG_USB_NET_AQC111 is not set +# CONFIG_USB_RTL8153_ECM is not set CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set # CONFIG_WLAN_VENDOR_ADMTEK is not set CONFIG_ATH_COMMON=m CONFIG_WLAN_VENDOR_ATH=y @@ -2308,10 +2328,6 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y # CONFIG_MAC80211_HWSIM is not set CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_VIRT_WIFI is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# # CONFIG_WAN is not set # CONFIG_VMXNET3 is not set # CONFIG_FUJITSU_ES is not set @@ -2326,7 +2342,6 @@ CONFIG_NET_FAILOVER=y CONFIG_INPUT=y # CONFIG_INPUT_LEDS is not set CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m @@ -2511,6 +2526,7 @@ CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_DA7280_HAPTICS is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set @@ -2602,9 +2618,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_FSL_LPUART is not set @@ -2656,6 +2672,7 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_TCG_TIS_CORE=m CONFIG_TCG_TIS=m # CONFIG_TCG_TIS_SPI is not set +# CONFIG_TCG_TIS_I2C_CR50 is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set # CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_NUVOTON is not set @@ -2842,6 +2859,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set # CONFIG_PTP_1588_CLOCK_VMW is not set +# CONFIG_PTP_1588_CLOCK_OCP is not set # end of PTP clock support CONFIG_PINCTRL=y @@ -2856,14 +2874,17 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_LYNXPOINT is not set CONFIG_PINCTRL_INTEL=y +# CONFIG_PINCTRL_ALDERLAKE is not set CONFIG_PINCTRL_BROXTON=m # CONFIG_PINCTRL_CANNONLAKE is not set # CONFIG_PINCTRL_CEDARFORK is not set # CONFIG_PINCTRL_DENVERTON is not set +# CONFIG_PINCTRL_ELKHARTLAKE is not set # CONFIG_PINCTRL_EMMITSBURG is not set # CONFIG_PINCTRL_GEMINILAKE is not set # CONFIG_PINCTRL_ICELAKE is not set # CONFIG_PINCTRL_JASPERLAKE is not set +# CONFIG_PINCTRL_LAKEFIELD is not set # CONFIG_PINCTRL_LEWISBURG is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_TIGERLAKE is not set @@ -2892,7 +2913,6 @@ CONFIG_GPIO_CDEV_V1=y CONFIG_GPIO_ICH=m # CONFIG_GPIO_MB86S7X is not set # CONFIG_GPIO_VX855 is not set -# CONFIG_GPIO_XILINX is not set CONFIG_GPIO_AMD_FCH=m # end of Memory mapped GPIO drivers @@ -2951,8 +2971,13 @@ CONFIG_GPIO_AMD_FCH=m # # end of USB GPIO expanders +# +# Virtual GPIO drivers +# # CONFIG_GPIO_AGGREGATOR is not set # CONFIG_GPIO_MOCKUP is not set +# end of Virtual GPIO drivers + # CONFIG_W1 is not set # CONFIG_POWER_RESET is not set CONFIG_POWER_SUPPLY=y @@ -2976,6 +3001,7 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set CONFIG_CHARGER_LT3651=m +# CONFIG_CHARGER_LTC4162L is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_BQ24257 is not set @@ -2983,6 +3009,7 @@ CONFIG_CHARGER_LT3651=m # CONFIG_CHARGER_BQ2515X is not set # CONFIG_CHARGER_BQ25890 is not set # CONFIG_CHARGER_BQ25980 is not set +# CONFIG_CHARGER_BQ256XX is not set # CONFIG_CHARGER_SMB347 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_CHARGER_RT9455 is not set @@ -3011,6 +3038,7 @@ CONFIG_SENSORS_AD7314=m # CONFIG_SENSORS_ADT7462 is not set # CONFIG_SENSORS_ADT7470 is not set # CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AHT10 is not set # CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set @@ -3023,6 +3051,7 @@ CONFIG_SENSORS_APPLESMC=m # CONFIG_SENSORS_ASPEED is not set # CONFIG_SENSORS_ATXP1 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set +# CONFIG_SENSORS_CORSAIR_PSU is not set CONFIG_SENSORS_DRIVETEMP=m # CONFIG_SENSORS_DS620 is not set # CONFIG_SENSORS_DS1621 is not set @@ -3050,6 +3079,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_LTC2947_I2C is not set # CONFIG_SENSORS_LTC2947_SPI is not set # CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2992 is not set # CONFIG_SENSORS_LTC4151 is not set # CONFIG_SENSORS_LTC4215 is not set # CONFIG_SENSORS_LTC4222 is not set @@ -3057,6 +3087,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_LTC4260 is not set # CONFIG_SENSORS_LTC4261 is not set # CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX127 is not set # CONFIG_SENSORS_MAX16065 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX1668 is not set @@ -3071,6 +3102,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_MAX31790 is not set # CONFIG_SENSORS_MCP3021 is not set # CONFIG_SENSORS_TC654 is not set +# CONFIG_SENSORS_TPS23861 is not set # CONFIG_SENSORS_MR75203 is not set # CONFIG_SENSORS_ADCXX is not set # CONFIG_SENSORS_LM63 is not set @@ -3098,6 +3130,7 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SHT21 is not set # CONFIG_SENSORS_SHT3x is not set @@ -3168,6 +3201,7 @@ CONFIG_THERMAL_EMULATION=y # Intel thermal drivers # CONFIG_INTEL_POWERCLAMP=y +CONFIG_X86_THERMAL_VECTOR=y CONFIG_X86_PKG_TEMP_THERMAL=y CONFIG_INTEL_SOC_DTS_IOSF_CORE=m CONFIG_INTEL_SOC_DTS_THERMAL=m @@ -3178,7 +3212,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INT340X_THERMAL=m CONFIG_ACPI_THERMAL_REL=m CONFIG_INT3406_THERMAL=m -CONFIG_PROC_THERMAL_MMIO_RAPL=y +CONFIG_PROC_THERMAL_MMIO_RAPL=m # end of ACPI INT340X thermal drivers CONFIG_INTEL_PCH_THERMAL=m @@ -3244,6 +3278,7 @@ CONFIG_MFD_INTEL_LPSS=y CONFIG_MFD_INTEL_LPSS_ACPI=y CONFIG_MFD_INTEL_LPSS_PCI=y # CONFIG_MFD_INTEL_PMC_BXT is not set +CONFIG_MFD_INTEL_PMT=y # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set @@ -3591,12 +3626,14 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_IMX290 is not set # CONFIG_VIDEO_IMX319 is not set # CONFIG_VIDEO_IMX355 is not set +# CONFIG_VIDEO_OV02A10 is not set # CONFIG_VIDEO_OV2640 is not set # CONFIG_VIDEO_OV2659 is not set # CONFIG_VIDEO_OV2680 is not set # CONFIG_VIDEO_OV2685 is not set # CONFIG_VIDEO_OV2740 is not set # CONFIG_VIDEO_OV5647 is not set +# CONFIG_VIDEO_OV5648 is not set # CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV5670 is not set # CONFIG_VIDEO_OV5675 is not set @@ -3607,8 +3644,10 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_OV7740 is not set # CONFIG_VIDEO_OV8856 is not set +# CONFIG_VIDEO_OV8865 is not set # CONFIG_VIDEO_OV9640 is not set # CONFIG_VIDEO_OV9650 is not set +# CONFIG_VIDEO_OV9734 is not set # CONFIG_VIDEO_OV13858 is not set # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_MT9M001 is not set @@ -3624,12 +3663,13 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_NOON010PC30 is not set # CONFIG_VIDEO_M5MOLS is not set # CONFIG_VIDEO_RDACM20 is not set +# CONFIG_VIDEO_RDACM21 is not set # CONFIG_VIDEO_RJ54N1 is not set # CONFIG_VIDEO_S5K6AA is not set # CONFIG_VIDEO_S5K6A3 is not set # CONFIG_VIDEO_S5K4ECGX is not set # CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_SMIAPP is not set +# CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_S5C73M3 is not set # end of Camera sensor devices @@ -3819,6 +3859,7 @@ CONFIG_MEDIA_TUNER_MC44S803=m # CONFIG_DVB_AU8522_DTV is not set # CONFIG_DVB_AU8522_V4L is not set # CONFIG_DVB_S5H1411 is not set +# CONFIG_DVB_MXL692 is not set # # ISDB-T (terrestrial) frontends @@ -3902,7 +3943,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=y -CONFIG_DRM_TTM_DMA_PAGE_POOL=y CONFIG_DRM_VRAM_HELPER=y CONFIG_DRM_TTM_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y @@ -3941,7 +3981,6 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y -# CONFIG_DRM_AMD_DC_DCN3_0 is not set # CONFIG_DRM_AMD_DC_HDCP is not set # CONFIG_DRM_AMD_DC_SI is not set # end of Display Engine Configuration @@ -4280,6 +4319,8 @@ CONFIG_SND_HDA_EXT_CORE=m CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_INTEL_NHLT=y CONFIG_SND_INTEL_DSP_CONFIG=m +CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m +# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set # CONFIG_SND_SPI is not set CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m @@ -4300,6 +4341,7 @@ CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y CONFIG_SND_SOC_ACPI=m +# CONFIG_SND_SOC_ADI is not set # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_RENOIR is not set @@ -4321,6 +4363,7 @@ CONFIG_SND_SOC_ACPI=m # CONFIG_SND_SOC_FSL_SPDIF is not set # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_FSL_XCVR is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -4379,34 +4422,41 @@ CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m # CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set +# CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH is not set +# CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set +# CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set +# CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH is not set # CONFIG_SND_SOC_MTK_BTCVSD is not set CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_PCI_DEV=m CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_ACPI=m +CONFIG_SND_SOC_SOF_ACPI_DEV=m # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y -CONFIG_SND_SOC_SOF_INTEL_ACPI=m -CONFIG_SND_SOC_SOF_INTEL_PCI=m +CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m +CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m CONFIG_SND_SOC_SOF_INTEL_COMMON=m -# CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT is not set -# CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT is not set -CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_BAYTRAIL=m +CONFIG_SND_SOC_SOF_BROADWELL=m +# CONFIG_SND_SOC_SOF_MERRIFIELD is not set +CONFIG_SND_SOC_SOF_INTEL_APL=m CONFIG_SND_SOC_SOF_APOLLOLAKE=m -CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y CONFIG_SND_SOC_SOF_GEMINILAKE=m -CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_INTEL_CNL=m CONFIG_SND_SOC_SOF_CANNONLAKE=m -CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y CONFIG_SND_SOC_SOF_COFFEELAKE=m -CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_COMETLAKE=m +CONFIG_SND_SOC_SOF_INTEL_ICL=m CONFIG_SND_SOC_SOF_ICELAKE=m -# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set -# CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT is not set -# CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT is not set -# CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT is not set +CONFIG_SND_SOC_SOF_JASPERLAKE=m +CONFIG_SND_SOC_SOF_INTEL_TGL=m +CONFIG_SND_SOC_SOF_TIGERLAKE=m +CONFIG_SND_SOC_SOF_ELKHARTLAKE=m +CONFIG_SND_SOC_SOF_ALDERLAKE=m CONFIG_SND_SOC_SOF_HDA_COMMON=m CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y @@ -4425,13 +4475,14 @@ CONFIG_SND_SOC_SOF_XTENSA=m # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set # CONFIG_SND_SOC_XILINX_SPDIF is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set -# CONFIG_ZX_TDM is not set CONFIG_SND_SOC_I2C_AND_SPI=m # # CODEC drivers # CONFIG_SND_SOC_AC97_CODEC=m +# CONFIG_SND_SOC_ADAU1372_I2C is not set +# CONFIG_SND_SOC_ADAU1372_SPI is not set # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU1761_I2C is not set # CONFIG_SND_SOC_ADAU1761_SPI is not set @@ -4504,6 +4555,7 @@ CONFIG_SND_SOC_MAX98390=m # CONFIG_SND_SOC_PCM3060_SPI is not set # CONFIG_SND_SOC_PCM3168A_I2C is not set # CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM5102A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set # CONFIG_SND_SOC_RK3328 is not set @@ -4516,12 +4568,13 @@ CONFIG_SND_SOC_RT298=m CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5651=m +# CONFIG_SND_SOC_RT5659 is not set CONFIG_SND_SOC_RT5670=m CONFIG_SND_SOC_RT5677=m CONFIG_SND_SOC_RT5677_SPI=m # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +# CONFIG_SND_SOC_SIMPLE_MUX is not set CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set # CONFIG_SND_SOC_SSM2602_SPI is not set @@ -4580,12 +4633,17 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_MT6351 is not set # CONFIG_SND_SOC_MT6358 is not set # CONFIG_SND_SOC_MT6660 is not set +# CONFIG_SND_SOC_NAU8315 is not set # CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_NAU8822 is not set # CONFIG_SND_SOC_NAU8824 is not set CONFIG_SND_SOC_NAU8825=m # CONFIG_SND_SOC_TPA6130A2 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_SOC_LPASS_RX_MACRO is not set +# CONFIG_SND_SOC_LPASS_TX_MACRO is not set # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -4675,6 +4733,7 @@ CONFIG_HID_PENMOUNT=m # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set CONFIG_HID_PLANTRONICS=m +# CONFIG_HID_PLAYSTATION is not set CONFIG_HID_PRIMAX=m # CONFIG_HID_RETRODE is not set CONFIG_HID_ROCCAT=m @@ -4716,7 +4775,7 @@ CONFIG_USB_HIDDEV=y # # I2C HID support # -CONFIG_I2C_HID=m +# CONFIG_I2C_HID_ACPI is not set # end of I2C HID support # @@ -4725,6 +4784,12 @@ CONFIG_I2C_HID=m CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m # end of Intel ISH HID support + +# +# AMD SFH HID Support +# +# CONFIG_AMD_SFH_HID is not set +# end of AMD SFH HID Support # end of HID support CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -4816,7 +4881,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USBIP_CORE is not set -# CONFIG_USB_CDNS3 is not set +# CONFIG_USB_CDNS_SUPPORT is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set # CONFIG_USB_DWC2 is not set @@ -4870,7 +4935,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_SYMBOL is not set # CONFIG_USB_SERIAL_TI is not set # CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set # CONFIG_USB_SERIAL_OPTION is not set # CONFIG_USB_SERIAL_OMNINET is not set # CONFIG_USB_SERIAL_OPTICON is not set @@ -4879,6 +4943,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_SSU100 is not set # CONFIG_USB_SERIAL_QT2 is not set # CONFIG_USB_SERIAL_UPD78F0730 is not set +# CONFIG_USB_SERIAL_XR is not set # CONFIG_USB_SERIAL_DEBUG is not set # @@ -4992,6 +5057,10 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_NIC78BX is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# +# Flash and Torch LED drivers +# + # # LED Triggers # @@ -5015,6 +5084,12 @@ CONFIG_LEDS_TRIGGERS=y # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set CONFIG_LEDS_TRIGGER_AUDIO=m +# CONFIG_LEDS_TRIGGER_TTY is not set + +# +# LED Blink +# +# CONFIG_LEDS_BLINK is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y @@ -5081,7 +5156,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_MAX6916 is not set # CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RX4581 is not set -# CONFIG_RTC_DRV_RX6110 is not set # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_MAX6902 is not set # CONFIG_RTC_DRV_PCF2123 is not set @@ -5094,6 +5168,7 @@ CONFIG_RTC_I2C_AND_SPI=y # CONFIG_RTC_DRV_DS3232 is not set # CONFIG_RTC_DRV_PCF2127 is not set # CONFIG_RTC_DRV_RV3029C2 is not set +# CONFIG_RTC_DRV_RX6110 is not set # # Platform RTC drivers @@ -5147,6 +5222,7 @@ CONFIG_DW_DMAC_PCI=y # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set # CONFIG_SF_PDMA is not set +# CONFIG_INTEL_LDMA is not set # # DMA Clients @@ -5161,6 +5237,7 @@ CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set # end of DMABUF options @@ -5180,6 +5257,7 @@ CONFIG_UIO_PCI_GENERIC=m CONFIG_IRQ_BYPASS_MANAGER=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y # CONFIG_VIRTIO_PCI_LEGACY is not set @@ -5305,11 +5383,11 @@ CONFIG_STAGING_MEDIA=y # CONFIG_FIELDBUS_DEV is not set # CONFIG_KPC2000 is not set # CONFIG_QLGE is not set +# CONFIG_WIMAX is not set # CONFIG_WFX is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACPI_WMI=m CONFIG_WMI_BMOF=m -CONFIG_ALIENWARE_WMI=m # CONFIG_HUAWEI_WMI is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set # CONFIG_INTEL_WMI_THUNDERBOLT is not set @@ -5319,6 +5397,7 @@ CONFIG_MXM_WMI=m CONFIG_ACERHDF=m # CONFIG_ACER_WIRELESS is not set CONFIG_ACER_WMI=m +# CONFIG_AMD_PMC is not set CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_WIRELESS=m @@ -5326,18 +5405,21 @@ CONFIG_ASUS_WMI=m CONFIG_ASUS_NB_WMI=m # CONFIG_EEEPC_LAPTOP is not set # CONFIG_EEEPC_WMI is not set +CONFIG_X86_PLATFORM_DRIVERS_DELL=y +CONFIG_ALIENWARE_WMI=m CONFIG_DCDBAS=m +CONFIG_DELL_LAPTOP=m +# CONFIG_DELL_RBU is not set +CONFIG_DELL_RBTN=m CONFIG_DELL_SMBIOS=m CONFIG_DELL_SMBIOS_WMI=y CONFIG_DELL_SMBIOS_SMM=y -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_RBTN=m -# CONFIG_DELL_RBU is not set CONFIG_DELL_SMO8800=m CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_DESCRIPTOR=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_WMI_DESCRIPTOR=m # CONFIG_DELL_WMI_LED is not set +# CONFIG_DELL_WMI_SYSMAN is not set # CONFIG_AMILO_RFKILL is not set CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_TABLET is not set @@ -5361,9 +5443,6 @@ CONFIG_INTEL_HID_EVENT=m # CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_OAKTRAIL is not set # CONFIG_INTEL_VBTN is not set -# CONFIG_SURFACE3_WMI is not set -# CONFIG_SURFACE_3_POWER_OPREGION is not set -CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_MSI_LAPTOP=m CONFIG_MSI_WMI=m # CONFIG_PCENGINES_APU2 is not set @@ -5396,6 +5475,8 @@ CONFIG_INTEL_SMARTCONNECT=y # CONFIG_INTEL_TURBO_MAX_3 is not set # CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set CONFIG_INTEL_PMC_CORE=y +# CONFIG_INTEL_PMT_TELEMETRY is not set +# CONFIG_INTEL_PMT_CRASHLOG is not set CONFIG_INTEL_PUNIT_IPC=m # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set @@ -5413,6 +5494,12 @@ CONFIG_CROS_EC_PROTO=y CONFIG_CROS_KBD_LED_BACKLIGHT=m # CONFIG_WILCO_EC is not set # CONFIG_MELLANOX_PLATFORM is not set +CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE3_WMI is not set +# CONFIG_SURFACE_3_POWER_OPREGION is not set +# CONFIG_SURFACE_GPE is not set +# CONFIG_SURFACE_HOTPLUG is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y @@ -5424,6 +5511,7 @@ CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_XILINX_VCU is not set # CONFIG_HWSPINLOCK is not set # @@ -5444,6 +5532,7 @@ CONFIG_IOMMU_SUPPORT=y # # Generic IOMMU Pagetable Support # +CONFIG_IOMMU_IO_PGTABLE=y # end of Generic IOMMU Pagetable Support # CONFIG_IOMMU_DEBUGFS is not set @@ -5483,11 +5572,6 @@ CONFIG_IRQ_REMAP=y # # end of Amlogic SoC drivers -# -# Aspeed SoC drivers -# -# end of Aspeed SoC drivers - # # Broadcom SoC drivers # @@ -5503,6 +5587,11 @@ CONFIG_IRQ_REMAP=y # # end of i.MX SoC drivers +# +# Enable LiteX SoC Builder specific drivers +# +# end of Enable LiteX SoC Builder specific drivers + # # Qualcomm SoC drivers # @@ -5513,7 +5602,6 @@ CONFIG_IRQ_REMAP=y # # Xilinx SoC drivers # -# CONFIG_XILINX_VCU is not set # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers @@ -5547,6 +5635,7 @@ CONFIG_EXTCON=y # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set # CONFIG_EXTCON_USBC_CROS_EC is not set +# CONFIG_EXTCON_USBC_TUSB320 is not set # CONFIG_MEMORY is not set CONFIG_IIO=m CONFIG_IIO_BUFFER=y @@ -5621,7 +5710,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7949 is not set # CONFIG_AD799X is not set # CONFIG_AD9467 is not set -# CONFIG_ADI_AXI_ADC is not set # CONFIG_HI8435 is not set # CONFIG_HX711 is not set # CONFIG_INA2XX_ADC is not set @@ -5710,6 +5798,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_AD5758 is not set # CONFIG_AD5761 is not set # CONFIG_AD5764 is not set +# CONFIG_AD5766 is not set # CONFIG_AD5770R is not set # CONFIG_AD5791 is not set # CONFIG_AD7303 is not set @@ -5881,6 +5970,7 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m # CONFIG_SENSORS_HMC5843_SPI is not set # CONFIG_SENSORS_RM3100_I2C is not set # CONFIG_SENSORS_RM3100_SPI is not set +# CONFIG_YAMAHA_YAS530 is not set # end of Magnetometer sensors # @@ -5905,6 +5995,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m # # Linear and angular position sensors # +# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # end of Linear and angular position sensors # @@ -6000,6 +6091,7 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set # CONFIG_PWM_CRC is not set # CONFIG_PWM_CROS_EC is not set +# CONFIG_PWM_DWC is not set CONFIG_PWM_LPSS=m CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m @@ -6029,6 +6121,7 @@ CONFIG_POWERCAP=y CONFIG_INTEL_RAPL_CORE=y CONFIG_INTEL_RAPL=y # CONFIG_IDLE_INJECT is not set +# CONFIG_DTPM is not set # CONFIG_MCB is not set # @@ -6057,6 +6150,7 @@ CONFIG_DAX=y CONFIG_DEV_DAX=m CONFIG_NVMEM=y # CONFIG_NVMEM_SYSFS is not set +# CONFIG_NVMEM_RMEM is not set # # HW tracing support @@ -6102,7 +6196,7 @@ CONFIG_FS_MBCACHE=y # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set CONFIG_BTRFS_FS=y -# CONFIG_BTRFS_FS_POSIX_ACL is not set +CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set @@ -6216,6 +6310,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_PSTORE=y +CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 CONFIG_PSTORE_DEFLATE_COMPRESS=y # CONFIG_PSTORE_LZO_COMPRESS is not set # CONFIG_PSTORE_LZ4_COMPRESS is not set @@ -6307,7 +6402,7 @@ CONFIG_KEYS=y # CONFIG_BIG_KEYS is not set # CONFIG_TRUSTED_KEYS is not set CONFIG_ENCRYPTED_KEYS=y -# CONFIG_KEY_DH_OPERATIONS is not set +CONFIG_KEY_DH_OPERATIONS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y @@ -6385,7 +6480,6 @@ CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_GLUE_HELPER_X86=y CONFIG_CRYPTO_ENGINE=m # @@ -6456,10 +6550,7 @@ CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m @@ -6469,7 +6560,6 @@ CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_STREEBOG is not set -CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m @@ -6496,7 +6586,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_SEED=m @@ -6571,6 +6660,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set # CONFIG_CRYPTO_DEV_QAT_C3XXX is not set # CONFIG_CRYPTO_DEV_QAT_C62X is not set +# CONFIG_CRYPTO_DEV_QAT_4XXX is not set # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set @@ -6672,6 +6762,7 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_SWIOTLB=y # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y @@ -6725,7 +6816,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # Compile-time checks and compiler options # # CONFIG_DEBUG_INFO is not set -CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set @@ -6746,8 +6836,8 @@ CONFIG_MAGIC_SYSRQ_SERIAL=y CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" CONFIG_DEBUG_FS=y # CONFIG_DEBUG_FS_ALLOW_ALL is not set -# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set -CONFIG_DEBUG_FS_ALLOW_NONE=y +CONFIG_DEBUG_FS_DISALLOW_MOUNT=y +# CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y @@ -6785,11 +6875,15 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y +# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set +CONFIG_HAVE_ARCH_KFENCE=y +# CONFIG_KFENCE is not set # end of Memory Debugging CONFIG_DEBUG_SHIRQ=y @@ -6845,6 +6939,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y # CONFIG_CSD_LOCK_WAIT_DEBUG is not set # end of Lock Debugging (spinlocks, mutexes, etc...) +# CONFIG_DEBUG_IRQFLAGS is not set CONFIG_STACKTRACE=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set @@ -6884,9 +6979,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_OBJTOOL_MCOUNT=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y @@ -6923,6 +7020,7 @@ CONFIG_PROBE_EVENTS=y # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_KPROBE_EVENT_GEN_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set diff --git a/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.4.bb b/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.5.bb similarity index 95% rename from meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.4.bb rename to meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.5.bb index b9a6b71..0da9a26 100644 --- a/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.4.bb +++ b/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.5.bb @@ -13,7 +13,7 @@ DEPENDS = " \ json-c \ libdevmapper \ popt \ - util-linux \ + util-linux-libuuid \ " RDEPENDS_${PN} = " \ @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "911272e73181fdc850bb4d25103a9f83" -SRC_URI[sha256sum] = "9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773" +SRC_URI[md5sum] = "408620e0df577ec04108ec0bc2b91dee" +SRC_URI[sha256sum] = "ced9946f444d132536daf92fc8aca4277638a3c2d96e20540b2bae4d36fd70c1" inherit autotools gettext pkgconfig diff --git a/meta-citadel/recipes-support/keyutils/files/fix_library_install_path.patch b/meta-citadel/recipes-support/keyutils/files/fix_library_install_path.patch new file mode 100644 index 0000000..938fe2e --- /dev/null +++ b/meta-citadel/recipes-support/keyutils/files/fix_library_install_path.patch @@ -0,0 +1,28 @@ +From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Tue, 26 Sep 2017 07:59:51 +0000 +Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link + +The absolute path of the symlink will be invalid +when populated in sysroot, so use relative path instead. + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Wenzong Fan +{rebased for 1.6] +Signed-off-by: Armin Kuster + +Index: keyutils-1.6/Makefile +=================================================================== +--- keyutils-1.6.orig/Makefile ++++ keyutils-1.6/Makefile +@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0) + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + mkdir -p $(DESTDIR)$(USRLIBDIR) +- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) ++ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) + sed \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@prefix\@,$(PREFIX),g' \ diff --git a/meta-citadel/recipes-support/keyutils/files/keyutils-use-relative-path-for-link.patch b/meta-citadel/recipes-support/keyutils/files/keyutils-use-relative-path-for-link.patch deleted file mode 100644 index dde1af4..0000000 --- a/meta-citadel/recipes-support/keyutils/files/keyutils-use-relative-path-for-link.patch +++ /dev/null @@ -1,28 +0,0 @@ -Subject: [PATCH] keyutils: use relative path for link - -The absolute path of the symlink will be invalid -when populated in sysroot, so use relative path instead. - -Upstream-Status: Pending - -Signed-off-by: Jackie Huang ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 824bbbf..8ce3a13 100644 ---- a/Makefile -+++ b/Makefile -@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0) - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) -- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) - endif - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key --- -2.11.0 - diff --git a/meta-citadel/recipes-support/keyutils/keyutils_1.5.10.bb b/meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb similarity index 58% rename from meta-citadel/recipes-support/keyutils/keyutils_1.5.10.bb rename to meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb index a4222b9..0a8c2e4 100644 --- a/meta-citadel/recipes-support/keyutils/keyutils_1.5.10.bb +++ b/meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb @@ -12,36 +12,54 @@ LICENSE = "LGPLv2.1+ & GPLv2.0+" LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" - -inherit siteinfo ptest +inherit siteinfo autotools-brokensep ptest SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ - file://keyutils-use-relative-path-for-link.patch \ file://keyutils-test-fix-output-format.patch \ file://keyutils-fix-error-report-by-adding-default-message.patch \ file://run-ptest \ + file://fix_library_install_path.patch \ " -SRC_URI[md5sum] = "3771676319bc7b84b1549b5c63ff5243" -SRC_URI[sha256sum] = "115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6" +SRC_URI[md5sum] = "919af7f33576816b423d537f8a8692e8" +SRC_URI[sha256sum] = "c8b15722ae51d95b9ad76cc6d49a4c2cc19b0c60f72f61fb9bf43eea7cbd64ce" EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ NO_ARLIB=1 \ BINDIR=${base_bindir} \ SBINDIR=${base_sbindir} \ - LIBDIR=${base_libdir} \ - USRLIBDIR=${base_libdir} \ + LIBDIR=${libdir} \ + USRLIBDIR=${libdir} \ + INCLUDEDIR=${includedir} \ BUILDFOR=${SITEINFO_BITS}-bit \ NO_GLIBC_KEYERR=1 \ " do_install () { + install -d ${D}/${libdir}/pkgconfig oe_runmake DESTDIR=${D} install } +do_install_append_class-nativesdk() { + install -d ${D}${datadir} + src_dir="${D}${target_datadir}" + mv $src_dir/* ${D}${datadir} + par_dir=`dirname $src_dir` + rmdir $src_dir $par_dir + + install -d ${D}${sysconfdir} + mv ${D}/etc/* ${D}${sysconfdir}/ + rmdir ${D}/etc +} + do_install_ptest () { cp -r ${S}/tests ${D}${PTEST_PATH}/ sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh } -RDEPENDS_${PN}-ptest += "glibc-utils" + +RDEPENDS_${PN}-ptest += "lsb-release" +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" +RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/libblockdev/libblockdev_2.24.bb b/meta-citadel/recipes-support/libblockdev/libblockdev_2.25.bb similarity index 97% rename from meta-citadel/recipes-support/libblockdev/libblockdev_2.24.bb rename to meta-citadel/recipes-support/libblockdev/libblockdev_2.25.bb index 99cdee5..2c8fdc7 100644 --- a/meta-citadel/recipes-support/libblockdev/libblockdev_2.24.bb +++ b/meta-citadel/recipes-support/libblockdev/libblockdev_2.25.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" -SRCREV = "f5a4ba8bb298f8cbc435707d0b19b4b2ff836a8e" +SRCREV = "c50869272b54bf4b4bc3825e8c3332a54678b43f" S = "${WORKDIR}/git" FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" @@ -37,4 +37,3 @@ PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" - diff --git a/meta-citadel/recipes-support/libgit2/libgit2_0.27.4.bb b/meta-citadel/recipes-support/libgit2/libgit2_0.27.4.bb deleted file mode 100644 index e7f7688..0000000 --- a/meta-citadel/recipes-support/libgit2/libgit2_0.27.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.27" -#v0.27.5 -SRCREV = "8e0b172981a046d19f1d9efa5acd6186bccbd3ce" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DTHREADSAFE=ON \ - -DBUILD_CLAR=OFF \ - -DSHA1_TYPE="builtin" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_EXAMPLES=OFF \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-support/libseccomp/files/run-ptest b/meta-citadel/recipes-support/libseccomp/files/run-ptest new file mode 100644 index 0000000..54b4a63 --- /dev/null +++ b/meta-citadel/recipes-support/libseccomp/files/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +cd tests +./regression -a diff --git a/meta-citadel/recipes-support/libseccomp/libseccomp_2.3.3.bb b/meta-citadel/recipes-support/libseccomp/libseccomp_2.3.3.bb deleted file mode 100644 index 00208d0..0000000 --- a/meta-citadel/recipes-support/libseccomp/libseccomp_2.3.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" - -SRCREV = "74b190e1aa05f07da0c61fb9a30dbc9c18ce2c9d" -SRC_URI = "git://github.com/seccomp/libseccomp.git;protocol=https;branch=release-2.3" - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "" - diff --git a/meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb b/meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb new file mode 100644 index 0000000..8fe1023 --- /dev/null +++ b/meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb @@ -0,0 +1,54 @@ +SUMMARY = "interface to seccomp filtering mechanism" +DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +HOMEPAGE = "https://github.com/seccomp/libseccomp" +SECTION = "security" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" + +DEPENDS += "gperf-native" + +SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7" + +SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ + file://run-ptest \ + " + +COMPATIBLE_HOST_riscv32 = "null" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig ptest features_check + +REQUIRED_DISTRO_FEATURES = "seccomp" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--enable-python, --disable-python, python3" + +DISABLE_STATIC = "" + +do_compile_ptest() { + oe_runmake -C tests check-build +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tools + for file in $(find tests/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + for file in $(find tests/*.tests -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + for file in $(find tools/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools + done + # Overwrite libtool wrappers with real executables + for file in $(find tools/.libs/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools + done +} + +FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" +FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" + +RDEPENDS_${PN}-ptest = "coreutils bash" diff --git a/meta-citadel/recipes-support/libssh2/libssh2_1.8.0.bb b/meta-citadel/recipes-support/libssh2/libssh2_1.8.0.bb deleted file mode 100644 index 94bfb8f..0000000 --- a/meta-citadel/recipes-support/libssh2/libssh2_1.8.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A client-side C library implementing the SSH2 protocol" -HOMEPAGE = "http://www.libssh2.org/" -SECTION = "libs" - -DEPENDS = "zlib" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" - -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" -SRC_URI[md5sum] = "3d1147cae66e2959ea5441b183de1b1c" -SRC_URI[sha256sum] = "39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4" - -inherit autotools pkgconfig - -EXTRA_OECONF += "\ - --with-libz \ - --with-libz-prefix=${STAGING_LIBDIR} \ - " - -# only one of openssl and gcrypt could be set -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-openssl --with-libssl-prefix=${STAGING_LIBDIR},--without-openssl,openssl" -PACKAGECONFIG[gcrypt] = "--with-libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR},--without-libgcrypt,libgcrypt" - -BBCLASSEXTEND = "native" diff --git a/meta-citadel/recipes-support/lvm2/libdevmapper_2.03.06.bb b/meta-citadel/recipes-support/lvm2/libdevmapper_2.03.11.bb similarity index 100% rename from meta-citadel/recipes-support/lvm2/libdevmapper_2.03.06.bb rename to meta-citadel/recipes-support/lvm2/libdevmapper_2.03.11.bb diff --git a/meta-citadel/recipes-support/lvm2/lvm2.inc b/meta-citadel/recipes-support/lvm2/lvm2.inc index 3c6c7ed..ccb4f7a 100644 --- a/meta-citadel/recipes-support/lvm2/lvm2.inc +++ b/meta-citadel/recipes-support/lvm2/lvm2.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ DEPENDS += "libaio" -SRC_URI = "git://sourceware.org/git/lvm2.git \ +SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ @@ -18,15 +18,14 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://reproducible-build.patch \ " -SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" +SRCREV = "3e8bd8d1bd70691f09a170785836aeb4f83154e6" S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig systemd license +inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" LVM2_PACKAGECONFIG_append_class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ " # odirect is always enabled because there currently is a bug in @@ -39,6 +38,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" # Unset user/group to unbreak install. @@ -55,4 +55,3 @@ EXTRA_OECONF = "--with-user= \ --with-thin-repair=${sbindir}/thin_repair \ --with-thin-restore=${sbindir}/thin_restore \ " - diff --git a/meta-citadel/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch b/meta-citadel/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch deleted file mode 100644 index 24d5b1b..0000000 --- a/meta-citadel/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93c93e3b85492e58f9451841e6079d00c497efa4 Mon Sep 17 00:00:00 2001 -From: Jiping Ma -Date: Mon, 25 Feb 2019 13:29:12 +0800 -Subject: [PATCH] "/dev/hdc: open failed: No medium found" will print out in - lvmdiskscan. - -commit [57bb46c5e7f8] introduce this issue. -"/dev/hdc: open failed: No medium found" will be print out -after run lvmdiskscan. change dev_open_readonly() -to dev_open_readonly_quiet() in fuction _dev_get_size_dev(). - -Signed-off-by: Jiping Ma ---- - lib/device/dev-io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c -index dc95131..81a66b0 100644 ---- a/lib/device/dev-io.c -+++ b/lib/device/dev-io.c -@@ -338,7 +338,7 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size) - } - - if (fd <= 0) { -- if (!dev_open_readonly(dev)) -+ if (!dev_open_readonly_quiet(dev)) - return_0; - fd = dev_fd(dev); - do_close = 1; --- -1.9.1 - diff --git a/meta-citadel/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-citadel/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch index 16de8c0..34e0620 100644 --- a/meta-citadel/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch +++ b/meta-citadel/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -1,6 +1,6 @@ -From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001 +From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Mon, 2 Sep 2019 23:04:50 -0400 +Date: Tue, 2 Mar 2021 01:33:05 -0800 Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found In oe-core (util-linux and coreutils), the commands locates in @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d1431e2..54e5a7b 100644 +index 4811d4a3d..137b31a82 100644 --- a/configure.ac +++ b/configure.ac -@@ -1495,6 +1495,8 @@ fi +@@ -1611,6 +1611,8 @@ fi SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" @@ -27,7 +27,7 @@ index d1431e2..54e5a7b 100644 SBINDIR="$(eval echo $(eval echo $sbindir))" LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) -@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS) +@@ -1829,6 +1831,7 @@ AC_SUBST(SACKPT_CFLAGS) AC_SUBST(SACKPT_LIBS) AC_SUBST(SALCK_CFLAGS) AC_SUBST(SALCK_LIBS) @@ -36,10 +36,10 @@ index d1431e2..54e5a7b 100644 AC_SUBST(SELINUX_LIBS) AC_SUBST(SELINUX_PC) diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in -index a4b8a8f..3db4226 100644 +index 7c517b87b..7ef1bb766 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in -@@ -41,13 +41,14 @@ UMOUNT="/bin/umount" +@@ -42,13 +42,14 @@ VDO="/bin/vdo" sbindir="@SBINDIR@" DMSETUP="$sbindir/dmsetup" @@ -55,9 +55,9 @@ index a4b8a8f..3db4226 100644 FINDMNT_READ="read -r mnt" fi DMSETUP_OPTS="" -@@ -55,10 +56,10 @@ LVM_OPTS="" - MDADM_OPTS="" +@@ -57,10 +58,10 @@ MDADM_OPTS="" MPATHD_OPTS="" + VDO_OPTS="" -LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" +LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" @@ -69,5 +69,5 @@ index a4b8a8f..3db4226 100644 # Do not show tool errors by default (only done/skipping summary # message provided by this script) and no verbose mode by default. -- -2.8.1 +2.29.2 diff --git a/meta-citadel/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb similarity index 97% rename from meta-citadel/recipes-support/lvm2/lvm2_2.03.06.bb rename to meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb index bc86810..7f3f000 100644 --- a/meta-citadel/recipes-support/lvm2/lvm2_2.03.06.bb +++ b/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb @@ -1,7 +1,6 @@ require lvm2.inc SRC_URI += " \ - file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ " diff --git a/meta-citadel/recipes-support/nano/nano_3.0.bb b/meta-citadel/recipes-support/nano/nano_5.6.bb similarity index 79% rename from meta-citadel/recipes-support/nano/nano_3.0.bb rename to meta-citadel/recipes-support/nano/nano_5.6.bb index 2c7fbd5..1ce08dd 100644 --- a/meta-citadel/recipes-support/nano/nano_3.0.bb +++ b/meta-citadel/recipes-support/nano/nano_5.6.bb @@ -2,18 +2,19 @@ DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ Not ANOther editor) is an enhanced clone of the \ Pico text editor." HOMEPAGE = "http://www.nano-editor.org/" +SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" -SECTION = "console/utils" + DEPENDS = "ncurses file" RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[sha256sum] = "fce183e4a7034d07d219c79aa2f579005d1fd49f156db6e50f53543a87637a32" -SRC_URI[md5sum] = "74196427a09ec2f82a88facd220d2787" -SRC_URI[sha256sum] = "e0a5bca354514e64762c987c200a8758b05e7bcced3b00b3e48ea0a2d383c8a0" +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" inherit autotools gettext pkgconfig diff --git a/meta-citadel/recipes-support/nspr/nspr_4.26.bb b/meta-citadel/recipes-support/nspr/nspr_4.29.bb similarity index 97% rename from meta-citadel/recipes-support/nspr/nspr_4.26.bb rename to meta-citadel/recipes-support/nspr/nspr_4.29.bb index a15afd6..6307c15 100644 --- a/meta-citadel/recipes-support/nspr/nspr_4.26.bb +++ b/meta-citadel/recipes-support/nspr/nspr_4.29.bb @@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68" -SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d" +SRC_URI[md5sum] = "a546926d3c8e887be02c668c1293da92" +SRC_URI[sha256sum] = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582" CVE_PRODUCT = "netscape_portable_runtime" diff --git a/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index bfc375e..65e1500 100644 --- a/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -10,22 +10,24 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin --- - nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/Makefile | 3 +++ nss/lib/freebl/gcm.c | 2 ++ - 2 files changed, 6 insertions(+) + 2 files changed, 5 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index fe8c526..922f67c 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -126,6 +126,8 @@ else +@@ -125,6 +125,8 @@ else + DEFINES += -DNSS_X86 endif endif - ifdef NS_USE_GCC +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c -@@ -150,6 +152,7 @@ endif + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -166,6 +168,7 @@ endif endif endif endif @@ -33,15 +35,23 @@ Signed-off-by: Alexander Kanavin ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -21,7 +21,9 @@ +@@ -18,6 +18,7 @@ + + #include + ++#ifdef NSS_USE_ARM_HW_CRYPTO /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -+# ifdef NSS_USE_ARM_HW_CRYPTO - #define USE_ARM_GCM -+# endif - #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ - !defined(NSS_DISABLE_ARM32_NEON) +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch b/meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch deleted file mode 100644 index 432312d..0000000 --- a/meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 26 Aug 2020 17:30:40 -0700 -Subject: [PATCH] pkix: Do not use NULL where 0 is needed - -Clang finds this error - -pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -2 errors generated. - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378] -Signed-off-by: Khem Raj ---- - nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c -index a916e6e..10f537a 100644 ---- a/nss/lib/libpkix/pkix/util/pkix_logger.c -+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c -@@ -313,7 +313,7 @@ pkix_Logger_Destroy( - - logger->callback = NULL; - PKIX_DECREF(logger->context); -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - cleanup: - -@@ -614,7 +614,7 @@ PKIX_Logger_Create( - - logger->callback = callback; - logger->maxLevel = 0; -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - PKIX_INCREF(loggerContext); - logger->context = loggerContext; --- -2.28.0 - diff --git a/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch index fbfa828..224a5d2 100644 --- a/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -15,7 +15,7 @@ on host to install built files, it doesn't need any cross-compling or multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this error. -Upstream-Status: Pending +Upstream-Status: Inappropriate [configuration] Signed-off-by: Wenzong Fan =================================================== diff --git a/meta-citadel/recipes-support/nss/nss_3.56.bb b/meta-citadel/recipes-support/nss/nss_3.64.bb similarity index 90% rename from meta-citadel/recipes-support/nss/nss_3.56.bb rename to meta-citadel/recipes-support/nss/nss_3.64.bb index 997f895..1863db1 100644 --- a/meta-citadel/recipes-support/nss/nss_3.56.bb +++ b/meta-citadel/recipes-support/nss/nss_3.64.bb @@ -11,11 +11,12 @@ SECTION = "libs" DEPENDS = "sqlite3 nspr zlib nss-native" DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" +LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0+ & MIT) | (MPL-2.0 & LGPL-2.1+ & MIT)" LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ + file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=d4096c1e4421ee56e9e0f441a8161f78" VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" @@ -31,9 +32,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \ " -SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c" +SRC_URI[sha256sum] = "d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" @@ -53,6 +53,14 @@ do_configure_prepend_libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } +do_configure_prepend_powerpc64le_toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_configure_prepend_powerpc64_toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + do_compile_prepend_class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} @@ -69,7 +77,6 @@ do_compile_prepend_class-native() { do_compile() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - export NSS_ENABLE_WERROR=0 export CROSS_COMPILE=1 export NATIVE_CC="${BUILD_CC}" @@ -77,6 +84,10 @@ do_compile() { export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" export BUILD_OPT=1 + # POSIX.1-2001 states that the behaviour of getcwd() when passing a null + # pointer as the buf argument, is unspecified. + export NATIVE_FLAGS="${NATIVE_FLAGS} -DGETCWD_CANT_MALLOC" + export FREEBL_NO_DEPEND=1 export FREEBL_LOWHASH=1 @@ -94,7 +105,7 @@ do_compile() { if [ "${TARGET_ARCH}" = "powerpc" ]; then OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips @@ -111,7 +122,6 @@ do_compile() { fi export NSS_DISABLE_GTESTS=1 - # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! # @@ -152,7 +162,7 @@ do_install() { if [ "${TARGET_ARCH}" = "powerpc" ]; then OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips diff --git a/meta-citadel/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-citadel/recipes-support/udisks/udisks2/non-gnu-libc.patch deleted file mode 100644 index 98e6c75..0000000 --- a/meta-citadel/recipes-support/udisks/udisks2/non-gnu-libc.patch +++ /dev/null @@ -1,26 +0,0 @@ -musl does not define __GNUC_PREREQ therefore check for C library being glibc -if not then define the macro - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Index: udisks-2.1.7/udisks/udisksclient.c -=================================================================== ---- udisks-2.1.7.orig/udisks/udisksclient.c -+++ udisks-2.1.7/udisks/udisksclient.c -@@ -27,8 +27,15 @@ - #include "udisksobjectinfo.h" - - /* For __GNUC_PREREQ usage below */ --#ifdef __GNUC__ -+#ifdef __GLIBC__ - # include -+#else -+#if defined(__GNUC__) -+#define __GNUC_PREREQ(__maj, __min) \ -+ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) -+#else -+#define __GNUC_PREREQ(__maj, __min) 0 -+#endif - #endif - - /** diff --git a/meta-citadel/recipes-support/udisks/udisks2_git.bb b/meta-citadel/recipes-support/udisks/udisks2_2.9.2.bb similarity index 80% rename from meta-citadel/recipes-support/udisks/udisks2_git.bb rename to meta-citadel/recipes-support/udisks/udisks2_2.9.2.bb index cffdedb..f9e1274 100644 --- a/meta-citadel/recipes-support/udisks/udisks2_git.bb +++ b/meta-citadel/recipes-support/udisks/udisks2_2.9.2.bb @@ -3,30 +3,29 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = " \ + glib-2.0-native \ + libxslt-native \ acl \ libatasmart \ polkit \ libgudev \ - dbus-glib \ glib-2.0 \ + dbus-glib \ libblockdev \ - libxslt-native \ " DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" RDEPENDS_${PN} = "acl" -SRC_URI = " \ - git://github.com/storaged-project/udisks.git;branch=master \ -" -PV = "2.8.4+git${SRCREV}" -SRCREV = "db5f487345da2eaa87976450ea51c2c465d9b82e" +SRC_URI = "git://github.com/storaged-project/udisks.git;branch=master" +SRCREV = "da6d9480fefeb0ffdf8a84626b5096827d8d7030" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection gettext +inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check +REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECONF = "--disable-man --disable-gtk-doc" diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb b/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb deleted file mode 100644 index 10400ad..0000000 --- a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb +++ /dev/null @@ -1,34 +0,0 @@ -require wireguard-tools.inc - -inherit bash-completion systemd pkgconfig - -DEPENDS = "libmnl" - -do_compile_prepend () { - cd ${S}/tools -} - -do_unpack () { - tar -xvf ${DL_DIR}/WireGuard-0.0.20180708.tar.xz -C ${WORKDIR}/ - # Remove symlink pointing to non-existent file as this causes the - # reproducible_build .bbclass to fail - rm ${WORKDIR}/WireGuard-0.0.20180708/src/tools/wg-quick/wg -} - -do_install () { - cd ${S}/tools - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ - WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ - WITH_BASHCOMPLETION=yes \ - WITH_WGQUICK=yes \ - install -} - -FILES_${PN} = " \ - ${sysconfdir} \ - ${systemd_unitdir} \ - ${bindir} \ -" - -RDEPENDS_${PN} = "bash" diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_1.0.20200319.bb b/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_1.0.20200319.bb deleted file mode 100644 index cbde5e0..0000000 --- a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_1.0.20200319.bb +++ /dev/null @@ -1,27 +0,0 @@ -require wireguard.inc - -inherit bash-completion systemd pkgconfig - -DEPENDS = "libmnl" - -do_compile_prepend () { - cd ${S} -} - -do_install () { - cd ${S} - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ - WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ - WITH_BASHCOMPLETION=yes \ - WITH_WGQUICK=yes \ - install -} - -FILES_${PN} = " \ - ${sysconfdir} \ - ${systemd_unitdir} \ - ${bindir} \ -" - -RDEPENDS_${PN} = "bash" diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard.inc b/meta-citadel/recipes-support/wireguard-tools/wireguard.inc deleted file mode 100644 index 7b54d99..0000000 --- a/meta-citadel/recipes-support/wireguard-tools/wireguard.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "WireGuard is an extremely simple yet fast and modern VPN" -DESCRIPTION="WireGuard is a secure network tunnel, operating at layer 3, \ -implemented as a kernel virtual network interface for Linux, which aims to \ -replace both IPsec for most use cases, as well as popular user space and/or \ -TLS-based solutions like OpenVPN, while being more secure, more performant, \ -and easier to use." -SECTION = "networking" -HOMEPAGE = "https://www.wireguard.io/" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz" -SRC_URI[md5sum] = "36cd9411f56bc5dcaac29bbab6fd9c67" -SRC_URI[sha256sum] = "757ed31d4d48d5fd7853bfd9bfa6a3a1b53c24a94fe617439948784a2c0ed987" - -S = "${WORKDIR}/wireguard-tools-${PV}/src/" diff --git a/meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb b/meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb new file mode 100644 index 0000000..0525b41 --- /dev/null +++ b/meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb @@ -0,0 +1,34 @@ +require wireguard.inc + +SRCREV = "122f06bfd8fc7b06a0899fa9adc4ce8e06900d98" + +SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" + +inherit module kernel-module-split + +DEPENDS = "virtual/kernel libmnl" + +# This module requires Linux 3.10 higher and several networking related +# configuration options. For exact kernel requirements visit: +# https://www.wireguard.io/install/#kernel-requirements + +EXTRA_OEMAKE_append = " \ + KERNELDIR=${STAGING_KERNEL_DIR} \ + " + +MAKE_TARGETS = "module" + +RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +MODULE_NAME = "wireguard" + +module_do_install() { + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} + install -m 0644 ${MODULE_NAME}.ko \ + ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko +} + +# WireGuard has been merged into Linux kernel >= 5.6 and therefore this compatibility module is no longer required. +# OE-core post dunfell has moved to use kernel 5.8 which now means we cant build this module in world builds +# for reference machines e.g. qemu +EXCLUDE_FROM_WORLD = "1" + diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20191219.bb b/meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb similarity index 62% rename from meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20191219.bb rename to meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb index 88bfb4d..f02303e 100644 --- a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20191219.bb +++ b/meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb @@ -1,17 +1,15 @@ require wireguard.inc +SRCREV = "622408872fd6f3a58e98e88d39d30e98968314fa" +SRC_URI = "git://git.zx2c4.com/wireguard-tools" + inherit bash-completion systemd pkgconfig -DEPENDS = "libmnl" - -do_compile_prepend () { - cd ${S}/tools -} +DEPENDS += "libmnl" do_install () { - cd ${S}/tools oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ + SYSTEMDUNITDIR="${systemd_system_unitdir}" \ WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ WITH_BASHCOMPLETION=yes \ WITH_WGQUICK=yes \ @@ -20,8 +18,9 @@ do_install () { FILES_${PN} = " \ ${sysconfdir} \ - ${systemd_unitdir} \ + ${systemd_system_unitdir} \ ${bindir} \ " RDEPENDS_${PN} = "bash" +RRECOMMENDS_${PN} = "kernel-module-wireguard" diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc b/meta-citadel/recipes-support/wireguard/wireguard.inc similarity index 68% rename from meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc rename to meta-citadel/recipes-support/wireguard/wireguard.inc index 97111e2..a3a7867 100644 --- a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc +++ b/meta-citadel/recipes-support/wireguard/wireguard.inc @@ -10,8 +10,4 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" -SRC_URI[md5sum] = "2294b97a3aa8ceaff90f516912631c8b" -SRC_URI[sha256sum] = "5e38d554f7d1e3a64e3a5319ca1a3b790c84ed89c896586c490a93ac1f953a91" - -S = "${WORKDIR}/WireGuard-${PV}/src/" +S = "${WORKDIR}/git/src" diff --git a/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb b/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb index 5f68fbe..5681b52 100644 --- a/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb +++ b/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE_LGPL.txt;md5=3000208d539ec061b899bce1d9ce9404 SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https" +ERROR_QA_remove = "unknown-configure-option" SRCREV = "3b3b935b1643eb58e6cf5a9432b4470d568bfbc2" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb b/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb index 2d6f92c..2b3aed3 100644 --- a/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb +++ b/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \ file://LICENSES/CC-BY-SA-4.0.txt;md5=4b39cb11ffa11c92d3f7a3431390e0d9" -SRC_URI = "git://github.com/cyclopsian/wdisplays;protocol=https" +SRC_URI = "git://github.com/luispabon/wdisplays;protocol=https" SRC_URI += "file://use_correct_versions.patch" PV = "1.0+git${SRCPV}" diff --git a/meta-clang b/meta-clang index ee1dcdf..9d27674 160000 --- a/meta-clang +++ b/meta-clang @@ -1 +1 @@ -Subproject commit ee1dcdfbb8d31f168b26c2e3e5be97efea6537df +Subproject commit 9d276740bd10695e628abdbd49bc4cf36afddf60 diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 446325c..2ccd923 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -1,7 +1,7 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -LAYERSERIES_COMPAT_meta-gnome = "dunfell" +LAYERSERIES_COMPAT_meta-gnome = "hardknott" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ diff --git a/meta-gnome/recipes-connectivity/iwd/iwd/0001-Remove-config-dir-from-unit-file.patch b/meta-gnome/recipes-connectivity/iwd/iwd/0001-Remove-config-dir-from-unit-file.patch deleted file mode 100644 index a72504e..0000000 --- a/meta-gnome/recipes-connectivity/iwd/iwd/0001-Remove-config-dir-from-unit-file.patch +++ /dev/null @@ -1,21 +0,0 @@ -From b8687182b9103a1209a6cb553821bb4e4cda5591 Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Thu, 2 Jul 2020 15:46:40 +0000 -Subject: [PATCH] Remove config dir from unit file - ---- - src/iwd.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/iwd.service.in b/src/iwd.service.in -index 77819eaf..e33b2f0b 100644 ---- a/src/iwd.service.in -+++ b/src/iwd.service.in -@@ -19,7 +19,6 @@ ProtectHome=yes - ProtectSystem=strict - ProtectControlGroups=yes - ProtectKernelModules=yes --ConfigurationDirectory=iwd - StateDirectory=iwd - StateDirectoryMode=0700 - diff --git a/meta-gnome/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch b/meta-gnome/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch new file mode 100644 index 0000000..63d617f --- /dev/null +++ b/meta-gnome/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch @@ -0,0 +1,35 @@ +From 0532cddcec9c3abff1f3bc22d2fa50df03d55d17 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 5 Apr 2021 14:11:40 -0700 +Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources + +this makes it build when build dir is outside of sources dir + +Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.org/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -625,9 +625,10 @@ unit/tls-settings.8021x: unit/cert-ca.pe + BUILT_SOURCES = $(ell_built_sources) src/builtin.h + + ell/shared: Makefile ++ $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_shared) ; do \ + if [ ! -f $$f ] ; then \ +- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ ++ $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ + fi \ + done > $@ + +@@ -635,7 +636,7 @@ ell/internal: Makefile + $(AM_V_at)$(MKDIR_P) ell + $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ + if [ ! -f $$f ] ; then \ +- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ ++ $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ + fi \ + done > $@ + diff --git a/meta-gnome/recipes-connectivity/iwd/iwd/0002-arc4-implementation.patch b/meta-gnome/recipes-connectivity/iwd/iwd/0002-arc4-implementation.patch deleted file mode 100644 index 1642f23..0000000 --- a/meta-gnome/recipes-connectivity/iwd/iwd/0002-arc4-implementation.patch +++ /dev/null @@ -1,147 +0,0 @@ - -Newer version of ell in poky has removed ARC4, but iwd 1.7 still requires it. - -Backported commit of internal implementation that was added to iwd. This patch -will not be needed when iwd is upgraded to 1.9 - -However, iwd 1.9 (and 1.8) has another problem: - -https://bugzilla.kernel.org/show_bug.cgi?id=208599 - ---- - -diff --git a/src/crypto.c b/src/crypto.c -index 696b5990..f5f8e24d 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -18,6 +18,8 @@ - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * -+ * (contains ARC4 implementation copyright (c) 2001 Niels Möller) -+ * - */ - - #ifdef HAVE_CONFIG_H -@@ -34,6 +36,16 @@ - #include "src/missing.h" - #include "src/crypto.h" - -+#define ARC4_MIN_KEY_SIZE 1 -+#define ARC4_MAX_KEY_SIZE 256 -+#define ARC4_KEY_SIZE 16 -+ -+struct arc4_ctx { -+ uint8_t S[256]; -+ uint8_t i; -+ uint8_t j; -+}; -+ - /* RFC 3526, Section 2 */ - const unsigned char crypto_dh5_prime[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc9, 0x0f, 0xda, 0xa2, -@@ -415,44 +427,54 @@ free_ctr: - return false; - } - --bool arc4_skip(const uint8_t *key, size_t key_len, size_t skip, -- const uint8_t *in, size_t len, uint8_t *out) --{ -- char skip_buf[1024]; -- struct l_cipher *cipher; -- struct iovec in_vec[2]; -- struct iovec out_vec[2]; -- bool r; -- -- cipher = l_cipher_new(L_CIPHER_ARC4, key, key_len); -- if (!cipher) -- return false; -+#define SWAP(a,b) do { int _t = a; a = b; b = _t; } while (0) - -- /* This is not strictly necessary, but keeps valgrind happy */ -- memset(skip_buf, 0, sizeof(skip_buf)); -+static void arc4_set_key(struct arc4_ctx *ctx, unsigned length, -+ const uint8_t *key) -+{ -+ unsigned int i, j, k; - -- while (skip > sizeof(skip_buf)) { -- size_t to_skip = -- skip > sizeof(skip_buf) ? sizeof(skip_buf) : skip; -+ /* Initialize context */ -+ for (i = 0; i < 256; i++) -+ ctx->S[i] = i; - -- l_cipher_decrypt(cipher, skip_buf, skip_buf, to_skip); -- skip -= to_skip; -+ for (i = j = k = 0; i < 256; i++) { -+ j += ctx->S[i] + key[k]; j &= 0xff; -+ SWAP(ctx->S[i], ctx->S[j]); -+ /* Repeat key as needed */ -+ k = (k + 1) % length; - } -+ ctx->i = ctx->j = 0; -+} - -- in_vec[0].iov_base = skip_buf; -- in_vec[0].iov_len = skip; -- in_vec[1].iov_base = (void *) in; -- in_vec[1].iov_len = len; -+static void arc4_crypt(struct arc4_ctx *ctx, unsigned length, uint8_t *dst, -+ const uint8_t *src) -+{ -+ uint8_t i, j; -+ -+ i = ctx->i; j = ctx->j; -+ while (length--) { -+ i++; i &= 0xff; -+ j += ctx->S[i]; j &= 0xff; -+ SWAP(ctx->S[i], ctx->S[j]); -+ if (!dst || !src) -+ continue; -+ *dst++ = *src++ ^ ctx->S[ (ctx->S[i] + ctx->S[j]) & 0xff ]; -+ } -+ ctx->i = i; ctx->j = j; -+} - -- out_vec[0].iov_base = skip_buf; -- out_vec[0].iov_len = skip; -- out_vec[1].iov_base = out; -- out_vec[1].iov_len = len; -+bool arc4_skip(const uint8_t *key, size_t key_len, size_t skip, -+ const uint8_t *in, size_t len, uint8_t *out) -+{ -+ struct arc4_ctx cipher; - -- r = l_cipher_decryptv(cipher, in_vec, 2, out_vec, 2); -- l_cipher_free(cipher); -+ arc4_set_key(&cipher, key_len, key); -+ arc4_crypt(&cipher, skip, NULL, NULL); -+ arc4_crypt(&cipher, len, out, in); -+ explicit_bzero(&cipher, sizeof(cipher)); - -- return r; -+ return true; - } - - /* 802.11, Section 11.6.2, Table 11-4 */ -diff --git a/src/main.c b/src/main.c -index 8bcbb6a7..105de3e1 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -271,15 +271,6 @@ static int check_crypto() - l_hashmap_insert(optional, "CONFIG_CRYPTO_SHA512_SSSE3", &r); - } - -- if (!l_cipher_is_supported(L_CIPHER_ARC4)) { -- r = -ENOTSUP; -- l_error("RC4 support not found"); -- l_hashmap_insert(options, -- "CONFIG_CRYPTO_USER_API_SKCIPHER", &r); -- l_hashmap_insert(options, "CONFIG_CRYPTO_ARC4", &r); -- l_hashmap_insert(options, "CONFIG_CRYPTO_ECB", &r); -- } -- - if (!l_cipher_is_supported(L_CIPHER_DES) || - !l_cipher_is_supported(L_CIPHER_DES3_EDE_CBC)) { - r = -ENOTSUP; diff --git a/meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb b/meta-gnome/recipes-connectivity/iwd/iwd_1.13.bb similarity index 84% rename from meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb rename to meta-gnome/recipes-connectivity/iwd/iwd_1.13.bb index 3c1d9df..19d3a50 100644 --- a/meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb +++ b/meta-gnome/recipes-connectivity/iwd/iwd_1.13.bb @@ -5,13 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ - file://0001-Remove-config-dir-from-unit-file.patch \ - file://0002-arc4-implementation.patch \ - " -SRCREV = "ef6084dcb4fe2e00327bb9c7b113ece204042c22" - -S = "${WORKDIR}/git" +SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ + file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ + " +SRC_URI[sha256sum] = "b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb similarity index 55% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb index 9159fcb..1f76d8a 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.10.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb @@ -10,12 +10,23 @@ inherit gnomebase useradd gettext systemd SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI[md5sum] = "f118226ed2bfbacfd64ac4d1e0bd0383" -SRC_URI[sha256sum] = "ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61" +SRC_URI[md5sum] = "bef67eca77bee68da703609b92f804a0" +SRC_URI[sha256sum] = "e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" + +do_configure_append() { + # network-manager-openvpn.metainfo.xml is created in source folder but + # compile expects it in build folder. As long as nobody comes up with a + # better solution just support build: + if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then + mkdir -p ${B}/appdata + cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/ + fi +} do_install_append () { rm -rf ${D}${libdir}/NetworkManager/*.la @@ -26,6 +37,8 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system nm-openvpn" FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ ${libdir}/NetworkManager/*.so \ ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ " diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch new file mode 100644 index 0000000..19c8c74 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -0,0 +1,22 @@ +From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001 +From: Pablo Saavedra +Date: Tue, 13 Mar 2018 17:36:20 +0100 +Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 65ceffb..ad4b0fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) + + AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) +- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` ++ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` + JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` + + if test "$JANSSON_SONAME" = ""; then diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch deleted file mode 100644 index 1bbb0a3..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0ec98dd65d3133514175968b19c01eed9b1d9b0c Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Tue, 27 Oct 2020 16:14:07 -0400 -Subject: [PATCH] Generator fails to build in cross-compile environment. - -It's not needed because it's for (re-)creating generate-docs-nm-settings-nmcli.xml -which already exists in the source archive. ---- - clients/cli/meson.build | 21 --------------------- - 1 file changed, 21 deletions(-) - -diff --git a/clients/cli/meson.build b/clients/cli/meson.build -index 517deff..d3b249c 100644 ---- a/clients/cli/meson.build -+++ b/clients/cli/meson.build -@@ -35,24 +35,3 @@ executable( - - endif - --generate_docs_nm_settings_nmcli = executable( -- 'generate-docs-nm-settings-nmcli', -- files( -- 'generate-docs-nm-settings-nmcli.c', -- ), -- dependencies: [ -- libnmc_base_dep, -- libnmc_dep, -- libnm_libnm_aux_dep, -- ], -- c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')], -- link_args: ldflags_linker_script_binary, -- link_depends: linker_script_binary, --) -- --generate_docs_nm_settings_nmcli_xml = custom_target( -- 'generate-docs-nm-settings-nmcli.xml', -- output: 'generate-docs-nm-settings-nmcli.xml', -- command: [ generate_docs_nm_settings_nmcli ], -- capture: true, --) diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch new file mode 100644 index 0000000..0a86aba --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -0,0 +1,59 @@ +From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001 +From: Vinicius Aquino +Date: Thu, 1 Apr 2021 14:13:07 -0300 +Subject: [PATCH] Do not create settings settings/property documentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It was tried to get this work by adding python3-pygobject-native to DEPENDS but +compile could not find (configure passed) python module gi. +Anyway it is not necessary for us to have the settings/property docs. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +Signed-off-by: Vinicius Aquino +--- + Makefile.am | 4 ---- + configure.ac | 5 ----- + 2 files changed, 9 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 9279672c1..2e52acbb2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1686,14 +1686,10 @@ libnm/libnm.typelib: libnm/libnm.gir + INTROSPECTION_GIRS += libnm/NM-1.0.gir + + libnm_noinst_data = \ +- clients/cli/generate-docs-nm-settings-nmcli.xml \ + libnm/nm-property-infos-dbus.xml \ + libnm/nm-property-infos-ifcfg-rh.xml \ + libnm/nm-property-infos-keyfile.xml \ + libnm/nm-property-infos-nmcli.xml \ +- libnm/nm-settings-docs-gir.xml \ +- man/nm-settings-docs-dbus.xml \ +- man/nm-settings-docs-nmcli.xml \ + $(NULL) + + noinst_DATA += $(libnm_noinst_data) +diff --git a/configure.ac b/configure.ac +index 784ac4695..681e6cb32 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1241,11 +1241,6 @@ GTK_DOC_CHECK(1.0) + # check if we can build setting property documentation + build_docs=no + if test -n "$INTROSPECTION_MAKEFILE"; then +- # If g-i is installed we know we have python, but we might not have pygobject +- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then +- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) +- fi +- + AC_PATH_PROG(PERL, perl) + if test -z "$PERL"; then + AC_MSG_ERROR([--enable-introspection requires perl]) +-- +2.20.1 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch new file mode 100644 index 0000000..1174189 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch @@ -0,0 +1,30 @@ +From 6388b16b93ba805f8877a94f47509f701250812f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 6 Jul 2020 19:33:54 -0700 +Subject: [PATCH] install firewalld to var-libdir rather than hardcod lib + +The oe install firewalld (split packages) to ${libdir}/firewalld/zones + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 358b01a..5745339 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4778,7 +4778,7 @@ data/server.conf: $(srcdir)/data/server.conf.in + $(AM_V_GEN) $(data_edit) $< >$@ + + if WITH_FIREWALLD_ZONE +-firewalldzonedir = $(prefix)/lib/firewalld/zones ++firewalldzonedir = $(libdir)/firewalld/zones + firewalldzone_DATA = data/nm-shared.xml + endif + +-- +2.21.0 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch new file mode 100644 index 0000000..692f1ff --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch @@ -0,0 +1,154 @@ +From 44884c7e7655b889f41cb02ffc8ab72a29b52ebf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 2 Apr 2019 01:34:35 +0200 +Subject: [PATCH 1/2] Fix build with musl - systemd specific +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Networkmanager imported some code from systemd. This requires some adjustments +for musl. + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +Signed-off-by: Vinicius Aquino +--- + shared/systemd/src/basic/in-addr-util.c | 1 + + shared/systemd/src/basic/process-util.c | 9 +++++++++ + shared/systemd/src/basic/socket-util.h | 6 ++++++ + shared/systemd/src/basic/sort-util.h | 13 ++++--------- + shared/systemd/src/basic/stdio-util.h | 2 ++ + shared/systemd/src/basic/string-util.h | 5 +++++ + 6 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c +index c315dcbb8..5b7e04eb7 100644 +--- a/shared/systemd/src/basic/in-addr-util.c ++++ b/shared/systemd/src/basic/in-addr-util.c +@@ -15,6 +15,7 @@ + #include "in-addr-util.h" + #include "macro.h" + #include "parse-util.h" ++#include "string-util.h" + #include "random-util.h" + #include "string-util.h" + #include "strxcpyx.h" +diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c +index 0e25b0200..ea2c0fbb4 100644 +--- a/shared/systemd/src/basic/process-util.c ++++ b/shared/systemd/src/basic/process-util.c +@@ -17,6 +17,9 @@ + #include + #include + #include ++#ifndef __GLIBC__ ++#include ++#endif + #if 0 /* NM_IGNORED */ + #if HAVE_VALGRIND_VALGRIND_H + #include +@@ -1152,11 +1155,13 @@ void reset_cached_pid(void) { + cached_pid = CACHED_PID_UNSET; + } + ++#ifdef __GLIBC__ + /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc + * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against + * libpthread, as it is part of glibc anyway. */ + extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); + extern void* __dso_handle _weak_; ++#endif + + pid_t getpid_cached(void) { + static bool installed = false; +@@ -1185,7 +1190,11 @@ pid_t getpid_cached(void) { + * only half-documented (glibc doesn't document it but LSB does — though only superficially) + * we'll check for errors only in the most generic fashion possible. */ + ++#ifdef __GLIBC__ + if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { ++#else ++ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { ++#endif + /* OOM? Let's try again later */ + cached_pid = CACHED_PID_UNSET; + return new_pid; +diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h +index 1de069476..f6834fbd2 100644 +--- a/shared/systemd/src/basic/socket-util.h ++++ b/shared/systemd/src/basic/socket-util.h +@@ -14,6 +14,12 @@ + #include + #include + ++#if !defined(__GLIBC__) ++/* SIOCGSTAMPNS from linux/asm-generic.h ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */ ++#include ++#endif ++ + #include "macro.h" + #include "missing_network.h" + #include "missing_socket.h" +diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h +index a8984fc16..5fb90f8c5 100644 +--- a/shared/systemd/src/basic/sort-util.h ++++ b/shared/systemd/src/basic/sort-util.h +@@ -5,15 +5,10 @@ + + #include "macro.h" + +-void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, +- __compar_d_fn_t compar, void *arg); +- +-#define typesafe_bsearch_r(k, b, n, func, userdata) \ +- ({ \ +- const typeof(b[0]) *_k = k; \ +- int (*_func_)(const typeof(b[0])*, const typeof(b[0])*, typeof(userdata)) = func; \ +- xbsearch_r((const void*) _k, (b), (n), sizeof((b)[0]), (__compar_d_fn_t) _func_, userdata); \ +- }) ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif + + /** + * Normal bsearch requires base to be nonnull. Here were require +diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h +index d45d3c1a6..fee1a57ca 100644 +--- a/shared/systemd/src/basic/stdio-util.h ++++ b/shared/systemd/src/basic/stdio-util.h +@@ -2,7 +2,9 @@ + #pragma once + + #if 0 /* NM_IGNORED */ ++#if defined(__GLIBC__) + #include ++#endif + #endif /* NM_IGNORED */ + #include + #include +diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h +index 593cf04ae..541c393f6 100644 +--- a/shared/systemd/src/basic/string-util.h ++++ b/shared/systemd/src/basic/string-util.h +@@ -26,6 +26,11 @@ + #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) + #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) + ++/* musl does not know strndupa */ ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + int strcmp_ptr(const char *a, const char *b) _pure_; + int strcasecmp_ptr(const char *a, const char *b) _pure_; + +-- +2.20.1 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch new file mode 100644 index 0000000..d83efd3 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch @@ -0,0 +1,26 @@ +From 7d9a11a17da425d106791ada7100d7a6559e6065 Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer +Date: Sat, 7 Mar 2020 14:24:01 +0100 +Subject: [PATCH 2/2] Fix build with musl - systemd specific + +--- + src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c +index 3fafd3c0e..79d6096c2 100644 +--- a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c +@@ -8,7 +8,9 @@ + #include + #include + #if 0 /* NM_IGNORED */ ++#ifdef __GLIBC__ /* musl supplies full set of userspace headers */ + #include ++#endif + #else /* NM_IGNORED */ + #include + #endif /* NM_IGNORED */ +-- +2.20.1 + diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb deleted file mode 100644 index bde4ba0..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb +++ /dev/null @@ -1,143 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = " \ - intltool-native \ - libxslt-native \ - libnl \ - libgudev \ - util-linux \ - libndp \ - libnewt \ - curl \ - dbus \ - nss \ - iwd \ - coreutils-native \ - python3-pygobject-native \ -" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even - -SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://${BPN}.initd \ - file://NetworkManager.conf \ - file://watch-resolvconf.path \ - file://watch-resolvconf.service \ - file://0001-Generator-fails-to-build-in-cross-compile-environmen.patch \ - " - -SRC_URI[sha256sum] = "7995802c67e54fc58be4c0e3d2095d943f53f4300a93bde7ff48822a0b1f62ea" - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OEMESON = "\ - -Diwd=true \ - -Dnmtui=false \ - -Djson_validation=false \ - -Dselinux=false \ - -Dlibaudit=no \ - -Dpolkit=false \ - -Dppp=false \ - -Dmodem_manager=false \ - -Dovs=false \ - -Dlibpsl=false \ - -Dqt=false \ - -Dfirewalld_zone=false \ - -Dsession_tracking_consolekit=false \ - -Ddhclient=${base_sbindir}/dhclient \ - " - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" -} - -PACKAGES =+ " \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl ${PN}-cloud-setup \ -" - -SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" - -FILES_${PN}-cloud-setup = " \ - ${libexecdir}/nm-cloud-setup \ - ${systemd_system_unitdir}/nm-cloud-setup.service \ - ${systemd_system_unitdir}/nm-cloud-setup.timer \ - ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ - ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ -" -ALLOW_EMPTY_${PN}-cloud-setup = "1" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/NetworkManager/${PV}/*.so \ - ${libdir}/NetworkManager \ - ${nonarch_libdir}/NetworkManager/conf.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ - ${nonarch_libdir}/NetworkManager/VPN \ - ${nonarch_libdir}/NetworkManager/system-connections \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/udev/* \ - ${systemd_system_unitdir} \ - ${libdir}/pppd \ -" - -RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ -" -RCONFLICTS_${PN} = "connman" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ - ${libdir}/NetworkManager/${PV}/*.la \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" -ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" - -do_install_append() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager - - rm -rf ${D}/run ${D}${localstatedir}/run - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # For read-only filesystem, do not create links during bootup - ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager - - # systemd v210 and newer do not need this rule file - rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules - fi - install -d ${D}${sysconfdir}/NetworkManager/ - install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/ -} diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb new file mode 100644 index 0000000..ec3bdd2 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb @@ -0,0 +1,181 @@ +SUMMARY = "NetworkManager" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = " \ + intltool-native \ + libxslt-native \ + libnl \ + udev \ + util-linux \ + libndp \ + libnewt \ + curl \ +" + +inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ + file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ + file://0002-Do-not-create-settings-settings-property-documentati.patch \ + file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ +" +SRC_URI_append_libc-musl = " \ + file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ + file://musl/0002-Fix-build-with-musl-systemd-specific.patch \ +" +SRC_URI[sha256sum] = "0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2" + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ + --with-nmtui=yes \ + --with-udev-dir=${nonarch_base_libdir}/udev \ + --with-dhclient=no \ + --with-dhcpcd=no \ + --with-dhcpcanon=no \ + --with-netconfig=no \ +" + +# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template +# avoids: +# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? +CFLAGS_append_libc-musl = " \ + -DRTLD_DEEPBIND=0 \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" +} + +PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} + +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ + --without-systemdsystemunitdir, \ +" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable-wifi=no,,wpa-supplicant" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" +PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" +PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" +PACKAGECONFIG[ovs] = "--enable-ovs,--disable-ovs,jansson" + +PACKAGES =+ " \ + ${PN}-nmcli ${PN}-nmcli-doc \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl ${PN}-cloud-setup \ +" + +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" + +FILES_${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +ALLOW_EMPTY_${PN}-cloud-setup = "1" +SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager/${PV}/*.so \ + ${libdir}/NetworkManager \ + ${libdir}/firewalld/zones \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/system-connections \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${nonarch_base_libdir}/udev/* \ + ${systemd_system_unitdir} \ + ${libdir}/pppd \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ +" +RCONFLICTS_${PN} = "connman" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${libdir}/NetworkManager/${PV}/*.la \ +" + +FILES_${PN}-nmcli = " \ + ${bindir}/nmcli \ +" + +FILES_${PN}-nmcli-doc = " \ + ${mandir}/man1/nmcli* \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +INITSCRIPT_NAME = "network-manager" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" +ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" + +do_install_append() { + install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + + rm -rf ${D}/run ${D}${localstatedir}/run + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # For read-only filesystem, do not create links during bootup + ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules + fi +} diff --git a/meta-gnome/recipes-devtools/meson/meson.inc b/meta-gnome/recipes-devtools/meson/meson.inc deleted file mode 100644 index 004189e..0000000 --- a/meta-gnome/recipes-devtools/meson/meson.inc +++ /dev/null @@ -1,33 +0,0 @@ -HOMEPAGE = "http://mesonbuild.com" -SUMMARY = "A high performance build system" -DESCRIPTION = "Meson is a build system designed to increase programmer \ -productivity. It does this by providing a fast, simple and easy to use \ -interface for modern software development tools and practices." - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ - file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ - file://0003-native_bindir.patch \ - file://0001-python-module-do-not-manipulate-the-environment-when.patch \ - file://disable-rpath-handling.patch \ - file://cross-prop-default.patch \ - file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ - " -SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080" - -SRC_URI_append_class-native = " \ - 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" -UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" - -FILES_${PN} += "${datadir}/polkit-1" diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch deleted file mode 100644 index fbc03b8..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH] Make CPU family warnings fatal - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ross Burton - ---- - mesonbuild/envconfig.py | 2 +- - mesonbuild/environment.py | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 219b62e..d1be65b 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -199,7 +199,7 @@ class MachineInfo: - - cpu_family = literal['cpu_family'] - if cpu_family not in known_cpu_families: -- mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family)) -+ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) - - endian = literal['endian'] - if endian not in ('little', 'big'): -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index bf09a88..8eabe78 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: - trial = 'parisc' - - if trial not in known_cpu_families: -- mlog.warning('Unknown CPU family {!r}, please report this at ' -- 'https://github.com/mesonbuild/meson/issues/new with the ' -- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) - - return trial - diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch deleted file mode 100644 index a1f8422..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 27 May 2020 16:43:05 +0000 -Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR - -When using sysroots for builds, the standard target paths for the -tools need to be prefixed (pkg-config is not clever enough to -determine when a custom variable is a path) - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - mesonbuild/modules/gnome.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 52016f4..2b72ee4 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule): - if giscanner is not None: - self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner) - elif self.gir_dep.type_name == 'pkgconfig': -- self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) -+ self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) - else: - self.giscanner = self.interpreter.find_program_impl('g-ir-scanner') - gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') - if gicompiler is not None: - self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler) - elif self.gir_dep.type_name == 'pkgconfig': -- self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) -+ self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) - else: - self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler') - return self.gir_dep, self.giscanner, self.gicompiler diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch deleted file mode 100644 index 471f150..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 4 Aug 2017 16:16:41 +0300 -Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling - -Specifically: -1) Make it possible to specify a wrapper for executing binaries -(usually, some kind of target hardware emulator, such as qemu) -2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will -try to guess them, incorrectly. -3) If things break down, print the full command with arguments, -not just the binary name. -4) Correctly determine the compiler/linker executables and cross-options when cross-compiling - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - mesonbuild/modules/gnome.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -974,6 +974,10 @@ This will become a hard error in the future.''') - args.append('--{}={}'.format(program_name, path)) - if namespace: - args.append('--namespace=' + namespace) -+ gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None) -+ if gtkdoc_exe_wrapper is not None: -+ args.append('--run=' + gtkdoc_exe_wrapper) -+ - args += self._unpack_args('--htmlargs=', 'html_args', kwargs) - args += self._unpack_args('--scanargs=', 'scan_args', kwargs) - args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch deleted file mode 100644 index c0ad01e..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 18 Apr 2019 17:36:11 +0200 -Subject: [PATCH] modules/python.py: do not substitute python's install prefix - with meson's - -Not sure why this is being done, but it -a) relies on Python's internal variable substitution which may break in the future -b) shouldn't be necessary as Python's prefix ought to be correct in the first place - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - mesonbuild/modules/python.py | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 2f0c644..d2aa565 100644 ---- a/mesonbuild/modules/python.py -+++ b/mesonbuild/modules/python.py -@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig - import json - import sys - --install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', 'platbase': '', 'installed_base': ''}) -+install_paths = sysconfig.get_paths(scheme='posix_prefix') - - def links_against_libpython(): - from distutils.core import Distribution, Extension -@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder): - ExternalProgramHolder.__init__(self, python, interpreter.subproject) - self.interpreter = interpreter - self.subproject = self.interpreter.subproject -- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix') - self.variables = info['variables'] - self.paths = info['paths'] - install_paths = info['install_paths'] -- self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:]) -- self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:]) -+ self.platlib_install_path = install_paths['platlib'] -+ self.purelib_install_path = install_paths['purelib'] - self.version = info['version'] - self.platform = info['platform'] - self.is_pypy = info['is_pypy'] diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch deleted file mode 100644 index eb0e90d..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 19 Nov 2018 14:24:26 +0100 -Subject: [PATCH] python module: do not manipulate the environment when calling - pkg-config - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - mesonbuild/modules/python.py | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 07be318..b770603 100644 ---- a/mesonbuild/modules/python.py -+++ b/mesonbuild/modules/python.py -@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency): - old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') - old_pkg_path = os.environ.get('PKG_CONFIG_PATH') - -- os.environ.pop('PKG_CONFIG_PATH', None) -- -- if pkg_libdir: -- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir -- - try: - self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs) - mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir)) -@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency): - mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir)) - mlog.debug(e) - -- if old_pkg_path is not None: -- os.environ['PKG_CONFIG_PATH'] = old_pkg_path -- -- if old_pkg_libdir is not None: -- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir -- else: -- os.environ.pop('PKG_CONFIG_LIBDIR', None) - else: - mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir)) - diff --git a/meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch deleted file mode 100644 index 2d80474..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH] Support building allarch recipes again - -This registers "allarch" as a known CPU family. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Peter Kjellerstedt - ---- - mesonbuild/envconfig.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index d1be65b..90f3573 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ _T = T.TypeVar('_T') - - - known_cpu_families = ( -+ 'allarch', - 'aarch64', - 'alpha', - 'arc', diff --git a/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch deleted file mode 100644 index 5d7bdc2..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch +++ /dev/null @@ -1,125 +0,0 @@ -From f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -Date: Wed, 15 Nov 2017 15:05:01 +0100 -Subject: [PATCH] native_bindir - -Some libraries, like QT, have pre-processors that convert their input -files into something that the cross-compiler can process. We find the -path of those pre-processors via pkg-config-native instead of -pkg-config. - -This path forces the use of pkg-config-native for host_bins arguments. - -There are some discussions upstream to merge this patch, but I presonaly believe -that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ricardo Ribalda Delgado - ---- - mesonbuild/dependencies/base.py | 19 +++++++++++-------- - mesonbuild/dependencies/ui.py | 6 +++--- - 2 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 368a4bc..9fc398e 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -183,7 +183,7 @@ class Dependency: - def get_exe_args(self, compiler): - return [] - -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): - raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) - - def get_configtool_variable(self, variable_name): -@@ -261,7 +261,7 @@ class InternalDependency(Dependency): - setattr(result, k, copy.deepcopy(v, memo)) - return result - -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): - raise DependencyException('Method "get_pkgconfig_variable()" is ' - 'invalid for an internal dependency') - -@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency): - return s.format(self.__class__.__name__, self.name, self.is_found, - self.version_reqs) - -- def _call_pkgbin_real(self, args, env): -- cmd = self.pkgbin.get_command() + args -+ def _call_pkgbin_real(self, args, env, use_native=False): -+ if use_native: -+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args -+ else: -+ cmd = self.pkgbin.get_command() + args - p, out, err = Popen_safe(cmd, env=env) - rc, out, err = p.returncode, out.strip(), err.strip() - call = ' '.join(cmd) - mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) - return rc, out, err - -- def _call_pkgbin(self, args, env=None): -+ def _call_pkgbin(self, args, env=None, use_native=False): - # Always copy the environment since we're going to modify it - # with pkg-config variables - if env is None: -@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency): - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache - if (self.pkgbin, targs, fenv) not in cache: -- cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) -+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) - return cache[(self.pkgbin, targs, fenv)] - - def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency): - (self.name, out_raw)) - self.link_args, self.raw_link_args = self._search_libs(out, out_raw) - -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): - options = ['--variable=' + variable_name, self.name] - - if 'define_variable' in kwargs: -@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency): - - options = ['--define-variable=' + '='.join(definition)] + options - -- ret, out, err = self._call_pkgbin(options) -+ ret, out, err = self._call_pkgbin(options, use_native=use_native) - variable = '' - if ret != 0: - if self.required: -diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 95dfe2b..5f82890 100644 ---- a/mesonbuild/dependencies/ui.py -+++ b/mesonbuild/dependencies/ui.py -@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): - self.bindir = self.get_pkgconfig_host_bins(core) - if not self.bindir: - # If exec_prefix is not defined, the pkg-config file is broken -- prefix = core.get_pkgconfig_variable('exec_prefix', {}) -+ prefix = core.get_pkgconfig_variable('exec_prefix', {}, use_native=True) - if prefix: - self.bindir = os.path.join(prefix, 'bin') - -@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency): - applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] - for application in applications: - try: -- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {})) -+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}, use_native=True)) - except MesonException: - pass - -@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency): - QtBaseDependency.__init__(self, 'qt5', env, kwargs) - - def get_pkgconfig_host_bins(self, core): -- return core.get_pkgconfig_variable('host_bins', {}) -+ return core.get_pkgconfig_variable('host_bins', {}, use_native=True) - - def get_private_includes(self, mod_inc_dir, module): - return _qt_get_private_includes(mod_inc_dir, module, self.version) diff --git a/meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch b/meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch deleted file mode 100644 index 772395e..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch +++ /dev/null @@ -1,23 +0,0 @@ -meson.build files that use cc.run() in native builds can silently fallback to -meson.get_cross_property() in cross builds without an exe-wrapper, but there's -no way to know that this is happening. - -As the defaults may be pessimistic (for example, disabling the support for a -feature that should be enabled) emit a warning when the default is used, so that -the recipe can explicitly set the cross property as relevant. - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/5071] -Signed-off-by: Ross Burton - -diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index 3c3cfae0..10e741ae 100644 ---- a/mesonbuild/interpreter.py -+++ b/mesonbuild/interpreter.py -@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject): - return props[propname] - except Exception: - if len(args) == 2: -+ mlog.warning('Cross property %s is using default value %s' % (propname, args[1])) - return args[1] - raise InterpreterException('Unknown cross property: %s.' % propname) - diff --git a/meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch deleted file mode 100644 index 4653a72..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Fri, 23 Nov 2018 15:28:28 +0000 -Subject: [PATCH] meson: Disable rpath stripping at install time - -We need to allow our rpaths generated through the compiler flags to make it into -our binaries. Therefore disable the meson manipulations of these unless there -is a specific directive to do something differently in the project. - -RP 2018/11/23 - -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] - ---- - mesonbuild/minstall.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 0be01fe..5406cab 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -512,8 +512,11 @@ class Installer: - if file_copied: - self.did_install_something = True - try: -- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -- install_name_mappings, verbose=False) -+ if install_rpath: -+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, -+ install_name_mappings, verbose=False) -+ else: -+ print("RPATH changes at install time disabled") - except SystemExit as e: - if isinstance(e.code, int) and e.code == 0: - pass diff --git a/meta-gnome/recipes-devtools/meson/meson/meson-setup.py b/meta-gnome/recipes-devtools/meson/meson/meson-setup.py deleted file mode 100755 index 808e2a0..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/meson-setup.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 - -import os -import string -import sys - -class Template(string.Template): - delimiter = "@" - -class Environ(): - def __getitem__(self, name): - val = os.environ[name] - val = ["'%s'" % x for x in val.split()] - val = ', '.join(val) - val = '[%s]' % val - return val - -try: - sysroot = os.environ['OECORE_NATIVE_SYSROOT'] -except KeyError: - print("Not in environment setup, bailing") - sys.exit(1) - -template_file = os.path.join(sysroot, 'usr/share/meson/meson.cross.template') -cross_file = os.path.join(sysroot, 'usr/share/meson/%smeson.cross' % os.environ["TARGET_PREFIX"]) - -with open(template_file) as in_file: - template = in_file.read() - output = Template(template).substitute(Environ()) - with open(cross_file, "w") as out_file: - out_file.write(output) diff --git a/meta-gnome/recipes-devtools/meson/meson/meson-wrapper b/meta-gnome/recipes-devtools/meson/meson/meson-wrapper deleted file mode 100755 index d4ffe60..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/meson-wrapper +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ -z "$OECORE_NATIVE_SYSROOT" ]; then - echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 -fi - -# If these are set to a cross-compile path, meson will get confused and try to -# use them as native tools. Unset them to prevent this, as all the cross-compile -# config is already in meson.cross. -unset CC CXX CPP LD AR NM STRIP - -exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ - --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \ - "$@" diff --git a/meta-gnome/recipes-devtools/meson/meson_0.55.1.bb b/meta-gnome/recipes-devtools/meson/meson_0.55.1.bb deleted file mode 100644 index de9b905..0000000 --- a/meta-gnome/recipes-devtools/meson/meson_0.55.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include meson.inc - -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb b/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb deleted file mode 100644 index 67add2c..0000000 --- a/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb +++ /dev/null @@ -1,65 +0,0 @@ -include meson.inc - -inherit nativesdk -inherit siteinfo - -SRC_URI += "file://meson-setup.py \ - file://meson-wrapper" - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) - -# The cross file logic is similar but not identical to that in meson.bbclass, -# since it's generating for an SDK rather than a cross-compile. Important -# differences are: -# - We can't set vars like CC, CXX, etc. yet because they will be filled in with -# real paths by meson-setup.sh when the SDK is extracted. -# - Some overrides aren't needed, since the SDK injects paths that take care of -# them. -do_install_append() { - install -d ${D}${datadir}/meson - cat >${D}${datadir}/meson/meson.cross.template < +Date: Wed, 3 Feb 2021 14:22:51 -0800 +Subject: [PATCH] Do not use AC_HEADER_STDC + +This macro is removed in autotools 2.70+ and it can be expected that C90 +headers are always available [1] + +Upstream-Status: Pending + +[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.70/autoconf.html#index-AC_005fHEADER_005fSTDC + +Signed-off-by: Khem Raj +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 01b61097..2823ecd7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,14 +101,8 @@ AM_WITH_DMALLOC + # + # Checks for header files. + # +-AC_HEADER_STDC + AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h]) + +-# REQUIRE standard C headers +-if test "$ac_cv_header_stdc" != yes; then +- AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.]) +-fi +- + # + # Checks for typedefs, structures, and compiler characteristics. + # +-- +2.30.0 + diff --git a/meta-gnome/recipes-devtools/yasm/yasm_git.bb b/meta-gnome/recipes-devtools/yasm/yasm_git.bb index 5385626..cacdd74 100644 --- a/meta-gnome/recipes-devtools/yasm/yasm_git.bb +++ b/meta-gnome/recipes-devtools/yasm/yasm_git.bb @@ -9,7 +9,9 @@ DEPENDS += "flex-native bison-native xmlto-native" PV = "1.3.0+git${SRCPV}" # v1.3.0 SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" -SRC_URI = "git://github.com/yasm/yasm.git" +SRC_URI = "git://github.com/yasm/yasm.git \ + file://0001-Do-not-use-AC_HEADER_STDC.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-freedesktop/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-gnome/recipes-freedesktop/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch index 278b90e..bc4729a 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch +++ b/meta-gnome/recipes-freedesktop/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -1,7 +1,12 @@ -From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001 +From e11dedcf3dc5514f4116e861a19d321dd802c0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 12 May 2019 21:58:02 +0200 Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Andreas=20M=C3=BCller?= dependeny MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -12,6 +17,7 @@ We do not have udev-native so it is a dependeny we cannot satisfy Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller + --- lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ lib/colord/cd-icc.c | 62 ------------------------------------------- @@ -89,11 +95,11 @@ index a5e2328..dec509a 100644 +} + diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c -index f231814..2c8fe77 100644 +index 8beec43..398ff7a 100644 --- a/lib/colord/cd-icc.c +++ b/lib/colord/cd-icc.c -@@ -3094,68 +3094,6 @@ out: - return ret; +@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) + return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); } -/** @@ -161,6 +167,3 @@ index f231814..2c8fe77 100644 /** * cd_icc_create_from_edid: * @icc: A valid #CdIcc --- -2.20.1 - diff --git a/meta-gnome/recipes-freedesktop/colord/colord.inc b/meta-gnome/recipes-freedesktop/colord/colord.inc index 7497fed..1191aec 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord.inc +++ b/meta-gnome/recipes-freedesktop/colord/colord.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ " -PV = "1.4.4" +PV = "1.4.5" SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" -SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" +SRC_URI[md5sum] = "adc4501b54fb8667ee99f64cff87e12d" +SRC_URI[sha256sum] = "b774ea443d239f4a2ee1853bd678426e669ddeda413dcb71cea1638c4d6c5e17" diff --git a/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.4.7.bb b/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.4.7.bb deleted file mode 100644 index b7439e6..0000000 --- a/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.4.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Provides D-Bus service makes location information available to location-aware applications" -HOMEPAGE = "https://www.freedesktop.org/wiki/Software/GeoClue/" - -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd \ - file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d" - -SRC_URI = "https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-${PV}.tar.xz" -SRC_URI[md5sum] = "e50086e742740413669ab72d8572db05" -SRC_URI[sha256sum] = "d17b96bb5799a84723385ea5704235565e9c3dedd2b7afac475a06e550ae0ea6" - -DEPENDS = "json-glib glib-2.0 libnotify intltool-native libsoup-2.4" -FILES_${PN} += "/usr/lib/systemd /usr/share/dbus-1" - -inherit gettext pkgconfig autotools gobject-introspection - -EXTRA_OECONF = "--disable-gtk-doc --disable-3g-source --disable-modem-gps-source --disable-cdma-source --disable-nmea-source --enable-demo-agent=no" - -do_install_append () { - rm ${D}${datadir}/applications/geoclue-demo-agent.desktop - rm ${D}${datadir}/applications/geoclue-where-am-i.desktop -} diff --git a/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb b/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb new file mode 100644 index 0000000..6c0b922 --- /dev/null +++ b/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb @@ -0,0 +1,47 @@ +SUMMARY = "The Geolocation Service" +DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ +The primary goal of the Geoclue project is to make creating location-aware applications \ +as simple as possible, while the secondary goal is to ensure that no application \ +can access location information without explicit permission from user." +LICENSE = "GPLv2.0+" +SECTION = "console/network" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" + +DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +SRCREV = "3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8" +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" + +# Without this line, package is declared a library and named libgeoclue* +AUTO_LIBNAME_PKGS = "" + +PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" +PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" +PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" +PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" +PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" +PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" + +GTKDOC_MESON_OPTION = "gtk-doc" + +EXTRA_OEMESON += " \ + -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ + -Ddemo-agent=false \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${libdir} \ + ${systemd_unitdir} \ + ${prefix}/libexec \ +" + +FILES_${PN}-dev += " \ + ${datadir}/dbus-1/interfaces \ + ${datadir}/gir-1.0 \ +" diff --git a/meta-gnome/recipes-freedesktop/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-gnome/recipes-freedesktop/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch new file mode 100644 index 0000000..70d7307 --- /dev/null +++ b/meta-gnome/recipes-freedesktop/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch @@ -0,0 +1,34 @@ +From 746c690f57b52e6fe21cc2a11b5bb71d25af3128 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 13 Dec 2017 16:15:57 +0100 +Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index aad673e..6b37179 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -59,7 +59,10 @@ PLYMOUTH_LIBS="-lm -lrt -ldl" + AC_SUBST(PLYMOUTH_CFLAGS) + AC_SUBST(PLYMOUTH_LIBS) + +-AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent]) ++AC_ARG_WITH(systemd-tty-ask-password-agent, AS_HELP_STRING([--with-systemd-tty-ask-password-agent],[path of systemd-tty-ask-password-agent]),SYSTEMD_ASK_PASSWORD_AGENT=${withval},SYSTEMD_ASK_PASSWORD_AGENT=/bin/systemd-tty-ask-password-agent) ++AC_SUBST(SYSTEMD_ASK_PASSWORD_AGENT) ++ ++# checked: UDEVADM is not used + AC_PATH_PROG([UDEVADM], [udevadm]) + + AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with pango, disabled there is no encryption prompts]),enable_pango=$enableval,enable_pango=yes) +-- +2.9.5 + diff --git a/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.5.bb b/meta-gnome/recipes-freedesktop/plymouth/plymouth.bb similarity index 51% rename from meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.5.bb rename to meta-gnome/recipes-freedesktop/plymouth/plymouth.bb index b1dd49e..bb3cb47 100644 --- a/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.5.bb +++ b/meta-gnome/recipes-freedesktop/plymouth/plymouth.bb @@ -13,65 +13,65 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libcap libpng cairo dbus udev" +DEPENDS_append_libc-musl = " musl-rpmatch" PROVIDES = "virtual/psplash" RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" -SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz file://plymouthd.conf file://subgraph.png" -SRC_URI[md5sum] = "8a25d23f3ae732af300a56fa33cacff2" -SRC_URI[sha256sum] = "ecae257f351d098340542a5bc06de029404c24dcee87e6ebb2abd5ef117fce86" +SRCREV = "e55447500fa95a0cc59c741296030ed91a2986dc" +SRC_URI = " \ + git://gitlab.freedesktop.org/plymouth/plymouth.git;branch=master;protocol=https \ + file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ + " +S = "${WORKDIR}/git" EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ --with-logo=${LOGO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '--disable-systemd-integration', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge','--without-system-root-install','--with-system-root-install',d)} \ " -PACKAGECONFIG ??= "pango" +PACKAGECONFIG ??= "pango initrd" PACKAGECONFIG_append_x86 = " drm" PACKAGECONFIG_append_x86-64 = " drm" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" -#PACKAGECONFIG[initrd] = ",,," +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" +PACKAGECONFIG[initrd] = ",,," -LOGO = "${WORKDIR}/subgraph.png" +LOGO ??= "${datadir}/plymouth/bizcom.png" inherit autotools pkgconfig systemd gettext +LDFLAGS_append_libc-musl = " -lrpmatch" + do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${B}/systemd-units/*.service ${D}${systemd_unitdir}/system - install -m 644 ${B}/systemd-units/systemd-ask-password-plymouth.path ${D}${systemd_unitdir}/system # Remove /var/run from package as plymouth will populate it on startup rm -fr "${D}${localstatedir}/run" - rm -rf ${D}/etc/plymouth/plymouthd.conf - install -d ${D}/etc/plymouth - install -m 644 ${WORKDIR}/plymouthd.conf ${D}/etc/plymouth/plymouthd.conf - -# if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then + if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then rm -rf "${D}${libexecdir}" -# fi - - # https://patchwork.openembedded.org/patch/146656/ - sed -i 's#ExecStart= -#ExecStart=/usr/bin/systemd-tty-ask-password-agent -#' ${D}${systemd_unitdir}/system/systemd-ask-password-plymouth.service - - # https://aur.archlinux.org/packages/plymouth/#comment-613012 - printf "RuntimeDirectory=plymouth\n" >> ${D}${systemd_unitdir}/system/systemd-ask-password-plymouth.service - + fi } -#PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" +do_configure_prepend() { + touch ${S}/ABOUT-NLS + mkdir -p ${S}/build-tools + touch ${S}/build-tools/config.rpath +} + +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" PACKAGES =+ "${PN}-set-default-theme" -#FILES_${PN}-initrd = "${libexecdir}/plymouth/*" +FILES_${PN}-initrd = "${libexecdir}/plymouth/*" FILES_${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" FILES_${PN} += "${systemd_unitdir}/system/*" FILES_${PN}-dbg += "${libdir}/plymouth/renderers/.debug" -#RDEPENDS_${PN}-initrd = "bash dracut" +RDEPENDS_${PN}-initrd = "bash dracut" RDEPENDS_${PN}-set-default-theme = "bash" SYSTEMD_SERVICE_${PN} = "plymouth-start.service" + diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit_0.118.bb b/meta-gnome/recipes-freedesktop/polkit/polkit_0.118.bb index 8342a77..4c9124c 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit_0.118.bb +++ b/meta-gnome/recipes-freedesktop/polkit/polkit_0.118.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ DEPENDS = "expat glib-2.0 intltool-native mozjs78" -inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection +inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb deleted file mode 100644 index 8e42a4b..0000000 --- a/meta-gnome/recipes-freedesktop/upower/upower_0.99.10.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Linux power management daemon" -HOMEPAGE = "http://upower.freedesktop.org" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" - -SRC_URI = "https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" -SRC_URI[md5sum] = "ac6b6bee31110fd8478a8e881c40fba6" -SRC_URI[sha256sum] = "642251b97080ede8be6dbfeaf8f30ff6eadd6eb27aa137bc50f5b9b2295ba29d" - - -DEPENDS = "libusb1 glib-2.0 intltool-native libgudev" - -inherit gettext pkgconfig autotools gobject-introspection - -FILES_${PN} += "\ - ${datadir}/dbus-1 \ - ${systemd_system_unitdir} \ -" - -EXTRA_OECONF = "--enable-man-pages=no --enable-gtk-doc=no" - diff --git a/meta-gnome/recipes-freedesktop/upower/upower_0.99.11.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.11.bb new file mode 100644 index 0000000..d6c89a6 --- /dev/null +++ b/meta-gnome/recipes-freedesktop/upower/upower_0.99.11.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" + +SRC_URI = " \ + http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +" +SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" +SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" + +inherit autotools pkgconfig gettext gobject-introspection systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ + --without-systemdutildir --without-systemdsystemunitdir,systemd" + +EXTRA_OECONF = " --with-backend=linux" + +SYSTEMD_SERVICE_${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +do_configure_prepend() { + sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am + sed -i -e 's: doc : :g' ${S}/Makefile.am +} + +RDEPENDS_${PN} += "dbus" +RRECOMMENDS_${PN} += "pm-utils" +FILES_${PN} += "${datadir}/dbus-1/ \ + ${base_libdir}/udev/* \ +" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb similarity index 76% rename from meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb rename to meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 3bb9ec4..48d1742 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -3,8 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "716cf730995cf133c2c443556a66a50c" -SRC_URI[archive.sha256sum] = "45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58" +SRC_URI[archive.sha256sum] = "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533" DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native" @@ -15,6 +14,7 @@ inherit gnomebase bash-completion vala SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch" FILES_${PN} += " \ + ${systemd_user_unitdir} \ ${datadir}/dbus-1 \ ${libdir}/gio/modules/*.so \ " diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_40.0.bb similarity index 82% rename from meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb rename to meta-gnome/recipes-gnome/gdm/gdm_40.0.bb index a945985..3dbef78 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_40.0.bb @@ -19,12 +19,16 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd pam" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "948dec80099d9d3a2adacc5788964043" -SRC_URI[archive.sha256sum] = "46d4415c39c94ccee81fbac21102e2ebcd284d39858c893e759900b1e88435ba" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +SRC_URI[archive.sha256sum] = "5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e" SRC_URI += "file://gdm.conf" -WARN_QA_remove = "unknown-configure-option" +ERROR_QA_remove = "unknown-configure-option" FILES_${PN} += " \ ${libdir}/systemd/system/gdm.service \ diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb deleted file mode 100644 index 759d22c..0000000 --- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Convenience library for geocoding (finding longitude and latitude from a street address)" -HOMEPAGE = "https://developer.gnome.org/geocode-glib/stable/" - -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext gobject-introspection - -SRC_URI[archive.md5sum] = "98c0a7d175014d5865be7d3f774ef14c" -SRC_URI[archive.sha256sum] = "ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaaecc75e746fbeee" - -FILES_${PN} += "${datadir}/icons/gnome" - -GIR_MESON_OPTION = 'enable-introspection' -GIR_MESON_ENABLE_FLAG = 'true' -GIR_MESON_DISABLE_FLAG = 'false' - -DEPENDS = "json-glib libsoup-2.4 glib-2.0 glib-2.0-native" -EXTRA_OEMESON = "-Denable-installed-tests=false -Denable-gtk-doc=false --buildtype=release" - diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb new file mode 100644 index 0000000..c0f3c27 --- /dev/null +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A convenience library for the geocoding" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_OPTION = "enable-introspection" +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even + +DEPENDS = " \ + json-glib \ + libsoup-2.4 \ +" + +SRC_URI[archive.md5sum] = "e1ef140a11a543643d170dc701009e39" +SRC_URI[archive.sha256sum] = "01fe84cfa0be50c6e401147a2bc5e2f1574326e2293b55c69879be3e82030fd1" + +EXTRA_OEMESON = "-Denable-installed-tests=false" diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb deleted file mode 100644 index 6802ebe..0000000 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -SRC_URI[archive.md5sum] = "0a618c5b053106d1801d89cc77385419" -SRC_URI[archive.sha256sum] = "58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a" -DEPENDS = "glib-2.0 exiv2" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase python3native gobject-introspection - -EXTRA_OEMESON = "-Dvapi=false" - diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb new file mode 100644 index 0000000..12ea593 --- /dev/null +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "A GObject-based Exiv2 wrapper" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "exiv2" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.md5sum] = "44a3cfeab1afd83a71e852835d24e656" +SRC_URI[archive.sha256sum] = "8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77" + +EXTRA_OEMESON = " \ + -Dvapi=false \ + -Dpython2_girdir=no \ + -Dpython3_girdir=no \ +" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.68.0.bb similarity index 68% rename from meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.68.0.bb index 06cf3bf..677a478 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.68.0.bb @@ -2,12 +2,11 @@ SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs" LICENSE = "MIT & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" inherit gnomebase gettext gobject-introspection meson -WARN_QA_remove = "unknown-configure-option" +ERROR_QA_remove = "unknown-configure-option" export GIDATADIR="${STAGING_DATADIR_NATIVE}/gobject-introspection-1.0" @@ -17,8 +16,7 @@ EXTRA_OEMESON = " -Dskip_dbus_tests=true -Dskip_gtk_tests=true -Dinstalled_tests CFLAGS_append = " -include ${STAGING_INCDIR}/mozjs-78/js/RequiredDefines.h" SRC_URI += " file://0001-Fix-tests-that-cannot-run.patch" -SRC_URI[archive.md5sum] = "d43a936f5edd8ff36ecc54684b26d82a" -SRC_URI[archive.sha256sum] = "f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8" +SRC_URI[archive.sha256sum] = "f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef" RDEPENDS_${PN} += "libmozjs-78" diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 1e9ae6f..5fe3aa8 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -19,7 +19,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 532b086..98468a3 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -817,14 +817,14 @@ pkg.generate(libgio, +@@ -820,14 +820,14 @@ pkg.generate(libgio, 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), 'giomoduledir=' + pkgconfig_giomodulesdir, @@ -46,7 +46,7 @@ diff --git a/glib/meson.build b/glib/meson.build index aaf5f00..1e0992b 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -392,9 +392,9 @@ pkg.generate(libglib, +@@ -375,9 +375,9 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index adda29c..597864d 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -17,7 +17,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 2ef60ed..532b086 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 5d142db..8a6d46d 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -1,4 +1,4 @@ -From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 +From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 @@ -14,19 +14,19 @@ Signed-off-by: Alexander Kanavin 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index dab65d2..e8bb2ee 100644 +index 3a19c82..b762835 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -12,7 +12,7 @@ test_c_args = [ - '-UG_DISABLE_ASSERT', - ] +@@ -27,7 +27,7 @@ test_c_args = [ + endif # libutil.length() > 0 + endif # build_machine.system() == 'linux' -if host_machine.system() == 'windows' +if host_system == 'windows' common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -133,7 +133,7 @@ else +@@ -148,7 +148,7 @@ else endif # Test programs buildable on UNIX only @@ -35,7 +35,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -385,7 +385,7 @@ if host_machine.system() != 'windows' +@@ -402,7 +402,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only @@ -44,7 +44,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += {'win32-streams' : {}} endif -@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -472,7 +472,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif @@ -54,10 +54,10 @@ index dab65d2..e8bb2ee 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 3dedafc..94605e6 100644 +index 6eb23e8..36eb919 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -142,7 +142,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif @@ -67,7 +67,7 @@ index 3dedafc..94605e6 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index e1b4b79..afb6eaa 100644 +index 47f3a5c..7ea7ad1 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch new file mode 100644 index 0000000..fbdd4c2 --- /dev/null +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch @@ -0,0 +1,26 @@ +From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 20 Dec 2020 22:01:43 +0100 +Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds + +This may be necessary on overloaded CI systems. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + gio/tests/codegen.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py +index 51de0ed..ca98c9d 100644 +--- a/gio/tests/codegen.py ++++ b/gio/tests/codegen.py +@@ -55,7 +55,7 @@ class TestCodegen(unittest.TestCase): + cwd = "" + + def setUp(self): +- self.timeout_seconds = 10 # seconds per test ++ self.timeout_seconds = 100 # seconds per test + self.tmpdir = tempfile.TemporaryDirectory() + self.cwd = os.getcwd() + os.chdir(self.tmpdir.name) diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch index 194f3e9..44482dd 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch @@ -18,7 +18,7 @@ diff --git a/meson.build b/meson.build index afb6eaa..6aa70f5 100644 --- a/meson.build +++ b/meson.build -@@ -1790,7 +1790,7 @@ atomicdefine = ''' +@@ -1692,7 +1692,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index f0017c7..41ecfa1 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -18,7 +18,7 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 788cf97..dab65d2 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -204,7 +204,7 @@ if host_machine.system() != 'windows' +@@ -203,7 +203,7 @@ if host_machine.system() != 'windows' # Test programs that need to bring up a session bus (requires dbus-daemon) have_dbus_daemon = find_program('dbus-daemon', required : false).found() @@ -27,7 +27,7 @@ index 788cf97..dab65d2 100644 annotate_args = [ '--annotate', 'org.project.Bar', 'Key1', 'Value1', '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -550,12 +550,12 @@ if installed_tests_enabled +@@ -548,12 +548,12 @@ if installed_tests_enabled endforeach endif @@ -42,7 +42,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate-source', -@@ -579,7 +579,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_gresource = custom_target('test.gresource', input : 'test.gresource.xml', output : 'test.gresource', @@ -51,7 +51,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -590,7 +590,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_c = custom_target('test_resources2.c', input : 'test3.gresource.xml', output : 'test_resources2.c', @@ -60,7 +60,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -601,7 +601,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_h = custom_target('test_resources2.h', input : 'test3.gresource.xml', output : 'test_resources2.h', @@ -69,7 +69,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -613,7 +613,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c', @@ -78,7 +78,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -624,7 +624,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_c = custom_target('digit_test_resources.c', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.c', @@ -87,7 +87,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -635,7 +635,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_h = custom_target('digit_test_resources.h', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.h', @@ -96,7 +96,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -670,11 +670,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() ld = find_program('ld', required : false) @@ -110,7 +110,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -686,7 +686,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources_binary_c = custom_target('test_resources_binary.c', input : 'test5.gresource.xml', output : 'test_resources_binary.c', diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch index 72bee25..e300176 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 +From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -13,25 +13,24 @@ Signed-off-by: Ross Burton Port patch to 2.48 Signed-off-by: Jussi Kukkonen - --- gio/giomodule.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index c420260..a023745 100644 +index ca1daf2..954a250 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -49,6 +49,8 @@ - #include "gmemorymonitordbus.h" +@@ -51,6 +51,8 @@ #ifdef G_OS_WIN32 #include "gregistrysettingsbackend.h" + #include "giowin32-priv.h" +#else +#include #endif #include -@@ -1163,7 +1165,15 @@ get_gio_module_dir (void) +@@ -1212,7 +1214,15 @@ get_gio_module_dir (void) NULL); g_free (install_dir); #else @@ -48,3 +47,6 @@ index c420260..a023745 100644 #endif } +-- +2.25.1 + diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.66.1.bb b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.68.0.bb similarity index 73% rename from meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.66.1.bb rename to meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.68.0.bb index c803dbc..94d2431 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.66.1.bb +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.68.0.bb @@ -16,11 +16,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ + file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ " - SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60" +SRC_URI[sha256sum] = "67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. @@ -29,7 +29,7 @@ def find_meson_cross_files(d): if bb.data.inherits_class('native', d): return "" - corebase = d.getVar("COREBASE") + thisdir = os.path.normpath(d.getVar("THISDIR")) import collections sitedata = siteinfo_data(d) # filename -> found @@ -37,7 +37,12 @@ def find_meson_cross_files(d): for path in d.getVar("FILESPATH").split(":"): for element in sitedata: filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + if os.path.exists(filename): + bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) + continue + files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) items = ["--cross-file=" + k for k,v in files.items() if v] d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib.inc b/meta-gnome/recipes-gnome/glib-2.0/glib.inc index a0055d8..71777bc 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib.inc +++ b/meta-gnome/recipes-gnome/glib-2.0/glib.inc @@ -34,10 +34,6 @@ DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'T GTKDOC_MESON_OPTION = "gtk_doc" -# This avoids the need to depend on target python3, which in case of mingw is not even possible. -# meson's python configuration pokes into python3 configuration, so this provides the native config to it. -unset _PYTHON_SYSCONFIGDATA_NAME - S = "${WORKDIR}/glib-${PV}" PACKAGECONFIG ??= "system-pcre libmount \ @@ -170,7 +166,7 @@ RDEPENDS_${PN}-ptest += "\ ${PN}-locale-th \ python3-core \ python3-modules \ - python3-dbusmock \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-dbusmock', '', d)} \ ${PN}-codegen \ " diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb deleted file mode 100644 index 5b45c9a..0000000 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Provides functions, widgets, and gschemas for GNOME applications which want to use archives to transfer directories over the internet" -HOMEPAGE = "https://wiki.gnome.org/TingweiLan/GSoC2013Final" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "36ab263f477eeee3c95c9381766eb3c2" -SRC_URI[archive.sha256sum] = "0a34c377f8841abbf4c29bc848b301fbd8e4e20c03d7318c777c58432033657a" - -DEPENDS = "glib-2.0 gtk+3 glib-2.0-native gnome-common autoconf-archive libarchive" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" -} - -inherit gnomebase gobject-introspection vala - -EXTRA_OECONF = "" - diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb new file mode 100644 index 0000000..5e833a9 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "GNOME archive library" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + gtk+3 \ + libarchive \ +" + +inherit gnomebase gobject-introspection gtk-doc vala + +SRC_URI[archive.md5sum] = "3149496d0189623a8e1289bbab4d8385" +SRC_URI[archive.sha256sum] = "0e78713e6f0de339fdee16bab82753ae290fe80fa7b4ba6e3db8c1465b81d0f8" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" +} diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_40.0.bb similarity index 51% rename from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.38.0.bb rename to meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_40.0.bb index 80c5f0e..bb85442 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_40.0.bb @@ -3,13 +3,18 @@ SUMMARY = "Default GNOME desktop background images" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI[archive.md5sum] = "822d5ca042f5143903bee7711ceaaa92" -SRC_URI[archive.sha256sum] = "f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3" +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +SRC_URI[archive.sha256sum] = "46c3133a5ed7180347ae396962bf8827085f0f3b7cd9385452d623c4a167a2f6" FILES_${PN} += "\ ${datadir}/backgrounds/gnome \ ${datadir}/gnome-background-properties \ " -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb index dc2e41d..84f553f 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb @@ -10,7 +10,7 @@ SRC_URI[archive.sha256sum] = "0a068e3bddbbdab46991521e6624098579abe80da242398bdd DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" -WARN_QA_remove = "unknown-configure-option" +ERROR_QA_remove = "unknown-configure-option" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch index 9419f5a..8d12d87 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch @@ -1,4 +1,4 @@ -From 960f785681afa6c5ca835159172a4d0783ae5707 Mon Sep 17 00:00:00 2001 +From 379b93699b428ccb49f0d48ed1366a67f9ab5ffc Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 27 Oct 2020 16:43:34 -0400 Subject: [PATCH] Add options for Citadel and disabling GOA/CUPS @@ -15,7 +15,7 @@ Subject: [PATCH] Add options for Citadel and disabling GOA/CUPS 8 files changed, 107 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build -index 48044cc..8493433 100644 +index 9002169..a2106f6 100644 --- a/meson.build +++ b/meson.build @@ -114,6 +114,15 @@ if not libhandy_dep.found() @@ -36,7 +36,7 @@ index 48044cc..8493433 100644 @@ -124,7 +133,9 @@ gio_dep = dependency('gio-2.0') glib_dep = dependency('glib-2.0', version: '>= 2.56.0') - gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') + gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.33.4') gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90') +if enable_goa goa_dep = dependency('goa-1.0', version: goa_req_version) @@ -297,10 +297,10 @@ index 2f4fdc5..82f54bd 100644 panels_libs = [] foreach cappletname: panels diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c -index d425067..bb79e38 100644 +index e23da0b..b6aacfb 100644 --- a/shell/cc-panel-list.c +++ b/shell/cc-panel-list.c -@@ -392,11 +392,16 @@ static const gchar * const panel_order[] = { +@@ -386,11 +386,16 @@ static const gchar * const panel_order[] = { "background", "notifications", "search", @@ -318,7 +318,7 @@ index d425067..bb79e38 100644 /* Privacy page */ "location", "camera", -@@ -412,16 +417,24 @@ static const gchar * const panel_order[] = { +@@ -406,16 +411,24 @@ static const gchar * const panel_order[] = { "display", "mouse", "keyboard", diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.38.3.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_40.0.bb similarity index 88% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.38.3.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_40.0.bb index cd7ef63..8a51f4d 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.38.3.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_40.0.bb @@ -32,7 +32,12 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES += " pulseaudio systemd x11" -SRC_URI[archive.sha256sum] = "3b4a4b18ba91803dce133f443f9d1d1f5a1b6c26b7727876e0a699349f5696e3" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +SRC_URI[archive.sha256sum] = "ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1" # diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.38.3.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_40.0.bb similarity index 74% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.38.3.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_40.0.bb index 5b696d8..89f850e 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.38.3.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_40.0.bb @@ -7,10 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-icon-cache gconf mime pkgconfig upstream-version-is-even gobject-introspection -WARN_QA_remove = "unknown-configure-option" +ERROR_QA_remove = "unknown-configure-option" + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" SRC_URI += "file://0001-needs-stdint-include.patch" -SRC_URI[archive.sha256sum] = "bfe00257b2bb59fff04ac1c144804084d1c253e66f9d7408f6060bbf7ad1d831" +SRC_URI[archive.sha256sum] = "20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04" DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_40.1.bb similarity index 72% rename from meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb rename to meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_40.1.bb index 2a425e1..82476da 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_40.1.bb @@ -11,6 +11,7 @@ DEPENDS = " \ libnotify \ libsecret \ libpwquality \ + libhandy \ udisks2 \ libxml2-native \ " @@ -27,7 +28,12 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" EXTRA_OEMESON += "-Dman=false" -SRC_URI[archive.sha256sum] = "7734ce668d9ec31286abd7944f95190210288fbc54704f05bc55cbd0340b5223" + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" +SRC_URI[archive.sha256sum] = "2a4b99ac11ca23394b28c5584b9e96284e8c5a4da65cf06207de54f42b1ff141" FILES_${PN} += " \ ${datadir}/metainfo \ diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb deleted file mode 100644 index f26e7be..0000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Password and keyring managing daemon" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gcr \ - libgcrypt \ -" - -inherit gnomebase gsettings features_check remove-libtool gettext upstream-version-is-even - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "38f0732845a510a8dff4f154c3406f65" -SRC_URI[archive.sha256sum] = "a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87" - - -EXTRA_OECONF = " \ - --disable-doc \ - --disable-ssh-agent \ -" - - -FILES_${PN} += " \ - ${datadir}/dbus-1/services \ - ${datadir}/p11-kit \ - ${datadir}/xdg-desktop-portal \ - ${base_libdir}/security/*${SOLIBSDEV} \ - ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ -" - -# fix | gnome-keyring-daemon: insufficient process capabilities, unsecure memory might get used -# This does not make it through pseudo so perform on-target - sigh -#pkg_postinst_ontarget_${PN} () { -# setcap cap_ipc_lock+ep `which gnome-keyring-daemon` -#} -#RDEPENDS_${PN} += "libcap-bin" diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb similarity index 52% rename from meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.38.0.bb rename to meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb index ba225a3..e0d5f31 100644 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb @@ -3,14 +3,16 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext gobject-introspection - -WARN_QA_remove = "unknown-configure-option" +inherit gnomebase gettext DEPENDS += "libx11 libxext glib-2.0 gtk+3 libcanberra glib-2.0-native libxml2-native libhandy" -SRC_URI[archive.md5sum] = "6550491108355c9d991e90b735ef3908" -SRC_URI[archive.sha256sum] = "e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +SRC_URI[archive.sha256sum] = "368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2" FILES_${PN} += "${datadir}/dbus-1/services" FILES_${PN}-dev += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb similarity index 78% rename from meta-gnome/recipes-gnome/gnome-session/gnome-session_3.38.0.bb rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb index 741e187..5fbf435 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb @@ -22,8 +22,12 @@ inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 systemd pam gobject-introspection-data" -SRC_URI[archive.md5sum] = "736024b46e2542b9b68adaa43f754f49" -SRC_URI[archive.sha256sum] = "7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +SRC_URI[archive.sha256sum] = "9c787829ee32e13e1508b9aee2b1d9ba42a02c48e6c8094e34f3e7f92af4df82" SRC_URI += " \ file://0001-Patch-locking-logout-so-it-does-not-disable-shutting.patch \ file://0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch \ diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_40.0.1.bb similarity index 70% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_40.0.1.bb index 324afc2..c0a0214 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_40.0.1.bb @@ -9,33 +9,28 @@ DEPENDS = "pango gnome-desktop xorgproto libnotify fontconfig libgudev libxext w FILES_${PN} += "\ ${systemd_user_unitdir} \ - ${libdir}/gnome-settings-daemon-3.0 \ + ${libdir}/gnome-settings-daemon-40 \ " FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" -SRC_URI[archive.md5sum] = "69988449f4e1be6b26a0109cc6019d47" -SRC_URI[archive.sha256sum] = "b7ed5b5fab9aad192ceed6a95be2805124e3c63c46891bbae076f7ec3fd6792e" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext meson-exe-wrapper -WARN_QA_remove = "unknown-configure-option" +ERROR_QA_remove = "unknown-configure-option" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +SRC_URI[archive.sha256sum] = "37dfac1b69a53e2e499228420259d6e134c1c06b74530af88fa855bda1187b21" SRC_URI += "file://0001-disable-power-tests-and-sharing.patch" -# allow cross build mixed with build of native tools -do_write_config_append() { - cat >${WORKDIR}/meson.native <= 3.90 are development versions, otherwise like upstream-version-is-even -UPSTREAM_CHECK_REGEX = "[^\d\.](?P3\.([1-8]?[02468])+(\.\d+)+)\.tar" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -# This should be in autotools.bbclass, but until something elses uses it putting -# it here avoids rebuilding everything. -export PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" - -do_configure_prepend() { - # Do this because the configure script is running ./libtool directly - rm -f libtool - ln -s ${TARGET_PREFIX}libtool libtool - #delete a file that will get confused with generated one in ${B} - rm -f ${S}/gtk/gtktypefuncs.c -} - -EXTRA_OECONF += " \ - --disable-glibtest \ - --disable-xinerama \ - --enable-modules \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ - " - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" -} - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" - -PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" -# this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build -PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" -PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" -PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib" -PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" - -prepare_gtk_scripts() { - mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 - - # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache - mkdir -p ${D}${libexecdir} - ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 -} - -do_install_append_class-target() { - prepare_gtk_scripts -} - -do_install_append_class-nativesdk() { - prepare_gtk_scripts -} - -do_install_append_class-native() { - create_wrapper ${D}/${bindir}/gtk-update-icon-cache \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache - create_wrapper ${D}/${bindir}/gtk-encode-symbolic-svg \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache -} - -PROVIDES += "gtk-icon-utils" -PACKAGES =+ "${PN}-demo" -LIBV = "3.0.0" - -FILES_${PN}-demo = "${bindir}/gtk3-demo \ - ${bindir}/gtk3-demo-application \ - ${bindir}/gtk3-icon-browser \ - ${bindir}/gtk3-widget-factory \ - ${datadir}/gtk-3.0/demo \ - ${datadir}/applications/gtk3-demo.desktop \ - ${datadir}/applications/gtk3-icon-browser.desktop \ - ${datadir}/applications/gtk3-widget-factory.desktop \ - ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ - ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" - -FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ - ${bindir}/gtk-query-immodules-3.0 \ - ${bindir}/gtk-launch \ - ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ - ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ - ${libdir}/gtk-3.0/modules/*.so" - -FILES_${PN}-dev += " \ - ${datadir}/gtk-3.0/valgrind \ - ${datadir}/gtk-3.0/gtkbuilder.rng \ - ${datadir}/gtk-3.0/include \ - ${datadir}/gettext/its \ - ${libdir}/gtk-3.0/include \ - ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ - ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ - ${libdir}/gtk-3.0/3.0.0/printbackends/*.la \ - ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ - ${libdir}/gtk-3.0/modules/*.la \ - ${bindir}/gtk-builder-convert \ - ${bindir}/gtk-encode-symbolic-svg \ - ${bindir}/gtk-builder-tool \ - ${bindir}/gtk-query-settings \ - " - -GTKBASE_RRECOMMENDS ?= "liberation-fonts \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - shared-mime-info \ - adwaita-icon-theme-symbolic \ - " - -GTKBASE_RRECOMMENDS_class-native ?= "\ - " - -GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" - -RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" -RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" - -PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" - -ALTERNATIVE_${PN} = "gtk-update-icon-cache" -ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" -ALTERNATIVE_PRIORITY = "30" - -python populate_packages_prepend () { - import os.path - - gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') - immodules_root = os.path.join(gtk_libdir, 'immodules') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - immodules = do_split_packages(d, immodules_root, r'^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s') - if immodules: - d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules)) - - do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') - - if (d.getVar('DEBIAN_NAMES')): - d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') -} diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.20.bb b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.20.bb deleted file mode 100644 index 0b949b3..0000000 --- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.20.bb +++ /dev/null @@ -1,20 +0,0 @@ -require gtk+3.inc - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://0001-Hardcoded-libtool.patch \ - file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ - file://0003-Add-disable-opengl-configure-option.patch \ - file://link_fribidi.patch \ - " - -SRC_URI[md5sum] = "b302acc0a4b42e2980ef18628f9ce951" -SRC_URI[sha256sum] = "2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta-gnome/recipes-gnome/gtk4/gtk4.inc b/meta-gnome/recipes-gnome/gtk4/gtk4.inc new file mode 100644 index 0000000..f1bf8c7 --- /dev/null +++ b/meta-gnome/recipes-gnome/gtk4/gtk4.inc @@ -0,0 +1,75 @@ +SUMMARY = "Multi-platform toolkit for creating GUIs" +DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ +set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." +HOMEPAGE = "http://www.gtk.org" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "libs" + +DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf libepoxy graphene libxi sassc-native \ + gdk-pixbuf-native wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" + +LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" + + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disbled" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection + +# versions >= 3.90 are development versions, otherwise like upstream-version-is-even +UPSTREAM_CHECK_REGEX = "[^\d\.](?P3\.([1-8]?[02468])+(\.\d+)+)\.tar" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +# This should be in autotools.bbclass, but until something elses uses it putting +# it here avoids rebuilding everything. +export PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" + +do_configure_prepend() { + # Do this because the configure script is running ./libtool directly + rm -f libtool + ln -s ${TARGET_PREFIX}libtool libtool + #delete a file that will get confused with generated one in ${B} + rm -f ${S}/gtk/gtktypefuncs.c +} + +EXTRA_OEMESON += " \ + -Ddemos=false \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" +} + +LIBV = "4.0.0" + + +FILES_${PN}_append = " ${datadir}/gtk-4.0/emoji " + +FILES_${PN}-dev += "\ + ${datadir}/gtk-4.0/valgrind \ + ${datadir}/gtk-4.0/gtk4builder.rng \ + ${datadir}/gettext/its \ +" + +RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" + + +python populate_packages_prepend () { + import os.path + + gtk_libdir = d.expand('${libdir}/gtk-4.0/${LIBV}') + immodules_root = os.path.join(gtk_libdir, 'immodules') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); + + immodules = do_split_packages(d, immodules_root, r'^im-(.*)\.so$', 'gtk4-immodule-%s', 'GTK input module for %s') + if immodules: + d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules)) + + do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s') + + if (d.getVar('DEBIAN_NAMES')): + d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-4.0') +} diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch b/meta-gnome/recipes-gnome/gtk4/gtk4/0001-Hardcoded-libtool.patch similarity index 100% rename from meta-gnome/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch rename to meta-gnome/recipes-gnome/gtk4/gtk4/0001-Hardcoded-libtool.patch diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch b/meta-gnome/recipes-gnome/gtk4/gtk4/0002-Do-not-try-to-initialize-GL-without-libGL.patch similarity index 100% rename from meta-gnome/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch rename to meta-gnome/recipes-gnome/gtk4/gtk4/0002-Do-not-try-to-initialize-GL-without-libGL.patch diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta-gnome/recipes-gnome/gtk4/gtk4/0003-Add-disable-opengl-configure-option.patch similarity index 100% rename from meta-gnome/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch rename to meta-gnome/recipes-gnome/gtk4/gtk4/0003-Add-disable-opengl-configure-option.patch diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3/link_fribidi.patch b/meta-gnome/recipes-gnome/gtk4/gtk4/link_fribidi.patch similarity index 100% rename from meta-gnome/recipes-gnome/gtk+/gtk+3/link_fribidi.patch rename to meta-gnome/recipes-gnome/gtk4/gtk4/link_fribidi.patch diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta-gnome/recipes-gnome/gtk4/gtk4/sort-resources.patch similarity index 100% rename from meta-gnome/recipes-gnome/gtk+/gtk+3/sort-resources.patch rename to meta-gnome/recipes-gnome/gtk4/gtk4/sort-resources.patch diff --git a/meta-gnome/recipes-gnome/gtk4/gtk4_4.1.2.bb b/meta-gnome/recipes-gnome/gtk4/gtk4_4.1.2.bb new file mode 100644 index 0000000..372d480 --- /dev/null +++ b/meta-gnome/recipes-gnome/gtk4/gtk4_4.1.2.bb @@ -0,0 +1,15 @@ +require gtk4.inc + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz \ + " + +SRC_URI[sha256sum] = "33407da437c5e5ac09e7a463ba3bd025da3d80ba1953b8bbe2bce97dd2609677" + +S = "${WORKDIR}/gtk-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2" diff --git a/meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb deleted file mode 100644 index eebb26b..0000000 --- a/meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "A collection library providing GObject based interfaces and classes for commonly used data structures" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI[archive.md5sum] = "e574b3952b93d219b5ec7c74c5892c33" -SRC_URI[archive.sha256sum] = "d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de" - -DEPENDS = "glib-2.0" - -PACKAGES += "${PN}-vala" -FILES_${PN}-vala = "${datadir}/vala/vapi" - -inherit gnomebase pkgconfig autotools - -EXTRA_OECONF = "" - diff --git a/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb new file mode 100644 index 0000000..832254a --- /dev/null +++ b/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \ +and classes for commonly used data structures." +HOMEPAGE = "http://live.gnome.org/Libgee" +SECTION = "libs" +DEPENDS = "glib-2.0" + +BBCLASSEXTEND = "native" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +PE = "1" +inherit gnomebase vala gobject-introspection + +do_configure_prepend() { + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f m4/$i + done +} + +SRC_URI[archive.md5sum] = "4d7d6f1f8054f1b3466c752ac2e50946" +SRC_URI[archive.sha256sum] = "524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb deleted file mode 100644 index 5b4628c..0000000 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Location and timezone database and weather lookup library" -HOMEPAGE = "https://wiki.gnome.org/Projects/LibGWeather" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI[archive.md5sum] = "d6081108f9c224c5cb594f8ccb025db9" -SRC_URI[archive.sha256sum] = "de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450" - -DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 itstool-native geocode-glib glib-2.0-native" - -WARN_QA_remove = "unknown-configure-option" - -FILES_${PN} += "${datadir}/glib-2.0/schemas" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext -FILES_${PN} += "${datadir}/icons" - -EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true" - diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb new file mode 100644 index 0000000..95e9756 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "Location and timezone database and weather lookup library" +HOMEPAGE = "https://wiki.gnome.org/Projects/LibGWeather" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit meson pkgconfig gobject-introspection gettext + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +GNOME_COMPRESS_TYPE ?= "xz" +GNOMEBN ?= "${BPN}" +SRC_URI[archive.sha256sum] = "ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 python3-pygobject-native itstool-native geocode-glib glib-2.0-native" + +ERROR_QA_remove = "unknown-configure-option" + +FILES_${PN} += "${datadir}/glib-2.0/schemas" + + +#EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true" + +SECTION ?= "x11/gnome" + +FILES_${PN} += "${datadir}/application-registry \ + ${datadir}/mime-info \ + ${datadir}/mime/packages \ + ${datadir}/mime/application \ + ${datadir}/gnome-2.0 \ + ${datadir}/polkit* \ + ${datadir}/GConf \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/appdata \ + ${datadir}/icons \ +" + +FILES_${PN}-doc += "${datadir}/devhelp" + +do_install_append() { + rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* + rm -f ${D}${datadir}/applications/*.cache +} diff --git a/meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb b/meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb deleted file mode 100644 index ed65fee..0000000 --- a/meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A library full of GTK widgets for mobile phones" -HOMEPAGE = "https://gitlab.gnome.org/GNOME/libhandy" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "glib-2.0 glib-2.0-native libxml2-native gtk+3" -GIR_MESON_ENABLE_FLAG = "enabled" -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase vala gobject-introspection - -SRC_URI[archive.md5sum] = "3cdc0b2274b41770ad4758e612f4c16d" -SRC_URI[archive.sha256sum] = "a9398582f47b7d729205d6eac0c068fef35aaf249fdd57eea3724f8518d26699" - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb b/meta-gnome/recipes-gnome/mutter/mutter_40.0.bb similarity index 87% rename from meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb rename to meta-gnome/recipes-gnome/mutter/mutter_40.0.bb index 8655cb5..77a051e 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_40.0.bb @@ -35,14 +35,19 @@ DEPENDS = " \ gobject-introspection-native \ " -SRC_URI += " file://0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch" RDEPENDS_${PN} += " xserver-xorg-xwayland zenity" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check -SRC_URI[archive.sha256sum] = "b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" +SRC_URI += " file://0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch" + +SRC_URI[archive.sha256sum] = "7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e" # x11 is still mandatory - see meson.build REQUIRED_DISTRO_FEATURES = "x11 systemd" @@ -54,6 +59,7 @@ LOGIND ?= "systemd" EXTRA_OEMESON += " \ -Dremote_desktop=false \ + -Dtests=false \ -Dprofiler=false \ -Dcogl_tests=false \ -Dlibwacom=true \ @@ -62,11 +68,7 @@ EXTRA_OEMESON += " \ -Dgles2_libname=libGLESv2.so.2 \ " -MUTTER_API_NAME = "mutter-7" - -#do_compile_prepend() { -# export GIR_EXTRA_LIBS_PATH="${B}/cogl/cogl/.libs:${B}/cogl/cogl-pango/.libs:${B}/cogl/cogl-path/.libs:${B}/clutter/clutter/.libs" -#} +MUTTER_API_NAME = "mutter-8" do_install_append() { # Add gir links in standard paths. That makes dependents life much easier diff --git a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.18.0.bb new file mode 100644 index 0000000..bc3e66c --- /dev/null +++ b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.18.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" + +GNOMEBASEBUILDCLASS = "meson" +inherit features_check gnomebase gsettings gtk-icon-cache gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b" + +# We don't not have ubuntu's appindicator (yet?) +EXTRA_OEMESON = "-Dappindicator=no" +# We currently don't build NetworkManager with libteamdctl support +EXTRA_OEMESON += "-Dteam=false" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" diff --git a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.24.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.24.bb deleted file mode 100644 index e6da1ab..0000000 --- a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.24.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Applet for managing network connections" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gcr iso-codes networkmanager libgudev gtk+3 intltool-native modemmanager glib-2.0 libnotify libsecret glib-2.0-native" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext gobject-introspection - -SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050" -SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf" - -FILES_${PN} += "${datadir}/metainfo" - -EXTRA_OEMESON = "-Dwwan=false -Dteam=false -Dgcr=false -Dmobile_broadband_provider_info=false -Dgtk_doc=false -Dintrospection=true -Dselinux=false" diff --git a/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb b/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb deleted file mode 100644 index 49347df..0000000 --- a/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.28.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://xslt/mal-license.xsl;md5=b02305a5e9d23df0f83b0c61a8883509" - -SRC_URI[archive.md5sum] = "76907906611daae8f19a5276dd65f55d" -SRC_URI[archive.sha256sum] = "82dbfeea2359dfef8ee92c7580c7f03768d12f9bf67d839f03a5e9b0686dc1ac" - -DEPENDS = "yelp-xsl xmlto-native libxml2-native itstool-native" - -inherit gnomebase pkgconfig autotools - -EXTRA_OECONF = "" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb b/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb deleted file mode 100644 index 137678a..0000000 --- a/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.30.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[archive.md5sum] = "371f7379f1614e602f861922182bbfbe" -SRC_URI[archive.sha256sum] = "fcef31c5938c6654976bbabb8b5d0d9e49fa2ce79136db74ca213056fdb8cf39" - -DEPENDS = "intltool-native itstool-native" - -inherit gnomebase gettext - -EXTRA_OECONF = "" -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb new file mode 100644 index 0000000..af2bab3 --- /dev/null +++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Collection of scripts and build utilities for documentation" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ +" + +inherit gnomebase itstool + +DEPENDS += " \ + libxslt-native \ + libxml2-native \ + yelp-xsl \ +" + +SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e" +SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9" + +RDEPENDS_${PN} += "yelp-xsl" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb new file mode 100644 index 0000000..14a8850 --- /dev/null +++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "XSL stylesheets for the yelp help browser" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +inherit gnomebase gettext itstool + +DEPENDS += "libxml2" + +SRC_URI[archive.md5sum] = "7d71af68fff4a92bcb2b8989f126be6c" +SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3" + +RDEPENDS_${PN}_append_class-target = " libxml2 itstool" + +# ensure our native consumers are forced to inherit itstool +RDEPENDS_${PN}_append_class-native = " libxml2-native" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb b/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb new file mode 100644 index 0000000..b9263f5 --- /dev/null +++ b/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Help browser for the GNOME desktop" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ +" + +inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features_check mime-xdg + +# for webkitgtk +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "32f879293f79b4042edc46aa13d82c71" +SRC_URI[archive.sha256sum] = "fd4b3e23d31ad2bebe42ac8f80242b2d9bef51418bf62b59acdf2440bd94ed24" + +DEPENDS += " \ + libxml2-native \ + glib-2.0-native \ + gtk+3 \ + appstream-glib \ + libxslt \ + sqlite3 \ + webkitgtk \ + yelp-xsl \ +" + +do_configure_prepend() { + export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool +} + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/yelp-xsl \ +" + +RDEPENDS_${PN} += "yelp-xsl" diff --git a/meta-gnome/recipes-support/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch b/meta-gnome/recipes-support/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch new file mode 100644 index 0000000..f0ce6f1 --- /dev/null +++ b/meta-gnome/recipes-support/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch @@ -0,0 +1,27 @@ +From 277e1eca67fcc23cb31be7b826d83a19d9b89bd2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 22 Dec 2020 10:30:54 +0000 +Subject: [PATCH] pem.c: do not use rawmemchr() + +This is a glibc-only function, and causes build failures with +alternative libc implementations such as musl. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + ell/pem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ell/pem.c b/ell/pem.c +index 790f2c2..237ae02 100644 +--- a/ell/pem.c ++++ b/ell/pem.c +@@ -224,7 +224,7 @@ static uint8_t *pem_load_buffer(const void *buf, size_t buf_len, + + /* Check that each header line has a key and a colon */ + while (start < end) { +- const char *lf = rawmemchr(start, '\n'); ++ const char *lf = memchr(start, '\n', end - start); + const char *colon = memchr(start, ':', lf - start); + + if (!colon) diff --git a/meta-gnome/recipes-support/ell/ell_0.39.bb b/meta-gnome/recipes-support/ell/ell_0.39.bb new file mode 100644 index 0000000..68ec4cb --- /dev/null +++ b/meta-gnome/recipes-support/ell/ell_0.39.bb @@ -0,0 +1,24 @@ +SUMMARY = "Embedded Linux Library" +HOMEPAGE = "https://01.org/ell" +DESCRIPTION = "The Embedded Linux Library (ELL) provides core, \ +low-level functionality for system daemons. It typically has no \ +dependencies other than the Linux kernel, C standard library, and \ +libdl (for dynamic linking). While ELL is designed to be efficient \ +and compact enough for use on embedded Linux platforms, it is not \ +limited to resource-constrained systems." +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "dbus" + +inherit autotools pkgconfig + +SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-pem.c-do-not-use-rawmemchr.patch \ + " +SRC_URI[sha256sum] = "653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} diff --git a/meta-gnome/recipes-support/gsound/gsound/0001-Set-vapidir.patch b/meta-gnome/recipes-support/gsound/gsound/0001-Set-vapidir.patch new file mode 100644 index 0000000..ffccfd5 --- /dev/null +++ b/meta-gnome/recipes-support/gsound/gsound/0001-Set-vapidir.patch @@ -0,0 +1,28 @@ +From 0a790273aca3ba07dfa6d2f61e3aaa7157c1a3bb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 20 Mar 2021 09:22:18 -0700 +Subject: [PATCH] Set vapidir + +Use parentheses instead of braces, it makes automake and perl happy +newer perl does not like ${} for VALAFLAGS + +Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^${ <-- HERE abs_top_builddir}/gsound$/ at TOPDIR/build/tmp/work/mips32r2-yoe-linux/gsound/1.0.2-r0/recipe-sysroot-native/usr/bin/automake line 5759. +autoreconf: error: automake failed with exit status: 255 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + tools/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -8,7 +8,7 @@ bin_PROGRAMS = gsound-play + gsound_play_SOURCES = gsound-play.vala + + gsound_play_VALAFLAGS = \ +- --vapidir ${abs_top_builddir}/gsound \ ++ --vapidir $(abs_top_builddir)/gsound \ + --pkg gsound \ + ${NULL} + diff --git a/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb b/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb index 31dd976..65ee1e1 100644 --- a/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb +++ b/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb @@ -1,9 +1,15 @@ +SUMMARY = "Small gobject library for playing system sounds" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=447b837ae57f08b7060593ac6256163f" +DEPENDS = " \ + glib-2.0 \ + libcanberra \ +" + +inherit gnomebase gettext gobject-introspection vala + +SRC_URI += "file://0001-Set-vapidir.patch" + SRC_URI[archive.md5sum] = "c26fd21c21b9ef6533a202a73fab21db" SRC_URI[archive.sha256sum] = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53" - -inherit autotools gnomebase gobject-introspection -DEPENDS = "glib-2.0 libcanberra" - diff --git a/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-gnome/recipes-support/ibus/ibus-native.bb new file mode 100644 index 0000000..ca65114 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus-native.bb @@ -0,0 +1,34 @@ +require ${BPN}.inc + +inherit native + +DEPENDS += " \ + glib-2.0-native \ + dbus-native \ + iso-codes \ +" + +PACKAGECONFIG = "" + +# for allarch iso-codes +EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig" +# for allarch unicode-ucd - just to make configure happy +EXTRA_OECONF += "--with-ucd-dir=${RECIPE_SYSROOT}${datadir_native}/unicode/ucd" + +do_compile() { + cd src + # seems by moving to src we break dependency tracking so build what's + # necessary step by step + oe_runmake ibusenumtypes.h + oe_runmake ibusmarshalers.h + oe_runmake ibusenumtypes.c + oe_runmake unicode-parser +} + +do_install() { + install -d ${D}/${libdir} + install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir} + + install -d ${D}/${bindir} + install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir} +} diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb new file mode 100644 index 0000000..caec455 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -0,0 +1,37 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0-native \ + glib-2.0 \ + dbus \ + iso-codes \ +" + +inherit gtk-icon-cache bash-completion + +# for unicode-ucd +EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" + +PACKAGECONFIG ??= " \ + dconf vala \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ +" + +do_configure_prepend() { + # run native unicode-parser + sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/GConf \ + ${datadir}/glib-2.0 \ + ${libdir}/gtk-3.0 \ +" + +FILES_${PN}-dev += " \ + ${datadir}/gettext \ +" + diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc new file mode 100644 index 0000000..ea413cf --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -0,0 +1,36 @@ +SUMMARY = "Intelligent Input Bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala + +PV = "1.5.23+git${SRCPV}" + +DEPENDS = "unicode-ucd" + +SRC_URI = " \ + git://github.com/ibus/ibus.git \ + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ +" +SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" +S = "${WORKDIR}/git" + +PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" +PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" +PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" +PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" + +EXTRA_OECONF = " \ + --disable-tests \ + --disable-emoji-dict \ + --disable-python2 \ +" + +do_configure_prepend() { + touch ${S}/ChangeLog + touch ${S}/ABOUT-NLS +} diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch new file mode 100644 index 0000000..aec9e7a --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -0,0 +1,34 @@ +From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 10 May 2019 14:30:08 +0200 +Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + data/dconf/make-dconf-override-db.sh | 6 ------ + 1 file changed, 6 deletions(-) + +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then + umount $TMPDIR/cache/gvfs + fi + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch b/meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch deleted file mode 100644 index e0f3e4d..0000000 --- a/meta-gnome/recipes-support/ibus/ibus/0001-strip-out-dbus-build-dep.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ca0f6d559dd8b8b0eea3ae4c6d8a62bb5d743a5b Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Tue, 15 Jan 2019 12:02:49 -0500 -Subject: [PATCH] ibus: Don't run dbus tests within the build. - - Prevent a test requiring spawning a dbus session from running - during the build. - - Upstream-status: Inappropriate [disable-feature] - - Signed-off-by: Brendan Kerrigan - ---- - data/dconf/make-dconf-override-db.sh | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh -index 9c650e9..d7320c3 100755 ---- a/data/dconf/make-dconf-override-db.sh -+++ b/data/dconf/make-dconf-override-db.sh -@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" - export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" - mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR - --eval `dbus-launch --sh-syntax` -- --trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR -- - # in case that schema is not installed on the system - glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" - -@@ -47,4 +43,3 @@ done - - rm -rf $TMPDIR - --kill $DBUS_SESSION_BUS_PID diff --git a/meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch b/meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch deleted file mode 100644 index 1d5b431..0000000 --- a/meta-gnome/recipes-support/ibus/ibus/0002-decorate-automake-for-valaflags.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ce4d251b4d5327051e764cb0693f699c8e584d94 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Tue, 15 Jan 2019 12:02:49 -0500 -Subject: [PATCH] ibus: Add automake decorations to sed in appropriate paths - - Multiple vapidir paths are required to build ibus correctly, - so decorations are added to the automake files to allow for - sed'ing the appropriate path during do_configure_prepend. - - Upstream-status: Inappropriate [configuration] - - Signed-off-by: Brendan Kerrigan - ---- - engine/Makefile.am | 1 + - tools/Makefile.am | 1 + - ui/gtk3/Makefile.am | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/engine/Makefile.am b/engine/Makefile.am -index 86f0e2b..7e922b5 100644 ---- a/engine/Makefile.am -+++ b/engine/Makefile.am -@@ -53,6 +53,7 @@ AM_VALAFLAGS = \ - --vapidir=$(top_builddir)/bindings/vala \ - --pkg=ibus-1.0 \ - --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ -+ @EXTRA_AM_VALAFLAGS@ \ - $(NULL) - - libexec_PROGRAMS = \ -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 5c18d3d..fe727c1 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -61,6 +61,7 @@ AM_VALAFLAGS = \ - --pkg=posix \ - --pkg=config \ - --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ -+ @EXTRA_AM_VALAFLAGS@ \ - $(NULL) - - bin_PROGRAMS = ibus -diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am -index 667d51c..cdcbf5a 100644 ---- a/ui/gtk3/Makefile.am -+++ b/ui/gtk3/Makefile.am -@@ -79,6 +79,7 @@ AM_VALAFLAGS = \ - --pkg=config \ - --pkg=xi \ - --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ -+ @EXTRA_AM_VALAFLAGS@ \ - $(NULL) - - if ENABLE_APPINDICATOR diff --git a/meta-gnome/recipes-support/ibus/ibus/0003-use-wayland-display-on-wayland.patch b/meta-gnome/recipes-support/ibus/ibus/0003-use-wayland-display-on-wayland.patch deleted file mode 100644 index a8ad2c2..0000000 --- a/meta-gnome/recipes-support/ibus/ibus/0003-use-wayland-display-on-wayland.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 402c9536cb011c5b9ffcd2400c2fb33f458c809b Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Wed, 11 Mar 2020 17:08:37 +0100 -Subject: [PATCH] src: Use WAYLAND_DISPLAY on Wayland sessions to make up IBus - socket name - -In Wayland sessions, GNOME Shell 3.36 is leveraging 2 X11 Display -connections so one is used to set up all services for a "X11 session" -before user applications connected to the other display might require it. -This allows seamlessly starting Xwayland on demand to X11 user applications. - -IBus here belongs to the first described connection, it is started -explicitly on that display by GNOME Shell as it is necessary to set up -ibus-x11 before any other X11 client might want to use it. - -However the use of this "secondary" display results in IBus daemon left -unable to talk to applications, as the socket name is dependent on the -DISPLAY envvar and ibus/applications don't agree on its content. - -For wayland sessions, make it look for WAYLAND_DISPLAY, as that'll have -the similar "per session bus" behavior that this seems to look after. - -Related: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2341 - ---- - src/ibusshare.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/ibusshare.c b/src/ibusshare.c -index 0d50d3f..e0ef2ce 100644 ---- a/src/ibusshare.c -+++ b/src/ibusshare.c -@@ -100,6 +100,7 @@ ibus_get_socket_path (void) - gchar *display; - gchar *displaynumber = "0"; - /* gchar *screennumber = "0"; */ -+ gboolean is_wayland = FALSE; - gchar *p; - - path = g_strdup (g_getenv ("IBUS_ADDRESS_FILE")); -@@ -108,13 +109,19 @@ ibus_get_socket_path (void) - } - - if (_display == NULL) { -- display = g_strdup (g_getenv ("DISPLAY")); -+ display = g_strdup (g_getenv ("WAYLAND_DISPLAY")); -+ if (display) -+ is_wayland = TRUE; -+ else -+ display = g_strdup (g_getenv ("DISPLAY")); - } - else { - display = g_strdup (_display); - } - -- if (display) { -+ if (is_wayland) { -+ displaynumber = display; -+ } else if (display) { - p = display; - hostname = display; - for (; *p != ':' && *p != '\0'; p++); diff --git a/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb b/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb deleted file mode 100644 index 0818541..0000000 --- a/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Intelligent Input Bus for Linux/Unix" -LICENSE = "LGPLv2.1" -DEPENDS = "prelink \ - glib-2.0 \ - gsettings-desktop-schemas \ - json-glib \ - gnome-desktop \ - gettext-native \ - intltool-native \ - dconf \ - libnotify \ - gconf-native \ - gtk+3 \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI = " \ - https://github.com/ibus/ibus/releases/download/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-strip-out-dbus-build-dep.patch \ - file://0002-decorate-automake-for-valaflags.patch \ - file://0003-use-wayland-display-on-wayland.patch \ - " - -SRC_URI[md5sum] = "717975f7de5b7a6eb89a5966db3e6c2e" -SRC_URI[sha256sum] = "8170eba58c28aa4818970751ebdeada728ebb63d535967a5c5f5c21b0017be4a" - - -S = "${WORKDIR}/${PN}-${PV}" - -inherit autotools pkgconfig gtk-doc features_check vala gobject-introspection - -FILES_${PN} += "${datadir}" -FILES_${PN} += "${libdir}" - -EXTRA_OECONF += " --disable-emoji-dict --disable-unicode-dict --disable-tests --disable-gtk2 " - -do_configure_prepend() { - touch ${S}/ChangeLog - sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/tools/Makefile.am - sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/engine/Makefile.am - sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/ui/gtk3/Makefile.am -} - -#do_install_append () { -# rm ${D}${datadir}/applications/ibus-setup.desktop -#} diff --git a/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb b/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb new file mode 100644 index 0000000..c0a7dd6 --- /dev/null +++ b/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb @@ -0,0 +1,27 @@ +SUMMARY = "NetworkManager GUI library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0 gtk+3 networkmanager" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gobject-introspection gtk-doc gettext vala features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.md5sum] = "e1ccac96405861ecab195be5524baae6" +SRC_URI[archive.sha256sum] = "da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4" + +PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" +PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" +PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" +PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" + +# go introspection is not supported for mipsn32/riscv32, but vapi needs it +# +EXTRA_OEMESON_append_mipsarchn32 = " -Dvapi=false" +EXTRA_OEMESON_append_riscv32 = " -Dvapi=false" +EXTRA_OEMESON_append_powerpc64le = " -Dvapi=false" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0005-Remove-Abort-Panic-Strategy.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0005-Remove-Abort-Panic-Strategy.patch new file mode 100644 index 0000000..6b42575 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs78/mozjs78/0005-Remove-Abort-Panic-Strategy.patch @@ -0,0 +1,20 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 29bbf8f..5aefc28 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -49,13 +49,11 @@ opt-level = 1 + rpath = false + lto = false + debug-assertions = true +-panic = "abort" + + [profile.release] + opt-level = 2 + rpath = false + debug-assertions = false +-panic = "abort" + + [patch.crates-io] + packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } + + diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb b/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb index 87e4b4e..049d4a3 100644 --- a/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb +++ b/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb @@ -9,6 +9,7 @@ SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/m file://0001-Force-the-correct-target-string-with-environment-var.patch \ file://0003-Set-rust-host-and-target-correctly.patch \ file://0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch \ + file://0005-Remove-Abort-Panic-Strategy.patch \ " SRC_URI[md5sum] = "09bf510150144238dd31f7f4e1582cf8" @@ -16,22 +17,17 @@ SRC_URI[sha256sum] = "78d762012be9eb460b5805da4f919d1a12b15f4040f126c98a42c4ddda S = "${WORKDIR}/mozjs-78.0.1gnome" inherit autotools pkgconfig perlnative python3native -inherit rust-common +inherit rust inherit features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" TOOLCHAIN = "clang" DEPENDS += "nspr zlib rust-native cargo-native clang-native cbindgen-native nasm-native yasm-native python3" -# Disable null pointer optimization in gcc >= 6 -# https://bugzilla.redhat.com/show_bug.cgi?id=1328045 -CFLAGS += "-fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks" -CXXFLAGS += "-fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks" - # nspr's package-config is ignored so set libs manually EXTRA_OECONF = " \ --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ + --host=${HOST_SYS} \ --prefix=${prefix} \ --libdir=${libdir} \ --disable-tests \ @@ -48,15 +44,14 @@ EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" export TMP="${B}" -export RUSTC="${WORKDIR}/recipe-sysroot-native/usr/bin/rustc" export RUST_HOST="${BUILD_SYS}" -export RUST_TARGET="${RUST_TARGET_SYS}" +export RUST_TARGET="${TARGET_SYS}" +export RUSTFLAGS=" -L ${STAGING_LIBDIR}/rust" export RUST_TARGET_PATH="${STAGING_LIBDIR_NATIVE}/rustlib" export BINDGEN_MFLOAT="${@bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', '-mfloat-abi=hard', '', d)}" export BINDGEN_CFLAGS="--target=${RUST_TARGET_SYS} --sysroot=${RECIPE_SYSROOT} ${BINDGEN_MFLOAT}" export INSTALL_SDK="0" export STAGING_LIBDIR -export NO_RUST_PANIC_HOOK="1" # # Silence a host leak while linking native binary (nsinstall_real) used during the @@ -73,7 +68,7 @@ export NO_RUST_PANIC_HOOK="1" # warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9/../../../lib64" is unsafe for cross-compilation # warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9/../../.." is unsafe for cross-compilation # -WARN_QA_remove = "compile-host-path" +ERROR_QA_remove = "compile-host-path" setup_pythonpath() { export SHELL="/bin/sh" diff --git a/meta-gnome/recipes-support/unicode-ucd/files/license.html b/meta-gnome/recipes-support/unicode-ucd/files/license.html new file mode 100644 index 0000000..a02442a --- /dev/null +++ b/meta-gnome/recipes-support/unicode-ucd/files/license.html @@ -0,0 +1,98 @@ + + + + + + + + + + + + +Unicode License Agreement + + + + + + + + + + + + + + + + + + + +
+ + +
+

UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE

+ +
+See Terms of Use for definitions of Unicode Inc.'s
+Data Files and Software.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+
+ +
+ + + +
+ + diff --git a/meta-gnome/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-gnome/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb index 89ab565..b29bb78 100644 --- a/meta-gnome/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ b/meta-gnome/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb @@ -1,18 +1,15 @@ SUMMARY = "Unicode Character Database" HOMEPAGE = "https://unicode.org/ucd/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd" +LIC_FILES_CHKSUM = "file://../license.html;beginline=42;endline=85;md5=ddcaebcc17ab633995f12c383599f377" SRC_URI = " \ https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ - https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \ + file://license.html \ " SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" -SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c" -SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4" - inherit allarch do_configure[noexec] = "1" diff --git a/meta-gnome/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta-gnome/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch new file mode 100644 index 0000000..b4100fc --- /dev/null +++ b/meta-gnome/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -0,0 +1,42 @@ +From de9639baac792327c701e509258b8a13f6959e82 Mon Sep 17 00:00:00 2001 +From: Danilo Spinella +Date: Thu, 21 Mar 2019 14:19:26 +0100 +Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [1] + +Signed-off-by: Andreas Müller + +[1] https://gitlab.gnome.org/GNOME/vte/issues/72 + +--- + src/missing.hh | 4 ++++ + src/widget.cc | 1 + + 2 files changed, 5 insertions(+) + +--- a/src/missing.hh ++++ b/src/missing.hh +@@ -24,6 +24,10 @@ + #define NSIG (8 * sizeof(sigset_t)) + #endif + ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++ + #ifndef HAVE_FDWALK + int fdwalk(int (*cb)(void* data, int fd), + void* data); +--- a/src/widget.cc ++++ b/src/widget.cc +@@ -21,6 +21,7 @@ + #include "widget.hh" + + #include // for W_EXITCODE ++#include "missing.hh" // for W_EXITCODE on non-glibc systems + + #include + #include diff --git a/meta-gnome/recipes-gnome/vte/vte_0.62.0.bb b/meta-gnome/recipes-support/vte/vte_0.64.0.bb similarity index 70% rename from meta-gnome/recipes-gnome/vte/vte_0.62.0.bb rename to meta-gnome/recipes-support/vte/vte_0.64.0.bb index 97c97c0..a16dac7 100644 --- a/meta-gnome/recipes-gnome/vte/vte_0.62.0.bb +++ b/meta-gnome/recipes-support/vte/vte_0.64.0.bb @@ -1,12 +1,14 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" +DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." +HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" -LICENSE = "GPLv3 & LGPLv3+ & LGPLv2.1+" +LICENSE = "GPLv3 & LGPLv3+ & MIT-X" LICENSE_libvte = "LGPLv3+" LIC_FILES_CHKSUM = " \ - file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ - file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.GPL3;md5=cc702cf3444d1f19680c794cc61948f9 \ file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ + file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ " DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" @@ -16,8 +18,12 @@ GIR_MESON_OPTION = 'gir' inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "7562e1dbe1992a48cbcfd10b7acc3ff6" -SRC_URI[archive.sha256sum] = "4d2d246ed47f08cc73f6471aa8e9f378998b7d0f7dcb0c433f29da5839dbb016" +SRCREV = "2520d6b6785646ceb5f501f9c37a1a0307fa4486" +SRC_URI = "git://gitlab.gnome.org/GNOME/vte.git;protocol=https;branch=vte-0-64" +# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) +SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" + +S = "${WORKDIR}/git" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" @@ -43,7 +49,6 @@ PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" # vala requires gir PACKAGECONFIG_remove_class-native = "vala" -EXTRA_OECONF = "--with-gnutls" CFLAGS += "-D_GNU_SOURCE" @@ -54,4 +59,6 @@ FILES_${PN}-prompt = " \ ${libexecdir}/vte-urlencode-cwd \ " +FILES_${PN}-dev += "${datadir}/glade/" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-gnome/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb b/meta-gnome/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb index 1d75d52..75b9d06 100644 --- a/meta-gnome/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb +++ b/meta-gnome/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d0 S = "${WORKDIR}/${XORG_PN}-${PV}" B = "${WORKDIR}/build" -inherit native pkgconfig +inherit pkgconfig native do_configure[noexec] = "1" diff --git a/meta-intel b/meta-intel index 7022383..610cdb4 160000 --- a/meta-intel +++ b/meta-intel @@ -1 +1 @@ -Subproject commit 702238367bbe17f306bdf061792b27b650dcde61 +Subproject commit 610cdb495cdc7eda95bfa03824220272ca256e7f diff --git a/meta-rust b/meta-rust index 2e085dd..920db7b 160000 --- a/meta-rust +++ b/meta-rust @@ -1 +1 @@ -Subproject commit 2e085dda43dc80e6c55ac41f83db20fb7739a0a1 +Subproject commit 920db7b045c1f721efcc2e1d891516b515b7e7a8 diff --git a/poky b/poky index 012ad10..e1839b5 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 012ad10a89a889c21e67c27dc37d22520212548f +Subproject commit e1839b58ebe05242a52fe050aa9a08140136aa0a