From be34ea65f358821018e17cb85d81fb2be32a2eec Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Sat, 28 May 2022 11:20:07 -0400 Subject: [PATCH] upgrade poky layer to 'kirkstone' release 4.0.1 - removed layers meta-rust and meta-clang - added new dependencies to Makefile - changed override syntax across all recipe files - updated conf files from hardknott to kirkstone - SRC_URI git URLS fixed to always include branch and protocol - LICENSE fields updated with new naming convention - updated citadel-tools dependencies - upgraded mozjs to mozjs-91 No longer needed because poky includes newer version (or new enough): - glib-2.0 - libgudev - xorgproto - libxfixes - libinput - wayland-protocols - vte --- Makefile | 2 +- meta-citadel/classes/citadel-image.bbclass | 10 +- meta-citadel/conf/bblayers.conf.sample | 2 - meta-citadel/conf/distro/citadel-distro.conf | 13 +- meta-citadel/conf/layer.conf | 5 +- meta-citadel/conf/local.conf.sample | 167 ++++++++++----- .../bbappends/base-files_%.bbappend | 6 +- .../bbappends/btrfs-tools_%.bbappend | 4 +- .../recipes-citadel/bbappends/dbus_%.bbappend | 2 +- .../bbappends/gnome-terminal_%.bbappend | 4 +- .../gobject-introspection_%.bbappend | 2 +- ...pdate-icon-cache-reproducibility-fix.patch | 33 --- .../bbappends/gtk+3_%.bbappend | 6 +- .../bbappends/iptables_%.bbappend | 2 +- .../bbappends/libdevmapper_%.bbappend | 2 +- .../bbappends/libpam_%.bbappend | 2 +- .../recipes-citadel/bbappends/lvm2_%.bbappend | 2 +- .../recipes-citadel/bbappends/mesa_%.bbappend | 2 +- .../bbappends/pulseaudio_14.%.bbappend | 6 - .../bbappends/pulseaudio_15.%.bbappend | 6 + .../bbappends/readline_%.bbappend | 2 +- .../bbappends/rust-llvm_%.bbappend | 1 - .../bbappends/systemd-conf_%.bbappend | 4 +- .../bbappends/systemd_%.bbappend | 14 +- .../bbappends/util-linux_%.bbappend | 2 +- .../citadel-config/citadel-config-gnome.bb | 2 +- .../citadel-config/citadel-config.bb | 8 +- .../citadel-documentation.bb | 2 +- .../images/citadel-rootfs-image.bb | 4 +- .../packagegroup-citadel-base.bb | 3 +- .../packagegroups/packagegroup-citadel.bb | 3 +- .../packagegroups/packagegroup-desktop.bb | 6 +- .../packagegroups/packagegroup-gnome.bb | 3 +- .../packagegroups/packagegroup-sway.bb | 4 +- .../packagegroups/packagegroup-theme.bb | 2 +- .../citadel-tools/citadel-tools_0.1.0.bb | 191 +++++++++-------- .../recipes-desktop/base16-vim/base16-vim.bb | 4 +- .../dash-to-panel/dash-to-panel_40.bb | 6 +- .../gnome-shell-extension-drive-menu_01.bb | 8 +- .../paper-icon-theme/paper-icon-theme_1.5.bb | 6 +- .../ttf-dejavu/ttf-dejavu_2.37.bb | 30 +-- .../recipes-desktop/ttf-roboto/ttf-roboto.bb | 2 +- .../citadel-initramfs/citadel-initramfs.bb | 4 +- .../citadel-kernel/citadel-kernel_5.15.8.bb | 6 +- .../sof-firmware/sof-firmware.bb | 4 +- .../cryptsetup/cryptsetup_2.3.6.bb | 6 +- .../keyutils/keyutils_1.6.1.bb | 10 +- .../libatasmart/libatasmart_0.19.bb | 8 +- .../libblockdev/libblockdev_2.26.bb | 6 +- .../libbytesize/libbytesize_2.6.bb | 6 +- .../libpam-pwdfile/libpam-pwdfile_1.0.bb | 8 +- .../recipes-support/libsass/libsass_3.5.5.bb | 2 +- .../libseccomp/files/run-ptest | 4 - .../libseccomp/libseccomp_2.5.1.bb | 54 ----- meta-citadel/recipes-support/lvm2/lvm2.inc | 4 +- .../recipes-support/lvm2/lvm2_2.03.11.bb | 30 +-- .../mkpasswd/mkpasswd_5.5.7.bb | 6 +- meta-citadel/recipes-support/nano/nano_5.8.bb | 4 +- .../nnn/{nnn_2.4.bb => nnn_4.5.bb} | 8 +- .../recipes-support/nspr/nspr_4.29.bb | 16 +- meta-citadel/recipes-support/nss/nss_3.64.bb | 32 +-- .../recipes-support/sassc/sassc_3.5.0.bb | 2 +- .../recipes-support/udisks/udisks2_2.9.3.bb | 16 +- .../volume-key/volume-key_0.3.12.bb | 12 +- .../wireguard-module_1.0.20210219.bb | 6 +- .../wireguard/wireguard-tools_1.0.20210315.bb | 8 +- .../recipes-support/wireguard/wireguard.inc | 2 +- meta-citadel/recipes-sway/grim/grim_1.3.1.bb | 2 +- .../gtk-layer-shell/gtk-layer-shell_0.5.1.bb | 8 +- .../recipes-sway/sgmenu/sgmenu_0.1.0.bb | 4 +- .../recipes-sway/slurp/slurp_1.3.1.bb | 2 +- meta-citadel/recipes-sway/sway/sway_1.5.1.bb | 11 +- meta-citadel/recipes-sway/sway/sway_git.bb | 6 +- .../recipes-sway/swaybg/swaybg_git.bb | 5 +- .../recipes-sway/swaylock/swaylock_1.3.bb | 15 -- .../recipes-sway/swaylock/swaylock_git.bb | 46 ++++ .../recipes-sway/wdisplays/wdisplays_git.bb | 6 +- .../recipes-sway/wlroots/wlroots_0.12.0.bb | 2 +- meta-clang | 1 - meta-gnome/classes/gnome-help.bbclass | 10 +- meta-gnome/classes/itstool.bbclass | 2 +- meta-gnome/classes/meson-exe-wrapper.bbclass | 2 +- meta-gnome/conf/layer.conf | 4 +- .../recipes-connectivity/iwd/iwd_1.17.bb | 14 +- .../modemmanager/modemmanager_1.16.8.bb | 12 +- .../networkmanager-openvpn_1.8.14.bb | 14 +- .../networkmanager/networkmanager_1.32.10.bb | 36 ++-- .../cbindgen/cbindgen_0.8.7.bb | 4 +- .../gnome-common/gnome-common_3.18.0.bb | 6 +- .../python/python3-lxml_4.8.0.bb | 42 ++++ meta-gnome/recipes-devtools/yasm/yasm_git.bb | 2 +- .../accountsservice/accountsservice_0.6.55.bb | 4 +- .../colord/colord-gtk_0.1.26.bb | 2 +- .../colord/colord-native.bb | 4 +- .../recipes-freedesktop/colord/colord.bb | 10 +- .../recipes-freedesktop/colord/colord.inc | 2 +- .../geoclue/geoclue_2.5.7.bb | 6 +- .../libgusb/libgusb_0.3.7.bb | 4 +- .../libxklavier/libxklavier_5.4.bb | 2 +- .../recipes-freedesktop/plymouth/plymouth.bb | 30 +-- .../polkit/polkit-gnome_0.105.bb | 4 +- .../polkit/polkit-group-rule-datetime.bb | 2 +- .../polkit/polkit-group-rule-network.bb | 2 +- .../polkit/polkit-group-rule.inc | 9 +- .../sound-theme-freedesktop_0.8.bb | 2 +- .../upower/upower_0.99.13.bb | 12 +- .../upower/upower_0.99.17.bb | 44 ++++ .../recipes-gnome/dconf/dconf_0.40.0.bb | 6 +- meta-gnome/recipes-gnome/gdm/gdm_41.0.bb | 19 +- .../geocode-glib/geocode-glib_3.26.2.bb | 2 +- .../recipes-gnome/gexiv2/gexiv2_0.12.1.bb | 2 +- meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb | 12 +- ...-Do-not-ignore-return-value-of-write.patch | 39 ---- ...t-write-bindir-into-pkg-config-files.patch | 61 ------ ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 31 --- ...-gio-querymodules-as-libexec_PROGRAM.patch | 27 --- ...ng-about-deprecated-paths-in-schemas.patch | 40 ---- ...-correctly-when-building-with-mingw3.patch | 95 --------- ...degen.py-bump-timeout-to-100-seconds.patch | 26 --- ...ces.c-comment-out-a-build-host-only-.patch | 28 --- ...on-Run-atomics-test-on-clang-as-well.patch | 29 --- ...dcode-python-path-into-various-tools.patch | 44 ---- ...ble-more-tests-while-cross-compiling.patch | 121 ----------- .../glib-2.0/glib-2.0/meson.cross.d/common | 3 - .../glib-2.0/meson.cross.d/common-glibc | 5 - .../glib-2.0/meson.cross.d/common-linux | 5 - .../glib-2.0/meson.cross.d/common-mingw | 6 - .../glib-2.0/meson.cross.d/common-musl | 6 - .../glib-2.0/glib-2.0/relocate-modules.patch | 52 ----- .../recipes-gnome/glib-2.0/glib-2.0/run-ptest | 9 - .../recipes-gnome/glib-2.0/glib-2.0_2.70.1.bb | 53 ----- meta-gnome/recipes-gnome/glib-2.0/glib.inc | 196 ------------------ .../gnome-autoar/gnome-autoar_0.4.1.bb | 4 +- .../gnome-backgrounds_41.0.bb | 4 +- .../gnome-bluetooth/gnome-bluetooth_3.34.3.bb | 10 +- .../gnome-control-center_41.1.bb | 8 +- .../gnome-desktop/gnome-desktop_41.1.bb | 17 +- .../gnome-disk-utility_41.0.bb | 4 +- .../gnome-screenshot/gnome-screenshot_40.0.bb | 6 +- .../gnome-session/gnome-session_40.1.1.bb | 6 +- .../gnome-settings-daemon_41.0.bb | 13 +- .../gnome-shell/gnome-shell_41.1.bb | 16 +- .../gnome-system-monitor_41.0.bb | 6 +- .../gnome-terminal/gnome-terminal_3.42.1.bb | 6 +- .../gsettings-desktop-schemas_41.0.bb | 2 +- meta-gnome/recipes-gnome/gtk4/gtk4.inc | 14 +- meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb | 12 +- .../recipes-gnome/libgee/libgee_0.20.4.bb | 4 +- .../recipes-gnome/libgtop/libgtop_2.40.0.bb | 2 +- .../libgweather/libgweather_40.0.bb | 24 +-- .../recipes-gnome/mutter/mutter_41.1.bb | 14 +- .../network-manager-applet_1.18.0.bb | 6 +- meta-gnome/recipes-gnome/rest/rest_0.8.1.bb | 2 +- .../recipes-gnome/yelp/yelp-tools_3.32.2.bb | 4 +- .../recipes-gnome/yelp/yelp-xsl_3.36.0.bb | 6 +- meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb | 8 +- .../recipes-gnome/zenity/zenity_3.30.0.bb | 2 +- meta-gnome/recipes-support/ell/ell_0.44.bb | 4 +- .../recipes-support/exiv2/exiv2_0.26.bb | 6 +- .../graphene/graphene_1.10.2.bb | 2 +- .../recipes-support/gsound/gsound_1.0.2.bb | 2 +- meta-gnome/recipes-support/ibus/ibus.bb | 6 +- meta-gnome/recipes-support/ibus/ibus.inc | 6 +- .../libcanberra/libcanberra_0.30.bb | 8 +- .../libdvdread/libdvdread_6.1.1.bb | 4 +- .../recipes-support/libgudev/libgudev_237.bb | 26 --- .../recipes-support/libndp/libndp_1.6.bb | 4 +- .../recipes-support/libnma/libnma_1.8.30.bb | 8 +- .../libpwquality/libpwquality_1.4.0.bb | 6 +- .../libsigc++-2.0/libsigc++-2.0_2.10.3.bb | 6 +- .../libsigc++-2.0/libsigc++-3_3.0.3.bb | 6 +- .../libxfixes/libxfixes_6.0.0.bb | 20 -- .../libxfixes/xorg-lib-common.inc | 26 --- .../libxfixes/xorgproto_2021.4.99.2.bb | 25 --- meta-gnome/recipes-support/mm/atkmm_2.28.0.bb | 4 +- .../recipes-support/mm/cairomm_1.12.0.bb | 6 +- .../recipes-support/mm/glibmm_2.62.0.bb | 10 +- .../recipes-support/mm/gtkmm3_3.24.2.bb | 4 +- .../recipes-support/mm/mm-common_1.0.2.bb | 2 +- .../recipes-support/mm/pangomm_2.42.1.bb | 6 +- ...001-Cargo.toml-do-not-abort-on-panic.patch | 29 +++ ...-autoconf-s-config.sub-to-canonicali.patch | 28 +++ ...rewrite-cargo-host-linker-in-python3.patch | 56 +++++ ...ix-one-occasionally-reproduced-confi.patch | 50 +++++ ...nfigure-do-not-look-for-llvm-objdump.patch | 43 ++++ ...o-not-try-to-find-a-suitable-upstrea.patch | 65 ++++++ .../mozjs-91/0004-use-asm-sgidefs.h.patch | 35 ++++ .../mozjs-91/0005-nojit-32bit-arch-fix.patch | 21 ++ .../mozjs-91/0006-Fix-build-on-powerpc.patch | 36 ++++ .../mozjs/mozjs-91/fix-musl-build.patch | 15 ++ .../mozjs/mozjs-91/riscv32.patch | 45 ++++ .../recipes-support/mozjs/mozjs-91_91.8.0.bb | 79 +++++++ .../0001-Cannot-use-both-branch-and-rev.patch | 24 --- ...t-target-string-with-environment-var.patch | 22 -- ...3-Set-rust-host-and-target-correctly.patch | 85 -------- ...redDefines.h-here-instead-add-to-gjs.patch | 19 -- .../0005-Remove-Abort-Panic-Strategy.patch | 20 -- .../mozjs78/avoid-running-autoconf2.13.patch | 31 --- .../mozjs78/mozjs78_78.11.0.bb | 117 ----------- .../unicode-ucd/unicode-ucd_12.1.0.bb | 2 +- ...EXITCODE-macro-for-non-glibc-systems.patch | 42 ---- meta-gnome/recipes-support/vte/vte_0.66.0.bb | 64 ------ .../wayland/libinput/determinism.patch | 21 -- .../wayland/libinput/run-ptest | 9 - .../wayland/libinput_1.19.1.bb | 49 ----- .../wayland/wayland-protocols_1.21.bb | 21 -- .../xserver-xorg-cvt-native_1.20.5.bb | 2 +- meta-intel | 2 +- meta-rust | 1 - poky | 2 +- 210 files changed, 1336 insertions(+), 2257 deletions(-) delete mode 100644 meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch delete mode 100644 meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend create mode 100644 meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend delete mode 100644 meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend delete mode 100644 meta-citadel/recipes-support/libseccomp/files/run-ptest delete mode 100644 meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb rename meta-citadel/recipes-support/nnn/{nnn_2.4.bb => nnn_4.5.bb} (59%) delete mode 100644 meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb create mode 100644 meta-citadel/recipes-sway/swaylock/swaylock_git.bb delete mode 160000 meta-clang create mode 100644 meta-gnome/recipes-devtools/python/python3-lxml_4.8.0.bb create mode 100644 meta-gnome/recipes-freedesktop/upower/upower_0.99.17.bb delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-glibc delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-mingw delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-musl delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0/run-ptest delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.70.1.bb delete mode 100644 meta-gnome/recipes-gnome/glib-2.0/glib.inc delete mode 100644 meta-gnome/recipes-support/libgudev/libgudev_237.bb delete mode 100644 meta-gnome/recipes-support/libxfixes/libxfixes_6.0.0.bb delete mode 100644 meta-gnome/recipes-support/libxfixes/xorg-lib-common.inc delete mode 100644 meta-gnome/recipes-support/libxfixes/xorgproto_2021.4.99.2.bb create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch create mode 100644 meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0005-Remove-Abort-Panic-Strategy.patch delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/avoid-running-autoconf2.13.patch delete mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78_78.11.0.bb delete mode 100644 meta-gnome/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch delete mode 100644 meta-gnome/recipes-support/vte/vte_0.66.0.bb delete mode 100644 meta-gnome/recipes-support/wayland/libinput/determinism.patch delete mode 100644 meta-gnome/recipes-support/wayland/libinput/run-ptest delete mode 100644 meta-gnome/recipes-support/wayland/libinput_1.19.1.bb delete mode 100644 meta-gnome/recipes-support/wayland/wayland-protocols_1.21.bb delete mode 160000 meta-rust diff --git a/Makefile b/Makefile index 7ff94c0..9b7ccab 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ kernel-test: ## Boot kernel with Qemu ('ctrl-a x' to exit qemu) @scripts/qemu-boot kernel install-build-deps: - sudo apt install --no-install-recommends build-essential python bzip2 cpio chrpath diffstat file texinfo inkscape libgmp-dev libmpc-dev libelf-dev gawk wget debootstrap + sudo apt install --no-install-recommends build-essential python3-full bzip2 cpio chrpath diffstat file texinfo inkscape libgmp-dev libmpc-dev libelf-dev gawk wget debootstrap lz4 zstd $(REALMFS_IMAGE): @mkdir -p build/realmfs diff --git a/meta-citadel/classes/citadel-image.bbclass b/meta-citadel/classes/citadel-image.bbclass index 676d9bf..193fa97 100644 --- a/meta-citadel/classes/citadel-image.bbclass +++ b/meta-citadel/classes/citadel-image.bbclass @@ -1,8 +1,8 @@ -DEPENDS_append = " citadel-tools-native mtools-native cryptsetup-native coreutils-native" +DEPENDS:append = " citadel-tools-native mtools-native cryptsetup-native coreutils-native" # Block size must be 4096 or dm-verity won't work -EXTRA_IMAGECMD_ext4 = "-i 4096 -b 4096" +EXTRA_IMAGECMD:ext4 = "-i 4096 -b 4096" IMAGE_FSTYPES = "ext4" IMAGE_OVERHEAD_FACTOR = "1.2" @@ -41,7 +41,9 @@ do_citadel_mkimage[vardepsexclude] = "DATETIME" IMAGE_POSTPROCESS_COMMAND += " generate_shasum_buildhistory ;" +BUILDHISTORY_CURRENT_IMAGE_DIR = "${TOPDIR}/buildhistory/images/${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}" + generate_shasum_buildhistory() { - mkdir -p ${BUILDHISTORY_DIR_IMAGE} - ( cd ${IMAGE_ROOTFS} && find . -type f -exec sha1sum '{}' \; | sort -k2 > ${BUILDHISTORY_DIR_IMAGE}/image-shasums.txt ) + mkdir -p ${BUILDHISTORY_CURRENT_IMAGE_DIR} + ( cd ${IMAGE_ROOTFS} && find . -type f -exec sha1sum '{}' \; | sort -k2 > ${BUILDHISTORY_CURRENT_IMAGE_DIR}/image-shasums.txt ) } diff --git a/meta-citadel/conf/bblayers.conf.sample b/meta-citadel/conf/bblayers.conf.sample index 840a9bc..351f1cb 100644 --- a/meta-citadel/conf/bblayers.conf.sample +++ b/meta-citadel/conf/bblayers.conf.sample @@ -8,8 +8,6 @@ BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ ##OEROOT##/../meta-intel \ - ##OEROOT##/../meta-rust \ ##OEROOT##/../meta-citadel \ ##OEROOT##/../meta-gnome \ - ##OEROOT##/../meta-clang \ " diff --git a/meta-citadel/conf/distro/citadel-distro.conf b/meta-citadel/conf/distro/citadel-distro.conf index 39494cf..fed38c8 100644 --- a/meta-citadel/conf/distro/citadel-distro.conf +++ b/meta-citadel/conf/distro/citadel-distro.conf @@ -35,18 +35,9 @@ IMAGE_LINGUAS = "en-us" BUILD_REPRODUCIBLE_BINARIES = "1" -INHERIT += "reproducible_build" +INHERIT += "buildhistory" + PREFERRED_RPROVIDER_libdevmapper-native = "libdevmapper-native" -# Override meta-rust dependencies. -# -# Instead of bringing in all of openembedded, we imported the two recipes -# meta-rust depends on: -# -# meta-citadel/recipes-support/libgit2/ -# meta-citadel/recipes-support/libssh2/ -# -LAYERDEPENDS_rust-layer = "core" - require conf/distro/include/security_flags.inc diff --git a/meta-citadel/conf/layer.conf b/meta-citadel/conf/layer.conf index b4ba1d4..4ade0f0 100644 --- a/meta-citadel/conf/layer.conf +++ b/meta-citadel/conf/layer.conf @@ -5,7 +5,6 @@ BBPATH =. "${LAYERDIR}:" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBMASK += "meta-intel/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend" LICENSE_PATH += "${LAYERDIR}/licenses" # see https://patches.openembedded.org/patch/164502/ @@ -13,9 +12,9 @@ PREFERRED_RPROVIDER_libdevmapper = "lvm2" BBFILE_COLLECTIONS += "citadel" BBFILE_PATTERN_citadel = "^${LAYERDIR}/" -BBFILE_PRIORITY_citadel = "5" +BBFILE_PRIORITY_citadel = "4" -LAYERSERIES_COMPAT_citadel = "hardknott" +LAYERSERIES_COMPAT_citadel = "kirkstone" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-citadel/conf/local.conf.sample b/meta-citadel/conf/local.conf.sample index da33cb5..77bcb3b 100644 --- a/meta-citadel/conf/local.conf.sample +++ b/meta-citadel/conf/local.conf.sample @@ -2,32 +2,45 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. +# be set in this file. More adventurous users can look at +# local.conf.sample.extended which contains other examples of configuration which +# can be placed in this file but new users likely won't need any of them +# initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling # the option is a question of removing the # character and making any change to the # variable as required. -# Distro configuration: # -# meta-citadel-distro/conf/distro/citadel-distro.conf +# Machine Selection # - -DISTRO ?= "citadel-distro" - -# Machine configuration: +# You need to select a specific machine to target the build with. There are a selection +# of emulated machines available which can boot and run in the QEMU emulator: # -# meta-intel/conf/machine/intel-corei7-64.conf +#MACHINE ?= "qemuarm" +#MACHINE ?= "qemuarm64" +#MACHINE ?= "qemumips" +#MACHINE ?= "qemumips64" +#MACHINE ?= "qemuppc" +#MACHINE ?= "qemux86" +#MACHINE ?= "qemux86-64" # - +# There are also the following hardware board target machines included for +# demonstration purposes: +# +#MACHINE ?= "beaglebone-yocto" +#MACHINE ?= "genericx86" +#MACHINE ?= "genericx86-64" +#MACHINE ?= "edgerouter" +# +# This sets the default machine to be qemux86-64 if no other machine is selected: +#MACHINE ??= "qemux86-64" MACHINE ?= "intel-corei7-64" DEFAULT_TIMEZONE = "America/New_York" DEPLOY_DIR_IMAGE = "${TOPDIR}/images" -# + # # Where to place downloads # @@ -69,6 +82,34 @@ DEPLOY_DIR_IMAGE = "${TOPDIR}/images" # #TMPDIR = "${TOPDIR}/tmp" +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "citadel-distro" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_deb" # # SDK target architecture @@ -76,7 +117,7 @@ DEPLOY_DIR_IMAGE = "${TOPDIR}/images" # This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" # @@ -87,6 +128,8 @@ DEPLOY_DIR_IMAGE = "${TOPDIR}/images" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -110,20 +153,18 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image -# - 'image-prelink' in order to prelink the filesystem image -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO:qemuall = "1" + # # Interactive shell configuration # @@ -148,29 +189,29 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. -# It's necesary to monitor /tmp, if there is no space left the build will fail +# It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # -# This can be a filesystem directory, or a remote url such as http or ftp. These +# This can be a filesystem directory, or a remote url such as https or ftp. These # would contain the sstate-cache results from previous builds (possibly from other # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the # cache locations to check for the shared objects. @@ -178,33 +219,65 @@ BB_DISKMON_DIRS = "\ # at the end as shown in the examples below. This will be substituted with the # correct path within the directory structure. #SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following lines. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# Note: For this to work you also need hash-equivalence passthrough to the matching server +# +#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/4.0/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" -INHERIT+="toaster buildhistory" - -# -# Enable to build a custom kernel with options set so that powertop can be used, and -# will also build citadel-image with powertop package installed -# -# DISTROOVERRIDES = "citadel-powertop" - +CONF_VERSION = "2" # # Set to build citadel-tools recipes from a local copy on the filesystem rather than diff --git a/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend b/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend index 4ff9a83..62dc40e 100644 --- a/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend @@ -1,15 +1,15 @@ hostname="subgraph" -dirs1777_remove = "${localstatedir}/volatile/tmp" +dirs1777:remove = "${localstatedir}/volatile/tmp" dirs755="/boot /dev /usr/bin /usr/sbin /usr/lib /etc /etc/default /etc/skel /usr/lib /mnt /proc /home/root /run /usr /usr/bin /usr/share/doc/base-files-3.0.14 /usr/include /usr/lib /usr/sbin /usr/share /usr/share/common-licenses /usr/share/info /usr/share/man /usr/share/misc /var /sys /home /media" volatiles = "" -FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:" SRC_URI += "file://profile" -do_install_append () { +do_install:append () { rm ${D}${sysconfdir}/fstab rm ${D}${sysconfdir}/skel/.bashrc rm ${D}${sysconfdir}/skel/.profile diff --git a/meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend b/meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend index 7864b4a..bc20bbf 100644 --- a/meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend @@ -1,4 +1,4 @@ # Put python library into a separate package and avoid dragging in python as RDEPENDS PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -RDEPENDS_${PN}_remove = "${PYTHON_PN}-core" +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" +RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" diff --git a/meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend b/meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend index 8cc9fff..b89c028 100644 --- a/meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " user-session" +PACKAGECONFIG:append = " user-session" diff --git a/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend index 1d1b60f..9a34598 100644 --- a/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/gnome-terminal:" +FILESEXTRAPATHS:prepend := "${THISDIR}/gnome-terminal:" SRC_URI += "\ file://gnome-terminal-citadel.service \ @@ -7,7 +7,7 @@ SRC_URI += "\ file://50_gnome-terminal.gschema.override \ " -do_install_append() { +do_install:append() { install -m 644 ${WORKDIR}/50_gnome-terminal.gschema.override ${D}${datadir}/glib-2.0/schemas install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.desktop ${D}${datadir}/applications install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.service ${D}${datadir}/dbus-1/services diff --git a/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend index 3dd7dcf..0ea3524 100644 --- a/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend @@ -1,5 +1,5 @@ PACKAGES =+ "libgirepository" -FILES_libgirepository = "\ +FILES:libgirepository = "\ ${libdir}/libgirepository-1.0${SOLIBS} \ ${libdir}/girepository-1.0 \ " diff --git a/meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch b/meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch deleted file mode 100644 index c03d687..0000000 --- a/meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/gtk/updateiconcache.c 2019-04-29 02:43:13.876445467 -0400 -+++ b/gtk/updateiconcache.c 2019-04-29 02:47:17.913457103 -0400 -@@ -600,6 +600,7 @@ - { - GHashTable *dir_hash; - GDir *dir; -+ GList *list = NULL, *iterator = NULL; - const gchar *name; - gchar *dir_path; - gboolean dir_added = FALSE; -@@ -617,6 +618,14 @@ - - while ((name = g_dir_read_name (dir))) - { -+ list = g_list_prepend (list, g_strdup (name)); -+ } -+ -+ list = g_list_sort (list, (GCompareFunc) strcmp); -+ for (iterator = list; iterator; iterator = iterator->next) -+ { -+ name = iterator->data; -+ - gchar *path; - gboolean retval; - int flags = 0; -@@ -695,6 +704,7 @@ - g_free (path); - } - -+ g_list_free_full (list, g_free); - g_dir_close (dir); - - /* Move dir into the big file hash */ diff --git a/meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend index 0530bff..7153734 100644 --- a/meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend @@ -1,6 +1,2 @@ # Remove this dependency so it doesn't get dragged in with gtk. These icons are in citadel-extra-image now -GTKBASE_RRECOMMENDS_remove = "adwaita-icon-theme-symbolic" - -FILESEXTRAPATHS_prepend := "${THISDIR}/gtk+3:" - -SRC_URI += "file://gtk-update-icon-cache-reproducibility-fix.patch" +GTKBASE_RRECOMMENDS:remove = "adwaita-icon-theme-symbolic" diff --git a/meta-citadel/recipes-citadel/bbappends/iptables_%.bbappend b/meta-citadel/recipes-citadel/bbappends/iptables_%.bbappend index abfb055..05aecaf 100644 --- a/meta-citadel/recipes-citadel/bbappends/iptables_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/iptables_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/iptables:" +FILESEXTRAPATHS:prepend := "${THISDIR}/iptables:" diff --git a/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend index 8c94708..704037a 100644 --- a/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend @@ -1,2 +1,2 @@ PACKAGECONFIG = "odirect" -PACKAGECONFIG_append_class-target = " udev" +PACKAGECONFIG:append:class-target = " udev" diff --git a/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend index c4d87fd..0ed5e2a 100644 --- a/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/libpam:" +FILESEXTRAPATHS:prepend := "${THISDIR}/libpam:" SRC_URI += "file://pam.d/common-auth" diff --git a/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend b/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend index 825cf96..1c37bb9 100644 --- a/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend @@ -1,2 +1,2 @@ # files/lvm.conf is customized to prevent writing to /etc -FILESEXTRAPATHS_prepend := "${THISDIR}/lvm2:" +FILESEXTRAPATHS:prepend := "${THISDIR}/lvm2:" diff --git a/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend b/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend index e6670d6..0417912 100644 --- a/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend @@ -1 +1 @@ -GALLIUMDRIVERS_append = ",iris" +GALLIUMDRIVERS:append = ",iris" diff --git a/meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend b/meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend deleted file mode 100644 index 48d2cb2..0000000 --- a/meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-console-kit" -RDEPENDS_remove = "pulseaudio-module-x11-cork-request \ - pulseaudio-module-x11-publish \ - pulseaudio-module-x11-xsmp \ -" -PACKAGECONFIG_remove = "x11" diff --git a/meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend b/meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend new file mode 100644 index 0000000..114b26f --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend @@ -0,0 +1,6 @@ +RDEPENDS:pulseaudio-server:remove = "pulseaudio-module-console-kit" +RDEPENDS:remove = "pulseaudio-module-x11-cork-request \ + pulseaudio-module-x11-publish \ + pulseaudio-module-x11-xsmp \ +" +PACKAGECONFIG:remove = "x11" diff --git a/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend b/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend index 411177c..c8efd14 100644 --- a/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/readline_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/readline:" +FILESEXTRAPATHS:prepend := "${THISDIR}/readline:" SRC_URI += "\ file://inputrc \ diff --git a/meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend b/meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend deleted file mode 100644 index bc056b5..0000000 --- a/meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=MinSizeRel " diff --git a/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend b/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend index 02274c6..fecb312 100644 --- a/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend @@ -1,6 +1,6 @@ -FILES_${PN} += "${sysconfdir}/machine-id" +FILES:${PN} += "${sysconfdir}/machine-id" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} echo "a4e415feff81466c925aab34b0c35a3c" > ${D}${sysconfdir}/machine-id } diff --git a/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend b/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend index cc388ec..5f8565e 100644 --- a/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend @@ -1,18 +1,18 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN}_remove = "systemd-serialgetty" -RDEPENDS_${PN}_remove = "volatile-binds" -RDEPENDS_${PN}_remove = "update-rc.d" +RDEPENDS:${PN}:remove = "systemd-serialgetty" +RDEPENDS:${PN}:remove = "volatile-binds" +RDEPENDS:${PN}:remove = "update-rc.d" -ALTERNATIVE_${PN}_remove = "resolv-conf" +ALTERNATIVE:${PN}:remove = "resolv-conf" -GROUPADD_PARAM_${PN} += "-r wheel; -r kvm; -r render" +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 \ " -do_install_append() { +do_install:append() { rm -f ${D}${sysconfdir}/tmpfiles.d/00-create-volatile.conf ln -s rescue.target ${D}${systemd_unitdir}/system/kbrequest.target } diff --git a/meta-citadel/recipes-citadel/bbappends/util-linux_%.bbappend b/meta-citadel/recipes-citadel/bbappends/util-linux_%.bbappend index 4e0a973..956e9ae 100644 --- a/meta-citadel/recipes-citadel/bbappends/util-linux_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/util-linux_%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append = " --disable-raw" +EXTRA_OECONF:append = " --disable-raw" 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 df6d398..b721ec7 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb @@ -33,4 +33,4 @@ do_install() { install -m 644 ${WORKDIR}/dconf-output/citadel ${D}${datadir}/factory/storage/citadel-state/citadel-dconf/user } -FILES_${PN} = "/" +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 10458b7..4b871b5 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb @@ -69,15 +69,15 @@ SRC_URI = "\ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-m -u 1000 -s /bin/bash citadel" +USERADD_PARAM:${PN} = "-m -u 1000 -s /bin/bash citadel" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # for citadel-ifconfig.sh -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" inherit allarch systemd useradd -SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service" +SYSTEMD_SERVICE:${PN} = "zram-swap.service watch-run-user.path sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service" do_install() { install -m 0755 -d ${D}/storage @@ -194,4 +194,4 @@ do_install() { install -d ${D}/opt/share } -FILES_${PN} = "/" +FILES:${PN} = "/" diff --git a/meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb b/meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb index 426b614..61d34fe 100644 --- a/meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb +++ b/meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb @@ -17,4 +17,4 @@ do_install() { install -m 0644 ${WORKDIR}/citadel-documentation.desktop ${D}${datadir}/applications } -FILES_${PN} = "/" +FILES:${PN} = "/" diff --git a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb index 84525f8..612f2c3 100644 --- a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb +++ b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb @@ -32,11 +32,9 @@ set_disable_root_password() { setup_var() { install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/var - - rmdir ${IMAGE_ROOTFS}/var/log/journal + install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/var/log mv ${IMAGE_ROOTFS}/var/lib ${IMAGE_ROOTFS}/usr/share/factory/var - mv ${IMAGE_ROOTFS}/var/log ${IMAGE_ROOTFS}/usr/share/factory/var mv ${IMAGE_ROOTFS}/var/cache ${IMAGE_ROOTFS}/usr/share/factory/var mv ${IMAGE_ROOTFS}/var/spool ${IMAGE_ROOTFS}/usr/share/factory/var mv ${IMAGE_ROOTFS}/var/run ${IMAGE_ROOTFS}/usr/share/factory/var diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb index 5e85305..504592d 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb @@ -2,6 +2,7 @@ # Base set of packages, should not include anything needed only on desktop # +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup BASH_COMPLETION = "\ @@ -13,7 +14,7 @@ BASH_COMPLETION = "\ util-linux-bash-completion \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ keyutils \ citadel-config \ base-files \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb index c17041d..0fe7d1a 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb @@ -1,7 +1,8 @@ +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ packagegroup-citadel-base \ packagegroup-desktop \ packagegroup-gnome \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb index 89fec25..d98aa5f 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb @@ -2,13 +2,14 @@ # Packages common to any desktop environment # +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup CITADEL_POWERTOP = "" # append only if citadel-powertop override is set -CITADEL_POWERTOP_append_citadel-powertop= "powertop" +CITADEL_POWERTOP:append:citadel-powertop= "powertop" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${CITADEL_POWERTOP} \ accountsservice \ upower \ @@ -25,7 +26,6 @@ RDEPENDS_${PN} = "\ wireless-regdb \ polkit \ network-manager-applet \ - clutter-1.0 \ libxkbcommon \ xkeyboard-config \ libusb1 \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb index c0c86a0..a9d26b7 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb @@ -1,7 +1,8 @@ +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ atk \ at-spi2-atk \ libgweather \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb index e8799ee..24cd1ca 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb @@ -1,7 +1,9 @@ +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ + +RDEPENDS:${PN} = "\ wlroots \ sway \ xcb-util-xrm \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-theme.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-theme.bb index 557cd80..fb3a828 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-theme.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-theme.bb @@ -1,4 +1,4 @@ inherit packagegroup -RDEPENDS_${PN} = "ttf-roboto" +RDEPENDS:${PN} = "ttf-roboto" 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 08fd7b4..cdd557b 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 @@ -3,14 +3,14 @@ HOMEPAGE = "http://github.com/subgraph/citadel" LICENSE = "CLOSED" LIC_FILES_CHKSUM="" -inherit cargo systemd gsettings +inherit cargo systemd gsettings pkgconfig # # Update this when changes are pushed to github # -SRCREV = "668227af1e2b01fa0a06216eb25a4e3251f50aba" +SRCREV = "3dbfda2c40aac28e2a1df1dddae039113df1c6f0" -GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https" +GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https;branch=master" # If Cargo.lock changes in citadel-tools, this needs to be updated. # cargo bitbake does not support workspaces so as a workaround first @@ -22,40 +22,40 @@ GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https" SRC_URI += " \ crate://crates.io/acl-sys/1.2.2 \ - crate://crates.io/addr2line/0.15.2 \ + crate://crates.io/addr2line/0.17.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/aho-corasick/0.7.18 \ - crate://crates.io/ansi_term/0.11.0 \ - crate://crates.io/anyhow/1.0.42 \ - crate://crates.io/array-macro/1.0.3 \ - crate://crates.io/async-broadcast/0.3.3 \ + crate://crates.io/ansi_term/0.12.1 \ + crate://crates.io/anyhow/1.0.57 \ + crate://crates.io/array-macro/1.0.5 \ + crate://crates.io/async-broadcast/0.3.4 \ crate://crates.io/async-channel/1.6.1 \ crate://crates.io/async-executor/1.4.1 \ crate://crates.io/async-io/1.6.0 \ - crate://crates.io/async-lock/2.4.0 \ - crate://crates.io/async-task/4.0.3 \ + crate://crates.io/async-lock/2.5.0 \ + crate://crates.io/async-task/4.2.0 \ crate://crates.io/atk-sys/0.14.0 \ crate://crates.io/atk/0.14.0 \ crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.0.1 \ - crate://crates.io/backtrace/0.3.60 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/backtrace/0.3.65 \ crate://crates.io/bincode/1.3.3 \ crate://crates.io/bitflags/1.2.1 \ crate://crates.io/block-buffer/0.9.0 \ crate://crates.io/block-cipher/0.7.1 \ crate://crates.io/blowfish/0.5.0 \ crate://crates.io/byteorder/1.4.3 \ - crate://crates.io/cache-padded/1.1.1 \ - crate://crates.io/cairo-rs/0.14.7 \ - crate://crates.io/cairo-sys-rs/0.14.0 \ - crate://crates.io/cc/1.0.69 \ + crate://crates.io/cache-padded/1.2.0 \ + crate://crates.io/cairo-rs/0.14.9 \ + crate://crates.io/cairo-sys-rs/0.14.9 \ + crate://crates.io/cc/1.0.73 \ crate://crates.io/cfg-expr/0.8.1 \ crate://crates.io/cfg-if/0.1.10 \ crate://crates.io/cfg-if/1.0.0 \ crate://crates.io/chrono/0.4.19 \ - crate://crates.io/clap/2.33.3 \ + crate://crates.io/clap/2.34.0 \ crate://crates.io/concurrent-queue/1.2.2 \ - crate://crates.io/cpufeatures/0.1.5 \ + crate://crates.io/cpufeatures/0.2.2 \ crate://crates.io/crossbeam-channel/0.3.9 \ crate://crates.io/crossbeam-utils/0.6.6 \ crate://crates.io/crypto-mac/0.8.0 \ @@ -64,50 +64,50 @@ SRC_URI += " \ crate://crates.io/dbus/0.8.4 \ crate://crates.io/derivative/2.2.0 \ crate://crates.io/digest/0.9.0 \ - crate://crates.io/easy-parallel/3.1.0 \ - crate://crates.io/ed25519/1.1.1 \ + crate://crates.io/easy-parallel/3.2.0 \ + crate://crates.io/ed25519/1.5.2 \ crate://crates.io/either/1.6.1 \ crate://crates.io/enum-map-derive/0.4.6 \ - crate://crates.io/enum-map-internals/0.1.3 \ + crate://crates.io/enum-map-internals/0.1.2 \ crate://crates.io/enum-map/0.5.0 \ crate://crates.io/enumflags2/0.6.4 \ crate://crates.io/enumflags2_derive/0.6.4 \ crate://crates.io/enumset/0.3.19 \ crate://crates.io/enumset_derive/0.3.2 \ - crate://crates.io/event-listener/2.5.1 \ + crate://crates.io/event-listener/2.5.2 \ crate://crates.io/failure/0.1.8 \ crate://crates.io/failure_derive/0.1.8 \ - crate://crates.io/fastrand/1.4.1 \ + crate://crates.io/fastrand/1.7.0 \ crate://crates.io/field-offset/0.3.4 \ - crate://crates.io/futures-channel/0.3.15 \ - crate://crates.io/futures-core/0.3.15 \ - crate://crates.io/futures-executor/0.3.15 \ - crate://crates.io/futures-io/0.3.15 \ + crate://crates.io/futures-channel/0.3.21 \ + crate://crates.io/futures-core/0.3.21 \ + crate://crates.io/futures-executor/0.3.21 \ + crate://crates.io/futures-io/0.3.21 \ crate://crates.io/futures-lite/1.12.0 \ - crate://crates.io/futures-macro/0.3.15 \ - crate://crates.io/futures-sink/0.3.15 \ - crate://crates.io/futures-task/0.3.15 \ - crate://crates.io/futures-util/0.3.15 \ + crate://crates.io/futures-macro/0.3.21 \ + crate://crates.io/futures-sink/0.3.21 \ + crate://crates.io/futures-task/0.3.21 \ + crate://crates.io/futures-util/0.3.21 \ crate://crates.io/gdk-pixbuf-sys/0.14.0 \ crate://crates.io/gdk-pixbuf/0.14.0 \ crate://crates.io/gdk-sys/0.14.0 \ - crate://crates.io/gdk/0.14.2 \ - crate://crates.io/generic-array/0.14.4 \ + crate://crates.io/gdk/0.14.3 \ + crate://crates.io/generic-array/0.14.5 \ crate://crates.io/getrandom/0.1.16 \ - crate://crates.io/getrandom/0.2.3 \ - crate://crates.io/gimli/0.24.0 \ + crate://crates.io/getrandom/0.2.6 \ + crate://crates.io/gimli/0.26.1 \ crate://crates.io/gio-sys/0.14.0 \ - crate://crates.io/gio/0.14.6 \ + crate://crates.io/gio/0.14.8 \ crate://crates.io/glib-macros/0.10.1 \ crate://crates.io/glib-macros/0.14.1 \ crate://crates.io/glib-sys/0.10.1 \ crate://crates.io/glib-sys/0.14.0 \ crate://crates.io/glib/0.10.3 \ - crate://crates.io/glib/0.14.5 \ + crate://crates.io/glib/0.14.8 \ crate://crates.io/gobject-sys/0.10.0 \ crate://crates.io/gobject-sys/0.14.0 \ crate://crates.io/gtk-sys/0.14.0 \ - crate://crates.io/gtk/0.14.1 \ + crate://crates.io/gtk/0.14.3 \ crate://crates.io/gtk3-macros/0.14.0 \ crate://crates.io/heck/0.3.3 \ crate://crates.io/hermit-abi/0.1.19 \ @@ -115,88 +115,86 @@ SRC_URI += " \ crate://crates.io/hmac/0.8.1 \ crate://crates.io/inotify-sys/0.1.5 \ crate://crates.io/inotify/0.8.3 \ - crate://crates.io/instant/0.1.10 \ - crate://crates.io/itertools/0.10.1 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/itertools/0.10.3 \ crate://crates.io/itertools/0.9.0 \ crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.98 \ - crate://crates.io/libdbus-sys/0.2.1 \ + crate://crates.io/libc/0.2.126 \ + crate://crates.io/libdbus-sys/0.2.2 \ crate://crates.io/libsodium-sys/0.2.7 \ - crate://crates.io/log/0.4.14 \ + crate://crates.io/log/0.4.17 \ crate://crates.io/md-5/0.9.1 \ - crate://crates.io/memchr/2.4.0 \ - crate://crates.io/memoffset/0.6.4 \ - crate://crates.io/miniz_oxide/0.4.4 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memoffset/0.6.5 \ + crate://crates.io/miniz_oxide/0.5.1 \ crate://crates.io/nix/0.17.0 \ - crate://crates.io/nix/0.21.0 \ + crate://crates.io/nix/0.21.2 \ crate://crates.io/num-complex/0.2.4 \ - crate://crates.io/num-integer/0.1.44 \ - crate://crates.io/num-iter/0.1.42 \ + crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-iter/0.1.43 \ crate://crates.io/num-rational/0.2.4 \ - crate://crates.io/num-traits/0.2.14 \ + crate://crates.io/num-traits/0.2.15 \ crate://crates.io/num/0.2.1 \ crate://crates.io/numtoa/0.1.0 \ - crate://crates.io/object/0.25.3 \ - crate://crates.io/once_cell/1.8.0 \ + crate://crates.io/object/0.28.4 \ + crate://crates.io/once_cell/1.10.0 \ crate://crates.io/opaque-debug/0.2.3 \ crate://crates.io/opaque-debug/0.3.0 \ crate://crates.io/owning_ref/0.4.1 \ crate://crates.io/pango-sys/0.10.0 \ crate://crates.io/pango-sys/0.14.0 \ - crate://crates.io/pango/0.14.3 \ + crate://crates.io/pango/0.14.8 \ crate://crates.io/pango/0.9.1 \ crate://crates.io/parking/2.0.0 \ crate://crates.io/pest/2.1.3 \ - crate://crates.io/pin-project-lite/0.2.7 \ + crate://crates.io/pin-project-lite/0.2.9 \ crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkg-config/0.3.19 \ - crate://crates.io/polling/2.1.0 \ + crate://crates.io/pkg-config/0.3.25 \ + crate://crates.io/polling/2.2.0 \ crate://crates.io/posix-acl/1.0.0 \ - crate://crates.io/ppv-lite86/0.2.10 \ + crate://crates.io/ppv-lite86/0.2.16 \ crate://crates.io/proc-macro-crate/0.1.5 \ - crate://crates.io/proc-macro-crate/1.0.0 \ + crate://crates.io/proc-macro-crate/1.1.3 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.19 \ - crate://crates.io/proc-macro-nested/0.1.7 \ crate://crates.io/proc-macro2/0.4.30 \ - crate://crates.io/proc-macro2/1.0.27 \ + crate://crates.io/proc-macro2/1.0.39 \ crate://crates.io/pwhash/0.3.1 \ crate://crates.io/quote/0.6.13 \ - crate://crates.io/quote/1.0.9 \ + crate://crates.io/quote/1.0.18 \ crate://crates.io/rand/0.7.3 \ - crate://crates.io/rand/0.8.4 \ + crate://crates.io/rand/0.8.5 \ crate://crates.io/rand_chacha/0.2.2 \ crate://crates.io/rand_chacha/0.3.1 \ crate://crates.io/rand_core/0.5.1 \ crate://crates.io/rand_core/0.6.3 \ crate://crates.io/rand_hc/0.2.0 \ - crate://crates.io/rand_hc/0.3.1 \ - crate://crates.io/redox_syscall/0.2.9 \ + crate://crates.io/redox_syscall/0.2.13 \ crate://crates.io/redox_termios/0.1.2 \ crate://crates.io/regex-syntax/0.6.25 \ - crate://crates.io/regex/1.5.4 \ + crate://crates.io/regex/1.5.5 \ crate://crates.io/remove_dir_all/0.5.3 \ crate://crates.io/rpassword/4.0.5 \ - crate://crates.io/rustc-demangle/0.1.20 \ + crate://crates.io/rustc-demangle/0.1.21 \ crate://crates.io/rustc_version/0.3.3 \ crate://crates.io/same-file/1.0.6 \ crate://crates.io/scoped-tls/1.0.0 \ crate://crates.io/semver-parser/0.10.2 \ crate://crates.io/semver/0.11.0 \ - crate://crates.io/serde/1.0.126 \ - crate://crates.io/serde_derive/1.0.126 \ - crate://crates.io/serde_repr/0.1.7 \ - crate://crates.io/sha-1/0.9.6 \ - crate://crates.io/sha1/0.6.0 \ - crate://crates.io/sha2/0.9.5 \ + crate://crates.io/serde/1.0.137 \ + crate://crates.io/serde_derive/1.0.137 \ + crate://crates.io/serde_repr/0.1.8 \ + crate://crates.io/sha-1/0.9.8 \ + crate://crates.io/sha1/0.6.1 \ + crate://crates.io/sha1_smol/1.0.0 \ + crate://crates.io/sha2/0.9.9 \ crate://crates.io/signal-hook-registry/1.4.0 \ crate://crates.io/signal-hook/0.1.17 \ - crate://crates.io/signature/1.3.1 \ - crate://crates.io/slab/0.4.3 \ - crate://crates.io/slotmap/1.0.5 \ - crate://crates.io/smallvec/1.6.1 \ - crate://crates.io/socket2/0.4.0 \ + crate://crates.io/signature/1.5.0 \ + crate://crates.io/slab/0.4.6 \ + crate://crates.io/slotmap/1.0.6 \ + crate://crates.io/smallvec/1.8.0 \ + crate://crates.io/socket2/0.4.4 \ crate://crates.io/sodiumoxide/0.2.7 \ crate://crates.io/stable_deref_trait/1.2.0 \ crate://crates.io/static_assertions/1.1.0 \ @@ -207,28 +205,29 @@ SRC_URI += " \ crate://crates.io/strum_macros/0.21.1 \ crate://crates.io/subtle/2.4.1 \ crate://crates.io/syn/0.15.44 \ - crate://crates.io/syn/1.0.73 \ - crate://crates.io/synstructure/0.12.5 \ + crate://crates.io/syn/1.0.95 \ + crate://crates.io/synstructure/0.12.6 \ crate://crates.io/system-deps/1.3.2 \ crate://crates.io/system-deps/3.2.0 \ - crate://crates.io/tempfile/3.2.0 \ + crate://crates.io/tempfile/3.3.0 \ crate://crates.io/termion/1.5.6 \ crate://crates.io/textwrap/0.11.0 \ - crate://crates.io/thiserror-impl/1.0.26 \ - crate://crates.io/thiserror/1.0.26 \ + crate://crates.io/thiserror-impl/1.0.31 \ + crate://crates.io/thiserror/1.0.31 \ crate://crates.io/time/0.1.43 \ crate://crates.io/toml/0.4.10 \ - crate://crates.io/toml/0.5.8 \ - crate://crates.io/typenum/1.13.0 \ + crate://crates.io/toml/0.5.9 \ + crate://crates.io/typenum/1.15.0 \ crate://crates.io/ucd-trie/0.1.3 \ - crate://crates.io/unicode-segmentation/1.8.0 \ - crate://crates.io/unicode-width/0.1.8 \ + crate://crates.io/unicode-ident/1.0.0 \ + crate://crates.io/unicode-segmentation/1.9.0 \ + crate://crates.io/unicode-width/0.1.9 \ crate://crates.io/unicode-xid/0.1.0 \ - crate://crates.io/unicode-xid/0.2.2 \ + crate://crates.io/unicode-xid/0.2.3 \ crate://crates.io/vec_map/0.8.2 \ crate://crates.io/version-compare/0.0.10 \ crate://crates.io/version-compare/0.0.11 \ - crate://crates.io/version_check/0.9.3 \ + crate://crates.io/version_check/0.9.4 \ crate://crates.io/void/1.0.2 \ crate://crates.io/waker-fn/1.1.0 \ crate://crates.io/walkdir/2.3.2 \ @@ -242,8 +241,8 @@ SRC_URI += " \ crate://crates.io/xi-unicode/0.1.0 \ crate://crates.io/zbus/2.0.0-beta.5 \ crate://crates.io/zbus_macros/2.0.0-beta.5 \ - crate://crates.io/zvariant/2.7.0 \ - crate://crates.io/zvariant_derive/2.7.0 \ + crate://crates.io/zvariant/2.10.0 \ + crate://crates.io/zvariant_derive/2.10.0 \ " export SODIUM_USE_PKG_CONFIG = "1" @@ -252,11 +251,11 @@ DEPENDS = "libsodium openssl dbus gtk+3 glib-2.0 acl" BBCLASSEXTEND = "native" PACKAGES =+ "${PN}-realms ${PN}-tools ${PN}-mkimage ${PN}-boot" -FILES_${PN}-realms = "${bindir}/realms" -FILES_${PN}-mkimage = "${bindir}/citadel-mkimage" -FILES_${PN}-boot = "${libexecdir}/citadel-boot" +FILES:${PN}-realms = "${bindir}/realms" +FILES:${PN}-mkimage = "${bindir}/citadel-mkimage" +FILES:${PN}-boot = "${libexecdir}/citadel-boot" -FILES_${PN} = "\ +FILES:${PN} = "\ ${libexecdir}/citadel-tool \ ${libexecdir}/citadel-boot \ ${libexecdir}/citadel-run \ @@ -274,7 +273,7 @@ FILES_${PN} = "\ ${datadir}/applications \ " -SYSTEMD_SERVICE_${PN} = "citadel-current-watcher.path citadel-realmsd.service citadel-boot-automount.service" +SYSTEMD_SERVICE:${PN} = "citadel-current-watcher.path citadel-realmsd.service citadel-boot-automount.service" TARGET_BIN = "${B}/target/${CARGO_TARGET_SUBDIR}" diff --git a/meta-citadel/recipes-desktop/base16-vim/base16-vim.bb b/meta-citadel/recipes-desktop/base16-vim/base16-vim.bb index ee7e414..a13dd33 100644 --- a/meta-citadel/recipes-desktop/base16-vim/base16-vim.bb +++ b/meta-citadel/recipes-desktop/base16-vim/base16-vim.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e6faad78a557b22780e4cf62c89976f8" SECTION = "" DEPENDS = "" -SRC_URI = "git://github.com/chriskempson/base16-vim;protocol=https" +SRC_URI = "git://github.com/chriskempson/base16-vim;protocol=https;branch=master" SRCREV = "6191622d5806d4448fa2285047936bdcee57a098" -FILES_${PN} = "${datadir}/vim/colors" +FILES:${PN} = "${datadir}/vim/colors" S = "${WORKDIR}/git" inherit allarch diff --git a/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb b/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb index edc9ae4..aeb7a56 100644 --- a/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb +++ b/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb @@ -1,13 +1,13 @@ -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -SRC_URI = "git://github.com/home-sweet-gnome/dash-to-panel.git;protocol=https" +SRC_URI = "git://github.com/home-sweet-gnome/dash-to-panel.git;protocol=https;branch=master" SRCREV = "48a69e529614d1da456802b818e7d7f0d4d1d642" S = "${WORKDIR}/git" DEPENDS = "gettext-native glib-2.0-native" -FILES_${PN} = "${datadir}/gnome-shell/extensions" +FILES:${PN} = "${datadir}/gnome-shell/extensions" do_configure () { : diff --git a/meta-citadel/recipes-desktop/gnome-shell-extension-drive-menu/gnome-shell-extension-drive-menu_01.bb b/meta-citadel/recipes-desktop/gnome-shell-extension-drive-menu/gnome-shell-extension-drive-menu_01.bb index e5f4750..fd7c4e3 100644 --- a/meta-citadel/recipes-desktop/gnome-shell-extension-drive-menu/gnome-shell-extension-drive-menu_01.bb +++ b/meta-citadel/recipes-desktop/gnome-shell-extension-drive-menu/gnome-shell-extension-drive-menu_01.bb @@ -1,18 +1,18 @@ -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" -SRC_URI = "git://github.com/subgraph/gnome-shell-extension-drive-menu.git;protocol=https" +SRC_URI = "git://github.com/subgraph/gnome-shell-extension-drive-menu.git;protocol=https;branch=master" SRCREV="45bbb0e9fe87f1f44d3eec49f31a1efa835f4f6b" S = "${WORKDIR}/git" DEPENDS = "gettext-native glib-2.0-native ninja-native" -FILES_${PN} = "${datadir}/gnome-shell/extensions" +FILES:${PN} = "${datadir}/gnome-shell/extensions" EXTRA_OEMESON += "--prefix=${D}/usr" inherit meson -do_configure_prepend () { +do_configure:prepend () { cd ${S} ./meson-gse/meson-gse } diff --git a/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb b/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb index 7edf956..7a053a3 100644 --- a/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb +++ b/meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb @@ -3,7 +3,7 @@ LICENSE = "CC-BY-SA-4.0" LIC_FILES_CHKSUM = "file://COPYING;md5=8335471e369a410f354d5179fdcf0195 \ file://LICENSE;md5=4a312f184ff2ceafe9466cbb7ea43f4e" -SRC_URI = "git://github.com/snwh/paper-icon-theme.git;protocol=https \ +SRC_URI = "git://github.com/snwh/paper-icon-theme.git;protocol=https;branch=master \ file://index.theme \ " SRCREV = "7860fba850fc7f9aed83b1abd804169e816005cd" @@ -12,10 +12,10 @@ S = "${WORKDIR}/git" inherit meson allarch -FILES_${PN} = "${datadir}/icons" +FILES:${PN} = "${datadir}/icons" # Add an index.theme to /usr/share/icons/default that inherits Paper cursors -do_install_append() { +do_install:append() { mkdir -p ${D}${datadir}/icons/default install -m 644 ${WORKDIR}/index.theme ${D}${datadir}/icons/default/index.theme } diff --git a/meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb b/meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb index f74e5ce..9842953 100644 --- a/meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb +++ b/meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb @@ -6,13 +6,13 @@ LICENSE = "BitstreamVera" LIC_FILES_CHKSUM = "file://../LICENSE;md5=449b2c30bfe5fa897fe87b8b70b16cfa" # all subpackages except ${PN}-common itself rdepends on ${PN}-common -RDEPENDS_${PN}-sans = "${PN}-common" -RDEPENDS_${PN}-sans-mono = "${PN}-common" -RDEPENDS_${PN}-sans-condensed = "${PN}-common" -RDEPENDS_${PN}-serif = "${PN}-common" -RDEPENDS_${PN}-serif-condensed = "${PN}-common" -RDEPENDS_${PN}-mathtexgyre = "${PN}-common" -RDEPENDS_${PN}-common = "" +RDEPENDS:${PN}-sans = "${PN}-common" +RDEPENDS:${PN}-sans-mono = "${PN}-common" +RDEPENDS:${PN}-sans-condensed = "${PN}-common" +RDEPENDS:${PN}-serif = "${PN}-common" +RDEPENDS:${PN}-serif-condensed = "${PN}-common" +RDEPENDS:${PN}-mathtexgyre = "${PN}-common" +RDEPENDS:${PN}-common = "" PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ @@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/fonts/conf.d/ install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ } @@ -35,13 +35,13 @@ PACKAGES = "\ ${PN}-common" FONT_PACKAGES = "${PN}-sans ${PN}-sans-mono ${PN}-sans-condensed ${PN}-serif ${PN}-serif-condensed ${PN}-mathtexgyre" -FILES_${PN}-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf" -FILES_${PN}-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf" -FILES_${PN}-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" -FILES_${PN}-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" -FILES_${PN}-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" -FILES_${PN}-mathtexgyre = "${datadir}/fonts/truetype/DejaVuMathTeXGyre.ttf" -FILES_${PN}-common = "${sysconfdir}" +FILES:${PN}-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf" +FILES:${PN}-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf" +FILES:${PN}-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" +FILES:${PN}-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" +FILES:${PN}-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" +FILES:${PN}-mathtexgyre = "${datadir}/fonts/truetype/DejaVuMathTeXGyre.ttf" +FILES:${PN}-common = "${sysconfdir}" SRC_URI[md5sum] = "d0efec10b9f110a32e9b8f796e21782c" SRC_URI[sha256sum] = "fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7" diff --git a/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb b/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb index 147f9d4..1882e86 100644 --- a/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb +++ b/meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb @@ -11,7 +11,7 @@ inherit allarch fontcache S = "${WORKDIR}/roboto-hinted" -FILES_${PN} = "${datadir}/fonts/TTF" +FILES:${PN} = "${datadir}/fonts/TTF" do_install () { install -Dm644 ${S}/*.ttf -t ${D}${datadir}/fonts/TTF diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb index 201a2a5..faea061 100644 --- a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb +++ b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb @@ -48,9 +48,9 @@ do_install() { mknod -m 644 ${D}/dev/loop0 b 7 0 } -FILES_${PN} += "/dev/console /boot /dev /usr /etc /proc /run /sys /tmp" +FILES:${PN} += "/dev/console /boot /dev /usr /etc /proc /run /sys /tmp" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { ln -sf initrd-release $D${sysconfdir}/os-release ln -sf ${systemd_system_unitdir}/initrd.target $D${systemd_system_unitdir}/default.target > $D${sysconfdir}/fstab diff --git a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb index 5893efb..a478816 100644 --- a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb +++ b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Citadel linux kernel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SECTION = "kernel" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" @@ -18,7 +18,7 @@ KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddef DEPENDS += "lz4-native" -do_deploy_append() { +do_deploy:append() { rm ${DEPLOYDIR}/bzImage ln -sf bzImage-initramfs-${KERNEL_IMAGE_NAME}.bin ${DEPLOYDIR}/bzImage echo "${PV}" > ${DEPLOYDIR}/kernel.version @@ -40,5 +40,5 @@ copy_initramfs() { } # Don't install kernel into images, see kernel.bbclass -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/meta-citadel/recipes-kernel/sof-firmware/sof-firmware.bb b/meta-citadel/recipes-kernel/sof-firmware/sof-firmware.bb index feb0a7b..688d16a 100644 --- a/meta-citadel/recipes-kernel/sof-firmware/sof-firmware.bb +++ b/meta-citadel/recipes-kernel/sof-firmware/sof-firmware.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/thesofproject" SECTION = "kernel" SRCREV = "082fb0673f8488717c431801e4bc061d0dc2051c" -SRC_URI = "git://github.com/thesofproject/sof-bin.git;branch=main;protocol=git;destsuffix=sof-firmware" +SRC_URI = "git://github.com/thesofproject/sof-bin.git;branch=main;protocol=https;destsuffix=sof-firmware" S = "${WORKDIR}" @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://sof-firmware/LICENCE.Intel;md5=54b4f1a2dd35fd85bc7a1d PV = "1.9" -FILES_${PN} += "/usr/lib/firmware/intel/*" +FILES:${PN} += "/usr/lib/firmware/intel/*" inherit allarch update-alternatives diff --git a/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.6.bb b/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.6.bb index 0f92562..806a05e 100644 --- a/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.6.bb +++ b/meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.6.bb @@ -37,7 +37,7 @@ PACKAGECONFIG ??= " \ luks-adjust-xts-keysize \ openssl \ " -PACKAGECONFIG_append:class-target = " \ +PACKAGECONFIG:append:class-target = " \ udev \ " @@ -77,11 +77,11 @@ EXTRA_OECONF += "--disable-libargon2" FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ libdevmapper \ " -RRECOMMENDS_${PN}:class-target = " \ +RRECOMMENDS:${PN}:class-target = " \ kernel-module-aes-generic \ kernel-module-dm-crypt \ kernel-module-md5 \ diff --git a/meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb b/meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb index 0a8c2e4..a09e0de 100644 --- a/meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb +++ b/meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb @@ -7,7 +7,7 @@ DESCRIPTION = "\ HOMEPAGE = "http://people.redhat.com/dhowells/keyutils" SECTION = "base" -LICENSE = "LGPLv2.1+ & GPLv2.0+" +LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" @@ -40,7 +40,7 @@ do_install () { oe_runmake DESTDIR=${D} install } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { install -d ${D}${datadir} src_dir="${D}${target_datadir}" mv $src_dir/* ${D}${datadir} @@ -58,8 +58,8 @@ do_install_ptest () { } -RDEPENDS_${PN}-ptest += "lsb-release" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" -RDEPENDS_${PN}-ptest_append_libc-musl = " musl-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/libatasmart/libatasmart_0.19.bb b/meta-citadel/recipes-support/libatasmart/libatasmart_0.19.bb index 16657b4..2540afd 100644 --- a/meta-citadel/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-citadel/recipes-support/libatasmart/libatasmart_0.19.bb @@ -1,19 +1,19 @@ SUMMARY = "ATA S.M.A.R.T. Reading and Parsing Library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git" +SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master" S = "${WORKDIR}/git" inherit autotools lib_package pkgconfig -do_install_append() { +do_install:append() { sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la } PACKAGES =+ "${PN}-dev-vala" -FILES_${PN}-dev-vala = "${datadir}/vala" +FILES:${PN}-dev-vala = "${datadir}/vala" diff --git a/meta-citadel/recipes-support/libblockdev/libblockdev_2.26.bb b/meta-citadel/recipes-support/libblockdev/libblockdev_2.26.bb index 41c70e1..1c77321 100644 --- a/meta-citadel/recipes-support/libblockdev/libblockdev_2.26.bb +++ b/meta-citadel/recipes-support/libblockdev/libblockdev_2.26.bb @@ -3,18 +3,18 @@ block devices. It has a plugin-based architecture where each technology (like \ LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection pkgconfig -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https" SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" S = "${WORKDIR}/git" -FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" +FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" diff --git a/meta-citadel/recipes-support/libbytesize/libbytesize_2.6.bb b/meta-citadel/recipes-support/libbytesize/libbytesize_2.6.bb index 3617fe6..1549732 100644 --- a/meta-citadel/recipes-support/libbytesize/libbytesize_2.6.bb +++ b/meta-citadel/recipes-support/libbytesize/libbytesize_2.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The goal of this project is to provide a tiny library that would \ facilitate the common operations with sizes in bytes." HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" B = "${S}" SRCREV = "c9864f4dd03736839f40d225da494cb1eb64e654" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" inherit gettext autotools pkgconfig python3native @@ -21,7 +21,7 @@ DEPENDS += " \ gettext-native \ " -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" PACKAGECONFIG ??= "python3" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" diff --git a/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb b/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb index 170332f..8a943d6 100644 --- a/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb +++ b/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb @@ -1,10 +1,10 @@ SUMMARY = "PAM pwdfile library" SECTION = "libs" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://pam_pwdfile.c;beginline=1;endline=39;md5=02765d16df913d327ffd4a2ef499baf4" -SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https" +SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https;branch=master" SRCREV = "8f0e412b48178c00abd023917dd2c9050ee89c18" S = "${WORKDIR}/git" @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" DEPENDS = "libpam libxcrypt" inherit lib_package pkgconfig -FILES_${PN} += "${libdir}/security/pam_pwdfile.so" +FILES:${PN} += "${libdir}/security/pam_pwdfile.so" do_compile_class() { oe_runmake CC_FOR_BUILD="${BUILD_CC}" PAM_LIB_DIR=${libdir}/security diff --git a/meta-citadel/recipes-support/libsass/libsass_3.5.5.bb b/meta-citadel/recipes-support/libsass/libsass_3.5.5.bb index e99be07..cf9c0ad 100644 --- a/meta-citadel/recipes-support/libsass/libsass_3.5.5.bb +++ b/meta-citadel/recipes-support/libsass/libsass_3.5.5.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d \ file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744" -SRC_URI = "git://github.com/sass/libsass.git;protocol=git;branch=3.5-stable" +SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=3.5-stable" SRCREV = "39e30874b9a5dd6a802c20e8b0470ba44eeba929" S = "${WORKDIR}/git" diff --git a/meta-citadel/recipes-support/libseccomp/files/run-ptest b/meta-citadel/recipes-support/libseccomp/files/run-ptest deleted file mode 100644 index 54b4a63..0000000 --- a/meta-citadel/recipes-support/libseccomp/files/run-ptest +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd tests -./regression -a diff --git a/meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb b/meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb deleted file mode 100644 index 8fe1023..0000000 --- a/meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb +++ /dev/null @@ -1,54 +0,0 @@ -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/lvm2/lvm2.inc b/meta-citadel/recipes-support/lvm2/lvm2.inc index ccb4f7a..8628f3e 100644 --- a/meta-citadel/recipes-support/lvm2/lvm2.inc +++ b/meta-citadel/recipes-support/lvm2/lvm2.inc @@ -1,7 +1,7 @@ HOMEPAGE = "https://www.sourceware.org/lvm2/" SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG:append:class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ " diff --git a/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb index 7f3f000..3988d54 100644 --- a/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb +++ b/meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb @@ -12,7 +12,7 @@ MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" -do_install_append() { +do_install:append() { # Install machine specific configuration file install -d ${D}${sysconfdir}/lvm install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf @@ -30,33 +30,33 @@ do_install_append() { PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" +EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" DEPENDS += "util-linux" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG:append:class-target = " \ udev \ " PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" PACKAGES =+ "libdevmapper" -FILES_libdevmapper = " \ +FILES:libdevmapper = " \ ${libdir}/libdevmapper.so.* \ ${sbindir}/dmsetup \ ${sbindir}/dmstats \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/device-mapper/*.so \ ${systemd_system_unitdir}/lvm2-pvscan@.service \ " -FILES_${PN}-scripts = " \ +FILES:${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ ${sbindir}/lvmconf \ @@ -64,22 +64,22 @@ FILES_${PN}-scripts = " \ " # Specified explicitly for the udev rules, just in case that it does not get picked # up automatically: -FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN}-udevrules = "libdevmapper" -RDEPENDS_${PN}_append_class-target = " libdevmapper" -RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" +FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS:${PN}-udevrules = "libdevmapper" +RDEPENDS:${PN}:append:class-target = " libdevmapper" +RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ +RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ bash \ util-linux-lsblk \ util-linux-findmnt \ coreutils \ " -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" +RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" +CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" -SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" remove_libdevmapper_sysroot_preprocess() { rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ diff --git a/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb b/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb index 42f7631..f86d69f 100644 --- a/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb +++ b/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb @@ -1,13 +1,13 @@ -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/rfc1036/whois.git;protocol=https" +SRC_URI = "git://github.com/rfc1036/whois.git;protocol=https;branch=master" SRCREV = "7f9fdae2a99c9a56959b37049488f94e8bdfa7c2" S = "${WORKDIR}/git" DEPENDS = "libxcrypt libidn2" -RDEPENDS_${PN} = "libxcrypt libidn2" +RDEPENDS:${PN} = "libxcrypt libidn2" inherit pkgconfig gettext do_compile() { diff --git a/meta-citadel/recipes-support/nano/nano_5.8.bb b/meta-citadel/recipes-support/nano/nano_5.8.bb index 8ba4ca1..75fca16 100644 --- a/meta-citadel/recipes-support/nano/nano_5.8.bb +++ b/meta-citadel/recipes-support/nano/nano_5.8.bb @@ -4,11 +4,11 @@ Not ANOther editor) is an enhanced clone of the \ Pico text editor." HOMEPAGE = "http://www.nano-editor.org/" SECTION = "console/utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" +RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" diff --git a/meta-citadel/recipes-support/nnn/nnn_2.4.bb b/meta-citadel/recipes-support/nnn/nnn_4.5.bb similarity index 59% rename from meta-citadel/recipes-support/nnn/nnn_2.4.bb rename to meta-citadel/recipes-support/nnn/nnn_4.5.bb index e71c45b..e970965 100644 --- a/meta-citadel/recipes-support/nnn/nnn_2.4.bb +++ b/meta-citadel/recipes-support/nnn/nnn_4.5.bb @@ -3,15 +3,15 @@ SUMMARY = "Small command line file manager" HOMEPAGE = "https://github.com/jarun/nnn" SECTION = "base" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=172009f55dfd36284e707e6c251c14c3" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ee18574190d1b9d7ce45445955af2c9b" DEPENDS = "ncurses readline" inherit pkgconfig -SRCREV = "40b98e8c9e78f8e1622968014ed903aeac8a790e" -SRC_URI = "git://github.com/jarun/nnn.git;protocol=https" +SRCREV = "3f58f6111c95a38f2bfbdde92c42bf54edeb5927" +SRC_URI = "git://github.com/jarun/nnn.git;protocol=https;branch=master" S = "${WORKDIR}/git" EXTRA_OEMAKE = "'PREFIX=/usr'" diff --git a/meta-citadel/recipes-support/nspr/nspr_4.29.bb b/meta-citadel/recipes-support/nspr/nspr_4.29.bb index 6307c15..f224bcd 100644 --- a/meta-citadel/recipes-support/nspr/nspr_4.29.bb +++ b/meta-citadel/recipes-support/nspr/nspr_4.29.bb @@ -1,6 +1,6 @@ SUMMARY = "Netscape Portable Runtime Library" HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LICENSE = "GPL-2.0-only | MPL-2.0 | LGPL-2.1-only" LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" SECTION = "libs/network" @@ -15,7 +15,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://nspr.pc.in \ " -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ +CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" @@ -30,7 +30,7 @@ CVE_PRODUCT = "netscape_portable_runtime" S = "${WORKDIR}/nspr-${PV}/nspr" -RDEPENDS_${PN}-dev += "perl" +RDEPENDS:${PN}-dev += "perl" TARGET_CC_ARCH += "${LDFLAGS}" TESTS = " \ @@ -160,15 +160,15 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" -do_compile_prepend() { +do_compile:prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } -do_compile_append() { +do_compile:append() { oe_runmake -C pr/tests } -do_install_append() { +do_install:append() { install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc sed -i \ -e 's:NSPRVERSION:${PV}:g' \ @@ -190,8 +190,8 @@ do_install_append() { rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties } -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ +FILES:${PN} = "${libdir}/lib*.so" +FILES:${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ ${includedir}/* ${datadir}/aclocal/* " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/nss/nss_3.64.bb b/meta-citadel/recipes-support/nss/nss_3.64.bb index 1863db1..c704ebc 100644 --- a/meta-citadel/recipes-support/nss/nss_3.64.bb +++ b/meta-citadel/recipes-support/nss/nss_3.64.bb @@ -11,7 +11,7 @@ SECTION = "libs" DEPENDS = "sqlite3 nspr zlib nss-native" DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" -LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0+ & MIT) | (MPL-2.0 & LGPL-2.1+ & MIT)" +LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGPL-2.1-or-later & MIT)" LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ @@ -45,32 +45,32 @@ TDS = "${S}/tentative-dist-staging" # cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a # which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" +TUNE_CCARGS:remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" TARGET_CC_ARCH += "${LDFLAGS}" -do_configure_prepend_libc-musl () { +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 () { +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 () { +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() { +do_compile:prepend:class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} } -do_compile_prepend_class-nativesdk() { +do_compile:prepend:class-nativesdk() { export LDFLAGS="" } -do_compile_prepend_class-native() { +do_compile:prepend:class-native() { # Need to set RPATH so that chrpath will do its job correctly RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" } @@ -139,7 +139,7 @@ do_compile() { do_compile[vardepsexclude] += "SITEINFO_BITS" -do_install_prepend_class-nativesdk() { +do_install:prepend:class-nativesdk() { export LDFLAGS="" } @@ -216,7 +216,7 @@ do_install() { do_install[vardepsexclude] += "SITEINFO_BITS" -do_install_append() { +do_install:append() { # Create empty .chk files for the NSS libraries at build time. They could # be regenerated at target's boot time. for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do @@ -232,7 +232,7 @@ do_install_append() { sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc } -do_install_append_class-target() { +do_install:append:class-target() { # It used to call certutil to create a blank certificate with empty password at # build time, but the checksum of key4.db changes every time when certutil is called. # It causes non-determinism issue, so provide databases with a blank certificate @@ -247,7 +247,7 @@ do_install_append_class-target() { PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { for I in $D${libdir}/lib*.chk; do DN=`dirname $I` BN=`basename $I .chk` @@ -260,23 +260,23 @@ pkg_postinst_${PN} () { } PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ +FILES:${PN}-smime = "\ ${bindir}/smime \ " -FILES_${PN} = "\ +FILES:${PN} = "\ ${sysconfdir} \ ${bindir} \ ${libdir}/lib*.chk \ ${libdir}/lib*.so \ " -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${libdir}/nss \ ${libdir}/pkgconfig/* \ ${includedir}/* \ " -RDEPENDS_${PN}-smime = "perl" +RDEPENDS:${PN}-smime = "perl" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/sassc/sassc_3.5.0.bb b/meta-citadel/recipes-support/sassc/sassc_3.5.0.bb index 32a0105..f1b5494 100644 --- a/meta-citadel/recipes-support/sassc/sassc_3.5.0.bb +++ b/meta-citadel/recipes-support/sassc/sassc_3.5.0.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744" -SRC_URI = "git://github.com/sass/sassc.git;protocol=git" +SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master" SRCREV = "aa6d5c635ea8faf44d542a23aaf85d27e5777d48" S = "${WORKDIR}/git" diff --git a/meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb b/meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb index edd097f..548c9ba 100644 --- a/meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb +++ b/meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb @@ -1,5 +1,5 @@ SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = " \ @@ -15,9 +15,9 @@ DEPENDS = " \ " DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS_${PN} = "acl" +RDEPENDS:${PN} = "acl" -SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch" +SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https" SRCREV = "c430dd9a27e158693cc783e9ee91bf6e5b2a8819" S = "${WORKDIR}/git" @@ -29,13 +29,13 @@ REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECONF = "--disable-man --disable-gtk-doc" -do_configure_prepend() { +do_configure:prepend() { # | configure.ac:656: error: required file 'build-aux/config.rpath' not found mkdir -p ${S}/build-aux touch ${S}/build-aux/config.rpath } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ ${datadir}/bash-completion \ @@ -46,8 +46,8 @@ FILES_${PN} += " \ " PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" -FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb b/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb index 398ca5c..faf8dd3 100644 --- a/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb +++ b/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The volume_key project provides a libvolume_key, a library for manipulating \ storage volume encryption keys and storing them separately from volumes, and an \ associated command-line tool, named volume_key." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SECTION = "devel/lib" HOMEPAGE = "https://pagure.io/volume_key" @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd SRCNAME = "volume_key" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools python3native gettext +inherit autotools python3native gettext pkgconfig DEPENDS += " \ util-linux \ @@ -28,11 +28,11 @@ DEPENDS += " \ " PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python] = "--with-python,--without-python,python,python" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" -RDEPENDS_python3-${PN} += "${PN}" +EXTRA_OECONF = "--without-python" -PACKAGES += "python3-${PN}" -FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-${BPN} += "${PN}" +PACKAGES += "python3-${BPN}" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*" 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 index 0525b41..0d01658 100644 --- a/meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb +++ b/meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb @@ -2,7 +2,7 @@ require wireguard.inc SRCREV = "122f06bfd8fc7b06a0899fa9adc4ce8e06900d98" -SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" +SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat;branch=master" inherit module kernel-module-split @@ -12,13 +12,13 @@ DEPENDS = "virtual/kernel libmnl" # configuration options. For exact kernel requirements visit: # https://www.wireguard.io/install/#kernel-requirements -EXTRA_OEMAKE_append = " \ +EXTRA_OEMAKE:append = " \ KERNELDIR=${STAGING_KERNEL_DIR} \ " MAKE_TARGETS = "module" -RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +RRECOMMENDS:${PN} = "kernel-module-xt-hashlimit" MODULE_NAME = "wireguard" module_do_install() { diff --git a/meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb b/meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb index f02303e..f7064d5 100644 --- a/meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb +++ b/meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb @@ -1,7 +1,7 @@ require wireguard.inc SRCREV = "622408872fd6f3a58e98e88d39d30e98968314fa" -SRC_URI = "git://git.zx2c4.com/wireguard-tools" +SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master" inherit bash-completion systemd pkgconfig @@ -16,11 +16,11 @@ do_install () { install } -FILES_${PN} = " \ +FILES:${PN} = " \ ${sysconfdir} \ ${systemd_system_unitdir} \ ${bindir} \ " -RDEPENDS_${PN} = "bash" -RRECOMMENDS_${PN} = "kernel-module-wireguard" +RDEPENDS:${PN} = "bash" +RRECOMMENDS:${PN} = "kernel-module-wireguard" diff --git a/meta-citadel/recipes-support/wireguard/wireguard.inc b/meta-citadel/recipes-support/wireguard/wireguard.inc index a3a7867..6fac24e 100644 --- a/meta-citadel/recipes-support/wireguard/wireguard.inc +++ b/meta-citadel/recipes-support/wireguard/wireguard.inc @@ -6,7 +6,7 @@ TLS-based solutions like OpenVPN, while being more secure, more performant, \ and easier to use." SECTION = "networking" HOMEPAGE = "https://www.wireguard.io/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-citadel/recipes-sway/grim/grim_1.3.1.bb b/meta-citadel/recipes-sway/grim/grim_1.3.1.bb index a7154f7..75c18cb 100644 --- a/meta-citadel/recipes-sway/grim/grim_1.3.1.bb +++ b/meta-citadel/recipes-sway/grim/grim_1.3.1.bb @@ -4,7 +4,7 @@ inherit meson pkgconfig LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" -SRC_URI = "git://github.com/emersion/grim;protocol=https" +SRC_URI = "git://github.com/emersion/grim;protocol=https;branch=master" UPSTREAM_CHECK_COMMITS = "1" 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 5681b52..595f068 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 @@ -1,5 +1,5 @@ -LICENSE = "LGPLv3 & MIT & GPLv3" +LICENSE = "LGPL-3.0-only & MIT & GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE_LGPL.txt;md5=3000208d539ec061b899bce1d9ce9404 \ file://LICENSE_MIT.txt;md5=d015f272ca1521139fd99ea64d6e5e23 \ file://LICENSE_GPL.txt;md5=1ebbd3e34237af26da5dc08a4e440464 \ @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE_LGPL.txt;md5=3000208d539ec061b899bce1d9ce9404 file://test/check-licenses.py;md5=3c4fd5f6d979f739fba5d1f020f81e3e" -SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https" +SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https;branch=master" -ERROR_QA_remove = "unknown-configure-option" +GIR_MESON_OPTION = "" SRCREV = "3b3b935b1643eb58e6cf5a9432b4470d568bfbc2" UPSTREAM_CHECK_COMMITS = "1" @@ -19,6 +19,6 @@ B = "${WORKDIR}/build" inherit meson pkgconfig gobject-introspection DEPENDS = "wlroots wayland wayland-native wayland-protocols glib-2.0 gtk+3" -#DEPENDS_class-native = "wayland-native glib-2.0-native gtk+3-native gtk+3-wayland-native" +#DEPENDS:class-native = "wayland-native glib-2.0-native gtk+3-native gtk+3-wayland-native" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb b/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb index 80e8157..4a1bae5 100644 --- a/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb +++ b/meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb @@ -3,13 +3,13 @@ HOMEPAGE = "http://github.com/subgraph/citadel" LICENSE = "CLOSED" LIC_FILES_CHKSUM="" -inherit cargo systemd +inherit cargo systemd pkgconfig # # Update this when changes are pushed to github # SRCREV = "32b4b0886a2a1872b4b7a2d36236daf0b94578d6" -SRC_URI = "git://github.com/subgraph/sgmenu.git;protocol=https" +SRC_URI = "git://github.com/subgraph/sgmenu.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-citadel/recipes-sway/slurp/slurp_1.3.1.bb b/meta-citadel/recipes-sway/slurp/slurp_1.3.1.bb index 952efaf..e39db0b 100644 --- a/meta-citadel/recipes-sway/slurp/slurp_1.3.1.bb +++ b/meta-citadel/recipes-sway/slurp/slurp_1.3.1.bb @@ -4,7 +4,7 @@ inherit meson pkgconfig LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" -SRC_URI = "git://github.com/emersion/slurp;protocol=https" +SRC_URI = "git://github.com/emersion/slurp;protocol=https;branch=master" UPSTREAM_CHECK_COMMITS = "1" SRCREV = "bfff873301e92364df80ef6aaa4a6b14f76177af" diff --git a/meta-citadel/recipes-sway/sway/sway_1.5.1.bb b/meta-citadel/recipes-sway/sway/sway_1.5.1.bb index afec0ca..a91c76e 100644 --- a/meta-citadel/recipes-sway/sway/sway_1.5.1.bb +++ b/meta-citadel/recipes-sway/sway/sway_1.5.1.bb @@ -6,26 +6,29 @@ SRCREV = "5ae4f65045c04df7ad2d87142b4064803d97a73e" #PV = "1.4+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/swaywm/sway;protocol=https \ +SRC_URI = "git://github.com/swaywm/sway;protocol=https;branch=master \ file://config \ file://0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch \ " UPSTREAM_CHECK_COMMITS = "1" -inherit meson +inherit meson pkgconfig DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/wayland-sessions/sway.desktop \ " -do_install_append() { +do_install:append() { rm ${D}${sysconfdir}/sway/config install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config } +# Reproducibility issue. Fix me! +CFLAGS:append = " -Wno-error=date-time" + EXTRA_OEMESON += "-Ddefault-wallpaper=false -Dzsh-completions=false -Dbash-completions=false -Dfish-completions=false" diff --git a/meta-citadel/recipes-sway/sway/sway_git.bb b/meta-citadel/recipes-sway/sway/sway_git.bb index ee1bb71..a81d9bd 100644 --- a/meta-citadel/recipes-sway/sway/sway_git.bb +++ b/meta-citadel/recipes-sway/sway/sway_git.bb @@ -6,7 +6,7 @@ SRCREV = "ab77efc6caba50acc4c87e02ae3e6712ea808772" PV = "1.4+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/swaywm/sway;protocol=https \ +SRC_URI = "git://github.com/swaywm/sway;protocol=https;branch=master \ file://config \ " @@ -16,11 +16,11 @@ inherit meson DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/wayland-sessions/sway.desktop \ " -do_install_append() { +do_install:append() { rm ${D}${sysconfdir}/sway/config install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config } diff --git a/meta-citadel/recipes-sway/swaybg/swaybg_git.bb b/meta-citadel/recipes-sway/swaybg/swaybg_git.bb index 70b0973..4b5c099 100644 --- a/meta-citadel/recipes-sway/swaybg/swaybg_git.bb +++ b/meta-citadel/recipes-sway/swaybg/swaybg_git.bb @@ -4,7 +4,7 @@ inherit meson pkgconfig LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450" -SRC_URI = "git://github.com/swaywm/swaybg;protocol=https" +SRC_URI = "git://github.com/swaywm/swaybg;protocol=https;branch=master" PV = "1.0+git${SRCPV}" PR = "r0" @@ -16,4 +16,5 @@ S = "${WORKDIR}/git" DEPENDS = "wayland wayland-native wayland-protocols cairo gdk-pixbuf" - +# Reproducibility issue. Fix me! +CFLAGS:append = " -Wno-error=date-time" diff --git a/meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb b/meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb deleted file mode 100644 index 3e0160c..0000000 --- a/meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450" - -SRC_URI = "https://github.com/swaywm/swaylock/archive/${PV}.tar.gz \ - " - -SRC_URI[md5sum] = "60bb92e6ae639daef955f157e6128efe" -SRC_URI[sha256sum] = "3bf4143136e688af2f31d10c0be26d14e371f31bfceec1d98db88abfe0f7a94c" - -DEPENDS = "wlroots libxkbcommon wayland wayland-native libpam gdk-pixbuf cairo" - -inherit meson - -EXTRA_OEMESON += "-Dbash-completions=false -Dfish-completions=false -Dzsh-completions=false" - diff --git a/meta-citadel/recipes-sway/swaylock/swaylock_git.bb b/meta-citadel/recipes-sway/swaylock/swaylock_git.bb new file mode 100644 index 0000000..19536c4 --- /dev/null +++ b/meta-citadel/recipes-sway/swaylock/swaylock_git.bb @@ -0,0 +1,46 @@ +SUMMARY = "swaylock is a screen locking utility for Wayland compositors." +HOMEPAGE = "https://github.com/swaywm/swaylock" +BUGTRACKER = "https://github.com/swaywm/swaylock/issues" +SECTION = "base/wayland" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450" + +REQUIRED_DISTRO_FEATURES = "wayland" + +DEPENDS = " \ + cairo \ + libxkbcommon \ + wayland \ + wayland-native \ + wayland-protocols \ +" + +SRC_URI = " \ + git://github.com/swaywm/swaylock.git;protocol=https;branch=master \ +" + +S = "${WORKDIR}/git" +PV = "1.6" +SRCREV = "92de4d2e310c7bd7dca9c9ced602219dc8245a55" + +PACKAGECONFIG[pam] = ",,libpam" +PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf" +PACKAGECONFIG[man-pages] = ",,scdoc-native" + +PACKAGECONFIG ?= " \ + gdk-pixbuf \ + pam \ +" + +# Reproducibility issue. Fix me! +CFLAGS:append = " -Wno-error=date-time" + +inherit meson pkgconfig features_check + +EXTRA_OEMESON += "--buildtype release" + +FILES:${PN} += "${datadir}" + +BBCLASSEXTEND = "" + diff --git a/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb b/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb index 2b3aed3..b29b912 100644 --- a/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb +++ b/meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb @@ -1,13 +1,13 @@ inherit meson pkgconfig -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \ file://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \ file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \ file://LICENSES/CC-BY-SA-4.0.txt;md5=4b39cb11ffa11c92d3f7a3431390e0d9" -SRC_URI = "git://github.com/luispabon/wdisplays;protocol=https" +SRC_URI = "git://github.com/luispabon/wdisplays;protocol=https;branch=master" SRC_URI += "file://use_correct_versions.patch" PV = "1.0+git${SRCPV}" @@ -21,4 +21,4 @@ S = "${WORKDIR}/git" DEPENDS = "wayland wayland-native wayland-protocols glib-2.0-native gtk+3 libepoxy" -FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/wdisplays.svg" +FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/wdisplays.svg" diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb b/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb index 542c059..1544c7e 100644 --- a/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb +++ b/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/swaywm/wlroots;protocol=https \ +SRC_URI = "git://github.com/swaywm/wlroots;protocol=https;branch=master \ " DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman" diff --git a/meta-clang b/meta-clang deleted file mode 160000 index 9d27674..0000000 --- a/meta-clang +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d276740bd10695e628abdbd49bc4cf36afddf60 diff --git a/meta-gnome/classes/gnome-help.bbclass b/meta-gnome/classes/gnome-help.bbclass index 9c4771d..a9be88b 100644 --- a/meta-gnome/classes/gnome-help.bbclass +++ b/meta-gnome/classes/gnome-help.bbclass @@ -10,11 +10,11 @@ # pack all help files to ${PN}-help- # Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1 -PACKAGES_append = " ${PN}-help" -FILES_${PN}-help = "${datadir}/help" -RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" +PACKAGES:append = " ${PN}-help" +FILES:${PN}-help = "${datadir}/help" +RRECOMMENDS:${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then rm -rf ${D}${datadir}/help/* fi @@ -63,5 +63,5 @@ python gnome_do_split_help() { d.setVar('PACKAGES', ' '.join(packages)) } -PACKAGESPLITFUNCS_prepend = "gnome_do_split_help " +PACKAGESPLITFUNCS:prepend = "gnome_do_split_help " diff --git a/meta-gnome/classes/itstool.bbclass b/meta-gnome/classes/itstool.bbclass index 45e3fb8..962461f 100644 --- a/meta-gnome/classes/itstool.bbclass +++ b/meta-gnome/classes/itstool.bbclass @@ -2,4 +2,4 @@ inherit python3native -DEPENDS_append = " itstool-native" +DEPENDS:append = " itstool-native" diff --git a/meta-gnome/classes/meson-exe-wrapper.bbclass b/meta-gnome/classes/meson-exe-wrapper.bbclass index 60eec40..4c64a99 100644 --- a/meta-gnome/classes/meson-exe-wrapper.bbclass +++ b/meta-gnome/classes/meson-exe-wrapper.bbclass @@ -20,6 +20,6 @@ exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp fi } -do_configure_prepend() { +do_configure:prepend() { setup_wrapper } diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 2ccd923..264c65f 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 = "hardknott" +LAYERSERIES_COMPAT_meta-gnome = "kirkstone" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ @@ -9,4 +9,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-gnome" BBFILE_PATTERN_meta-gnome = "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-gnome = "6" +BBFILE_PRIORITY_meta-gnome = "5" diff --git a/meta-gnome/recipes-connectivity/iwd/iwd_1.17.bb b/meta-gnome/recipes-connectivity/iwd/iwd_1.17.bb index 11b8c88..fe29ce0 100644 --- a/meta-gnome/recipes-connectivity/iwd/iwd_1.17.bb +++ b/meta-gnome/recipes-connectivity/iwd/iwd_1.17.bb @@ -1,6 +1,6 @@ SUMMARY = "Wireless daemon for Linux" HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" @@ -26,29 +26,29 @@ PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--dis EXTRA_OECONF = "--enable-external-ell" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ iwd.service \ ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ " -do_configure_prepend() { +do_configure:prepend() { install -d ${S}/build-aux } -do_install_append() { +do_install:append() { # If client and monitor are disabled, bindir is empty, causing a QA error rmdir --ignore-fail-on-non-empty ${D}/${bindir} } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${nonarch_libdir}/modules-load.d \ ${systemd_unitdir}/network \ " -RDEPENDS_${PN} = "dbus" +RDEPENDS:${PN} = "dbus" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ kernel-module-pkcs7-message \ kernel-module-pkcs8-key-parser \ kernel-module-x509-key-parser \ diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb index acfa113..c3143a8 100644 --- a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb @@ -1,7 +1,7 @@ SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ @@ -31,7 +31,7 @@ EXTRA_OECONF = " \ --with-udev-base-dir=${nonarch_base_libdir}/udev \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ @@ -40,14 +40,14 @@ FILES_${PN} += " \ ${systemd_unitdir}/system \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/ModemManager/*.la \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/ModemManager/*.a \ " -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" +FILES:${PN}-dbg += "${libdir}/ModemManager/.debug" -SYSTEMD_SERVICE_${PN} = "ModemManager.service" +SYSTEMD_SERVICE:${PN} = "ModemManager.service" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb index 1f76d8a..d35ca65 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb @@ -1,7 +1,7 @@ SUMMARY = "NetworkManager-openvpn-plugin" SECTION = "net/misc" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" @@ -18,7 +18,7 @@ S = "${WORKDIR}/NetworkManager-openvpn-${PV}" # meta-gnome in layers is required using gnome: PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" -do_configure_append() { +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: @@ -28,26 +28,26 @@ do_configure_append() { fi } -do_install_append () { +do_install:append () { rm -rf ${D}${libdir}/NetworkManager/*.la } # Create user and group nm-openvpn that are needed since version 1.0.6 USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system nm-openvpn" +USERADD_PARAM:${PN} = "--system nm-openvpn" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${libdir}/NetworkManager/*.so \ ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/NetworkManager/*.a \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ networkmanager \ openvpn \ " diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.32.10.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.32.10.bb index cc4293b..94194e8 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.32.10.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.32.10.bb @@ -2,7 +2,7 @@ SUMMARY = "NetworkManager" HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" SECTION = "net/misc" -LICENSE = "GPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " @@ -47,11 +47,11 @@ EXTRA_OECONF = " \ # 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 = " \ +CFLAGS:append:libc-musl = " \ -DRTLD_DEEPBIND=0 \ " -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs" } @@ -95,19 +95,19 @@ PACKAGES =+ " \ SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" -FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" +FILES:${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" -FILES_${PN}-cloud-setup = " \ +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)}" +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} += " \ +FILES:${PN} += " \ ${libexecdir} \ ${libdir}/NetworkManager/${PV}/*.so \ ${libdir}/NetworkManager \ @@ -126,46 +126,46 @@ FILES_${PN} += " \ ${libdir}/pppd \ " -RRECOMMENDS_${PN} += "iptables \ +RRECOMMENDS:${PN} += "iptables \ ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ " -RCONFLICTS_${PN} = "connman" +RCONFLICTS:${PN} = "connman" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/NetworkManager/gdb-cmd \ ${libdir}/pppd/*/*.la \ ${libdir}/NetworkManager/*.la \ ${libdir}/NetworkManager/${PV}/*.la \ " -FILES_${PN}-nmcli = " \ +FILES:${PN}-nmcli = " \ ${bindir}/nmcli \ " -FILES_${PN}-nmcli-doc = " \ +FILES:${PN}-nmcli-doc = " \ ${mandir}/man1/nmcli* \ " -FILES_${PN}-nmtui = " \ +FILES:${PN}-nmtui = " \ ${bindir}/nmtui \ ${bindir}/nmtui-edit \ ${bindir}/nmtui-connect \ ${bindir}/nmtui-hostname \ " -FILES_${PN}-nmtui-doc = " \ +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)}" +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:${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() { +do_install:append() { install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager rm -rf ${D}/run ${D}${localstatedir}/run diff --git a/meta-gnome/recipes-devtools/cbindgen/cbindgen_0.8.7.bb b/meta-gnome/recipes-devtools/cbindgen/cbindgen_0.8.7.bb index 8553dd6..9416753 100644 --- a/meta-gnome/recipes-devtools/cbindgen/cbindgen_0.8.7.bb +++ b/meta-gnome/recipes-devtools/cbindgen/cbindgen_0.8.7.bb @@ -7,11 +7,11 @@ inherit cargo # how to get cbindgen could be as easy as but default to a git checkout: # SRC_URI += "crate://crates.io/cbindgen/0.8.7" -SRC_URI += "git://github.com/eqrion/cbindgen.git;protocol=https" +SRC_URI += "git://github.com/eqrion/cbindgen.git;protocol=https;branch=master" SRCREV = "7b9ea991bdabb442093014d21fde6a192f574f21" S = "${WORKDIR}/git" CARGO_SRC_DIR="" -PV_append = ".AUTOINC+7b9ea991bd" +PV:append = ".AUTOINC+7b9ea991bd" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb b/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb index 18c4c0f..6d1356e 100644 --- a/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb +++ b/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Common macros for building GNOME applications" HOMEPAGE = "http://www.gnome.org/" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "x11/gnome" @@ -16,7 +16,7 @@ EXTRA_OECONF = "--with-autoconf-archive" EXTRA_AUTORECONF = "" DEPENDS = "" -FILES_${PN} += "${datadir}/aclocal" -FILES_${PN}-dev = "" +FILES:${PN} += "${datadir}/aclocal" +FILES:${PN}-dev = "" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-devtools/python/python3-lxml_4.8.0.bb b/meta-gnome/recipes-devtools/python/python3-lxml_4.8.0.bb new file mode 100644 index 0000000..c4d4df3 --- /dev/null +++ b/meta-gnome/recipes-devtools/python/python3-lxml_4.8.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ +libxslt libraries. It provides safe and convenient access to these \ +libraries using the ElementTree API. It extends the ElementTree API \ +significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ +C14N and much more." +HOMEPAGE = "https://lxml.de/" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ + file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ + file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ + file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ + file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ + file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ + " + +DEPENDS += "libxml2 libxslt" + +SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23" + +SRC_URI += "${PYPI_SRC_URI}" +inherit pkgconfig pypi setuptools3 + +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION:remove:mips = " -Og" +DEBUG_OPTIMIZATION:append:mips = " -O" +BUILD_OPTIMIZATION:remove:mips = " -Og" +BUILD_OPTIMIZATION:append:mips = " -O" + +DEBUG_OPTIMIZATION:remove:mipsel = " -Og" +DEBUG_OPTIMIZATION:append:mipsel = " -O" +BUILD_OPTIMIZATION:remove:mipsel = " -Og" +BUILD_OPTIMIZATION:append:mipsel = " -O" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" + +CLEANBROKEN = "1" diff --git a/meta-gnome/recipes-devtools/yasm/yasm_git.bb b/meta-gnome/recipes-devtools/yasm/yasm_git.bb index cacdd74..b5cd35a 100644 --- a/meta-gnome/recipes-devtools/yasm/yasm_git.bb +++ b/meta-gnome/recipes-devtools/yasm/yasm_git.bb @@ -9,7 +9,7 @@ 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;branch=master;protocol=https \ file://0001-Do-not-use-AC_HEADER_STDC.patch \ " diff --git a/meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.55.bb b/meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.55.bb index 01d8328..5f241e0 100644 --- a/meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.55.bb +++ b/meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.55.bb @@ -1,7 +1,7 @@ SUMMARY = "D-Bus service for accessing the list of user accounts and information attached to those accounts." HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "https://www.freedesktop.org/software/accountsservice/accountsservice-${PV}.tar.xz" @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 intltool-native polkit systemd glib-2.0-native dbus" inherit meson pkgconfig gettext gobject-introspection -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/dbus-1/interfaces/*.xml \ ${datadir}/dbus-1/system-services/org.freedesktop.Accounts.service \ ${datadir}/polkit-1/actions/org.freedesktop.accounts.policy \ diff --git a/meta-gnome/recipes-freedesktop/colord/colord-gtk_0.1.26.bb b/meta-gnome/recipes-freedesktop/colord/colord-gtk_0.1.26.bb index 380f30d..ad7a8a0 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord-gtk_0.1.26.bb +++ b/meta-gnome/recipes-freedesktop/colord/colord-gtk_0.1.26.bb @@ -1,7 +1,7 @@ SUMMARY = "GTK support library for colord" HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "https://www.freedesktop.org/software/colord/releases/colord-gtk-${PV}.tar.xz" diff --git a/meta-gnome/recipes-freedesktop/colord/colord-native.bb b/meta-gnome/recipes-freedesktop/colord/colord-native.bb index 845041c..64dd94a 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord-native.bb +++ b/meta-gnome/recipes-freedesktop/colord/colord-native.bb @@ -1,8 +1,8 @@ require ${BPN}.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:" -inherit meson native +inherit meson pkgconfig native DEPENDS += " \ meson-native \ diff --git a/meta-gnome/recipes-freedesktop/colord/colord.bb b/meta-gnome/recipes-freedesktop/colord/colord.bb index f514c0b..e300222 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord.bb +++ b/meta-gnome/recipes-freedesktop/colord/colord.bb @@ -1,10 +1,10 @@ require ${BPN}.inc -inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd +inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" +GIR_MESON_OPTION = "" DEPENDS += " \ ${BPN}-native \ @@ -28,9 +28,9 @@ EXTRA_OEMESON = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" -SYSTEMD_SERVICE_${PN} = "colord.service" +SYSTEMD_SERVICE:${PN} = "colord.service" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ ${datadir}/glib-2.0 \ @@ -42,4 +42,4 @@ FILES_${PN} += " \ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" +USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" diff --git a/meta-gnome/recipes-freedesktop/colord/colord.inc b/meta-gnome/recipes-freedesktop/colord/colord.inc index 09e600c..41962cd 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord.inc +++ b/meta-gnome/recipes-freedesktop/colord/colord.inc @@ -1,6 +1,6 @@ SUMMARY = "Making color management just work" HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ diff --git a/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb b/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb index 6c0b922..3abb629 100644 --- a/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb +++ b/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb @@ -3,7 +3,7 @@ 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+" +LICENSE = "GPL-2.0-or-later" SECTION = "console/network" LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" @@ -34,14 +34,14 @@ EXTRA_OEMESON += " \ -Ddemo-agent=false \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/system-services \ ${libdir} \ ${systemd_unitdir} \ ${prefix}/libexec \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/dbus-1/interfaces \ ${datadir}/gir-1.0 \ " diff --git a/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb b/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb index c737fec..ab3c06c 100644 --- a/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb +++ b/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb @@ -1,11 +1,11 @@ SUMMARY = "GUsb is a GObject wrapper for libusb1" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "glib-2.0 libusb1" inherit meson gobject-introspection gtk-doc gettext vala -SRC_URI = "git://github.com/hughsie/libgusb.git" +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=master;protocol=https" SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c" S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb b/meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb index be43073..a45bfc4 100644 --- a/meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb +++ b/meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Library providing high-level API for X Keyboard Extension" HOMEPAGE = "https://www.freedesktop.org/wiki/Software/LibXklavier" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" SRC_URI = "https://people.freedesktop.org/~svu/libxklavier-${PV}.tar.bz2" diff --git a/meta-gnome/recipes-freedesktop/plymouth/plymouth.bb b/meta-gnome/recipes-freedesktop/plymouth/plymouth.bb index 952f994..8ba8325 100644 --- a/meta-gnome/recipes-freedesktop/plymouth/plymouth.bb +++ b/meta-gnome/recipes-freedesktop/plymouth/plymouth.bb @@ -8,14 +8,14 @@ DESCRIPTION = "Plymouth is an application that runs very early in the boot proce HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libcap libpng cairo dbus udev" -DEPENDS_append_libc-musl = " musl-rpmatch" +DEPENDS:append:libc-musl = " musl-rpmatch" PROVIDES = "virtual/psplash" -RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" +RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support" SRCREV = "e55447500fa95a0cc59c741296030ed91a2986dc" SRC_URI = " \ @@ -31,8 +31,8 @@ EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-docum " PACKAGECONFIG ??= "pango initrd" -PACKAGECONFIG_append_x86 = " drm" -PACKAGECONFIG_append_x86-64 = " drm" +PACKAGECONFIG:append:x86 = " drm" +PACKAGECONFIG:append:x86-64 = " drm" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" @@ -43,9 +43,9 @@ LOGO ??= "${datadir}/plymouth/bizcom.png" inherit autotools pkgconfig systemd gettext -LDFLAGS_append_libc-musl = " -lrpmatch" +LDFLAGS:append:libc-musl = " -lrpmatch" -do_install_append() { +do_install:append() { # Remove /var/run from package as plymouth will populate it on startup rm -fr "${D}${localstatedir}/run" @@ -54,7 +54,7 @@ do_install_append() { fi } -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ABOUT-NLS mkdir -p ${S}/build-tools touch ${S}/build-tools/config.rpath @@ -63,15 +63,15 @@ do_configure_prepend() { PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" PACKAGES =+ "${PN}-set-default-theme" -FILES_${PN}-initrd = "${libexecdir}/plymouth/*" -FILES_${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" +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" +FILES:${PN} += "${systemd_unitdir}/system/*" +FILES:${PN}-dbg += "${libdir}/plymouth/renderers/.debug" -RDEPENDS_${PN}-initrd = "bash dracut" -RDEPENDS_${PN}-set-default-theme = "bash" +RDEPENDS:${PN}-initrd = "bash dracut" +RDEPENDS:${PN}-set-default-theme = "bash" -SYSTEMD_SERVICE_${PN} = "plymouth-start.service" +SYSTEMD_SERVICE:${PN} = "plymouth-start.service" diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit-gnome_0.105.bb b/meta-gnome/recipes-freedesktop/polkit/polkit-gnome_0.105.bb index e880bf3..509bfa5 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit-gnome_0.105.bb +++ b/meta-gnome/recipes-freedesktop/polkit/polkit-gnome_0.105.bb @@ -3,7 +3,7 @@ DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit th HOMEPAGE = "http://www.packagekit.org/" BUGTRACKER = "http://bugzilla.gnome.org/" DEPENDS = "polkit dbus-glib gconf gtk+3 glib-2.0-native intltool-native gnome-common" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \ file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795" @@ -19,6 +19,6 @@ EXTRA_OECONF = "\ inherit autotools gtk-doc pkgconfig -FILES_${PN} += " ${datadir}/dbus-1 \ +FILES:${PN} += " ${datadir}/dbus-1 \ ${datadir}/PolicyKit \ " diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-datetime.bb b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-datetime.bb index 934a53e..8a14018 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-datetime.bb +++ b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-datetime.bb @@ -11,4 +11,4 @@ do_install() { } USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system datetime" +GROUPADD_PARAM:${PN} = "--system datetime" diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-network.bb b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-network.bb index 66a73ea..8266fa6 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-network.bb +++ b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-network.bb @@ -11,4 +11,4 @@ do_install() { } USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system network" +GROUPADD_PARAM:${PN} = "--system network" diff --git a/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule.inc b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule.inc index 40e4005..4aeeb77 100644 --- a/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule.inc +++ b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule.inc @@ -1,10 +1,13 @@ # polkit must prepare polkitd group DEPENDS += "polkit" +inherit features_check +REQUIRED_DISTRO_FEATURES = "polkit" + inherit useradd -do_install_prepend() { +do_install:prepend() { install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d } -USERADD_PARAM_${PN}_prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" +USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" diff --git a/meta-gnome/recipes-freedesktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb b/meta-gnome/recipes-freedesktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb index a2b1592..9537eb8 100644 --- a/meta-gnome/recipes-freedesktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb +++ b/meta-gnome/recipes-freedesktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb @@ -1,6 +1,6 @@ SUMMARY = "Freedesktop sound theme" HOMEPAGE = "https://freedesktop.org/wiki/Specifications/sound-theme-spec" -LICENSE = "GPLv2 & CC-BY-SA-3.0" +LICENSE = "GPL-2.0-only & CC-BY-SA-3.0" LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69" SRC_URI = "https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-${PV}.tar.bz2" diff --git a/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb index da0ef82..b1dfcbf 100644 --- a/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb +++ b/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb @@ -1,5 +1,5 @@ DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" @@ -22,11 +22,11 @@ PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-system EXTRA_OECONF = " --with-backend=linux" -SYSTEMD_SERVICE_${PN} = "upower.service" +SYSTEMD_SERVICE:${PN} = "upower.service" # don't start on boot by default - dbus does that on demand SYSTEMD_AUTO_ENABLE = "disable" -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ABOUT-NLS mkdir -p ${S}/build-aux touch ${S}/build-aux/config.rpath @@ -35,8 +35,8 @@ do_configure_prepend() { #sed -i -e 's: doc : :g' ${S}/Makefile.am } -RDEPENDS_${PN} += "dbus" -RRECOMMENDS_${PN} += "pm-utils" -FILES_${PN} += "${datadir}/dbus-1/ \ +RDEPENDS:${PN} += "dbus" +RRECOMMENDS:${PN} += "pm-utils" +FILES:${PN} += "${datadir}/dbus-1/ \ ${base_libdir}/udev/* \ " diff --git a/meta-gnome/recipes-freedesktop/upower/upower_0.99.17.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.17.bb new file mode 100644 index 0000000..0572cc8 --- /dev/null +++ b/meta-gnome/recipes-freedesktop/upower/upower_0.99.17.bb @@ -0,0 +1,44 @@ +SUMMARY = "UPower is an abstraction for enumerating power devices" +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics." +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = " \ + intltool-native \ + libusb1 \ + libgudev \ + glib-2.0 \ + dbus-glib \ +" + +SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" +SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P\d+(\_\d+)+)" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" +GTKDOC_MESON_OPTION = "gtk-doc" + +inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd" + +EXTRA_OEMESON = " \ + -Dos_backend=linux \ + -Dman=false \ +" + +SYSTEMD_SERVICE:${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +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.40.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 48d1742..958d43b 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" @@ -13,12 +13,12 @@ inherit gnomebase bash-completion vala SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch" -FILES_${PN} += " \ +FILES:${PN} += " \ ${systemd_user_unitdir} \ ${datadir}/dbus-1 \ ${libdir}/gio/modules/*.so \ " -EXTRA_OEMESON_append_class-native = "-Dbash_completion=false" +EXTRA_OEMESON:append:class-native = "-Dbash_completion=false" BBCLASSEXTEND= "native" diff --git a/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb index 552855d..90fb9ec 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Display Manager" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ @@ -19,18 +19,13 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd pam" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check -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] = "5738c4293a9f5a80d4a6e9e06f4d0df3e9f313ca7b61bfb4d8afaba983e200dc" SRC_URI += "file://gdm.conf" -ERROR_QA_remove = "unknown-configure-option" +GIR_MESON_OPTION = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/systemd/system/gdm.service \ ${libdir}/systemd/user \ ${base_libdir}/security/pam_gdm.so \ @@ -39,7 +34,7 @@ FILES_${PN} += " \ /run/gdm/greeter \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default/volatiles echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm rm ${D}${sysconfdir}/gdm/custom.conf @@ -49,9 +44,9 @@ do_install_append() { } USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm" +USERADD_PARAM:${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" EXTRA_OEMESON = "\ -Dplymouth=enabled \ @@ -62,4 +57,4 @@ EXTRA_OEMESON = "\ " PACKAGES += "${PN}-help" -FILES_${PN}-help = "${datadir}/help" +FILES:${PN}-help = "${datadir}/help" 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 index c0f3c27..df401f7 100644 --- 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 @@ -1,6 +1,6 @@ SUMMARY = "A convenience library for the geocoding" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb index 12ea593..16c46e4 100644 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb @@ -1,5 +1,5 @@ SUMMARY = "A GObject-based Exiv2 wrapper" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "exiv2" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb index 4f8aa6e..fd362e6 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb @@ -1,21 +1,21 @@ SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine" HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs" -LICENSE = "MIT & LGPLv2" +LICENSE = "MIT & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" inherit gnomebase gettext gobject-introspection meson -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" +GIR_MESON_OPTION = "" -DEPENDS = "glib-2.0 gobject-introspection gobject-introspection-native cairo gtk+3 mozjs78 glib-2.0-native" +DEPENDS = "glib-2.0 gobject-introspection gobject-introspection-native cairo gtk+3 mozjs-91 glib-2.0-native" EXTRA_OEMESON = " -Dskip_dbus_tests=true -Dskip_gtk_tests=true -Dinstalled_tests=false" -CFLAGS_append = " -include ${STAGING_INCDIR}/mozjs-78/js/RequiredDefines.h" +CFLAGS:append = " -include ${STAGING_INCDIR}/mozjs-91/js/RequiredDefines.h" SRC_URI += " file://0001-Fix-tests-that-cannot-run.patch" SRC_URI[archive.sha256sum] = "4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b043a5ffb01861c5f" -RDEPENDS_${PN} += "libmozjs-78" +RDEPENDS:${PN} += "libmozjs-91" -FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind" +FILES:${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind" diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch deleted file mode 100644 index f3a0069..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 16 Apr 2016 13:28:59 -0700 -Subject: [PATCH] Do not ignore return value of write() - -gcc warns about ignoring return value when compiling -with fortify turned on. - -assert when write() fails - -Upstream-Status: Submitted -Signed-off-by: Khem Raj - ---- - glib/tests/unix.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/glib/tests/unix.c b/glib/tests/unix.c -index 7639d06..f941141 100644 ---- a/glib/tests/unix.c -+++ b/glib/tests/unix.c -@@ -33,14 +33,15 @@ test_pipe (void) - GError *error = NULL; - int pipefd[2]; - char buf[1024]; -- gssize bytes_read; -+ gssize bytes_read, bytes_written; - gboolean res; - - res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); - g_assert (res); - g_assert_no_error (error); - -- write (pipefd[1], "hello", sizeof ("hello")); -+ bytes_written = write (pipefd[1], "hello", sizeof ("hello")); -+ g_assert (bytes_written != -1 && "write() failed"); - memset (buf, 0, sizeof (buf)); - bytes_read = read (pipefd[0], buf, sizeof(buf) - 1); - g_assert_cmpint (bytes_read, >, 0); 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 deleted file mode 100644 index 5fe3aa8..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 15 Feb 2019 11:17:27 +0100 -Subject: [PATCH] Do not write $bindir into pkg-config files - -This would otherwise break when using the files to build other target -components (we need to rely on PATH containing the paths to utilities, -rather than use target paths). - -Upstream-Status: Inappropriate [upstream wants the paths in .pc files] -Signed-off-by: Alexander Kanavin - ---- - gio/meson.build | 16 ++++++++-------- - glib/meson.build | 6 +++--- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/gio/meson.build b/gio/meson.build -index 532b086..98468a3 100644 ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -820,14 +820,14 @@ pkg.generate(libgio, - 'schemasdir=' + join_paths('${datadir}', schemas_subdir), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), - 'giomoduledir=' + pkgconfig_giomodulesdir, -- 'gio=' + join_paths('${bindir}', 'gio'), -- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), -- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), -- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), -- 'gdbus=' + join_paths('${bindir}', 'gdbus'), -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), -- 'gresource=' + join_paths('${bindir}', 'gresource'), -- 'gsettings=' + join_paths('${bindir}', 'gsettings')], -+ 'gio=gio', -+ 'gio_querymodules=gio-querymodules', -+ 'glib_compile_schemas=glib-compile-schemas', -+ 'glib_compile_resources=glib-compile-resources', -+ 'gdbus=gdbus', -+ 'gdbus_codegen=gdbus-codegen', -+ 'gresource=gresource', -+ 'gsettings=gsettings'], - version : glib_version, - install_dir : glib_pkgconfigreldir, - filebase : 'gio-2.0', -diff --git a/glib/meson.build b/glib/meson.build -index aaf5f00..1e0992b 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -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')), -- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), -- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), -- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], -+ 'glib_genmarshal=glib-genmarshal', -+ 'gobject_query=gobject-query', -+ 'glib_mkenums=glib-mkenums'], - version : glib_version, - install_dir : glib_pkgconfigreldir, - filebase : 'glib-2.0', diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch deleted file mode 100644 index 16f2d31..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Mar 2014 22:42:29 -0700 -Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux - -translation files are always installed under PREFIX/share/locale in uclibc -based systems therefore lets set DATADIRNAME to "share". - -Signed-off-by: Khem Raj -Upstream-Status: Pending - - ---- - m4macros/glib-gettext.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 -index df6fbf0..47db864 100644 ---- a/m4macros/glib-gettext.m4 -+++ b/m4macros/glib-gettext.m4 -@@ -293,6 +293,10 @@ msgstr "" - CATOBJEXT=.mo - DATADIRNAME=share - ;; -+ *-*-musl* | *-*-linux-uclibc*) -+ CATOBJEXT=.gmo -+ DATADIRNAME=share -+ ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib 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 deleted file mode 100644 index 597864d..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 22 Mar 2016 15:14:58 +0200 -Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM - -We want to install this binary with the gio library, and debian -renamer does not cope with library packages with files in ${bindir} - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Inappropriate [OE specific] - ---- - gio/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gio/meson.build b/gio/meson.build -index 2ef60ed..532b086 100644 ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -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, -+ install_dir: glib_libexecdir, - dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) - - glib_compile_schemas = executable('glib-compile-schemas', diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch deleted file mode 100644 index 6fd9352..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 12 Jun 2015 17:08:46 +0300 -Subject: [PATCH] Remove the warning about deprecated paths in schemas - -Some schemas in gsettings-desktop-schemas (such as proxy and locale) -are still using deprecated paths, as of 3.16.1. This causes warning -messages, and meta/lib/oe/rootfs.py complaints about them. - -Upstream-Status: Inappropriate -Signed-off-by: Alexander Kanavin - ---- - gio/glib-compile-schemas.c | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index 7888120..7acbd5b 100644 ---- a/gio/glib-compile-schemas.c -+++ b/gio/glib-compile-schemas.c -@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, - return; - } - -- if (path && (g_str_has_prefix (path, "/apps/") || -- g_str_has_prefix (path, "/desktop/") || -- g_str_has_prefix (path, "/system/"))) -- { -- gchar *message = NULL; -- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " -- "Paths starting with " -- "“/apps/”, “/desktop/” or “/system/” are deprecated."), -- id, path); -- g_printerr ("%s\n", message); -- g_free (message); -- } -- - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - 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 deleted file mode 100644 index 8a6d46d..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ /dev/null @@ -1,95 +0,0 @@ -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 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - gio/tests/meson.build | 8 ++++---- - glib/tests/meson.build | 2 +- - meson.build | 3 +++ - tests/meson.build | 2 +- - 4 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 3a19c82..b762835 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -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 - -@@ -148,7 +148,7 @@ else - endif - - # Test programs buildable on UNIX only --if host_machine.system() != 'windows' -+if host_system != 'windows' - gio_tests += { - 'file' : {}, - 'gdbus-peer' : { -@@ -402,7 +402,7 @@ if host_machine.system() != 'windows' - endif # unix - - # Test programs buildable on Windows only --if host_machine.system() == 'windows' -+if host_system == 'windows' - gio_tests += {'win32-streams' : {}} - endif - -@@ -472,7 +472,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' - } - endif - --if host_machine.system() != 'windows' -+if host_system != 'windows' - test_extra_programs += { - 'gdbus-example-unix-fd-client' : { - 'install' : false, -diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 6eb23e8..36eb919 100644 ---- a/glib/tests/meson.build -+++ b/glib/tests/meson.build -@@ -142,7 +142,7 @@ if glib_conf.has('HAVE_EVENTFD') - } - endif - --if host_machine.system() == 'windows' -+if host_system == 'windows' - if winsock2.found() - glib_tests += { - 'gpoll' : { -diff --git a/meson.build b/meson.build -index 47f3a5c..7ea7ad1 100644 ---- a/meson.build -+++ b/meson.build -@@ -32,6 +32,9 @@ else - endif - - host_system = host_machine.system() -+if host_system == 'mingw32' -+ host_system = 'windows' -+endif - - if host_system == 'darwin' - ios_test_code = '''#include -diff --git a/tests/meson.build b/tests/meson.build -index 6741f8f..12fdc90 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -73,7 +73,7 @@ test_extra_programs = { - 'unicode-collate' : {}, - } - --if host_machine.system() != 'windows' -+if host_system != 'windows' - tests += { - 'timeloop' : {}, - 'iochannel-test' : {}, 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 deleted file mode 100644 index fbdd4c2..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch deleted file mode 100644 index d33fdd4..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 8 Jan 2020 18:22:46 +0100 -Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test - -This test requires building resources in a way that is -not cross-compatible (hardcodes ld and objcopy). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - gio/tests/resources.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/tests/resources.c b/gio/tests/resources.c -index c44d214..e289a01 100644 ---- a/gio/tests/resources.c -+++ b/gio/tests/resources.c -@@ -993,7 +993,7 @@ main (int argc, - g_test_add_func ("/resource/automatic", test_resource_automatic); - /* This only uses automatic resources too, so it tests the constructors and destructors */ - g_test_add_func ("/resource/module", test_resource_module); -- g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); -+ /* g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); */ - #endif - g_test_add_func ("/resource/uri/query-info", test_uri_query_info); - g_test_add_func ("/resource/uri/file", test_uri_file); 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 deleted file mode 100644 index 44482dd..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Oct 2019 17:46:26 -0700 -Subject: [PATCH] meson: Run atomics test on clang as well - -Fixes -./glib-2.62.1/glib/gatomic.c:675:2: error: G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics. -^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index afb6eaa..6aa70f5 100644 ---- a/meson.build -+++ b/meson.build -@@ -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 -- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define') -+ if (cc.get_id() == 'gcc' or cc.get_id() == 'clang') and not cc.compiles(atomicdefine, name : 'atomic ops define') - # Old gcc release may provide - # __sync_bool_compare_and_swap but doesn't define - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch deleted file mode 100644 index 1c645f3..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 3 Oct 2017 10:45:55 +0300 -Subject: [PATCH] Do not hardcode python path into various tools - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- - gobject/glib-genmarshal.in | 2 +- - gobject/glib-mkenums.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in -index 67d3675..4e92a7a 100755 ---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in -+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python3 - - # GDBus - GLib D-Bus Library - # -diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 7380f24..c8abeaa 100755 ---- a/gobject/glib-genmarshal.in -+++ b/gobject/glib-genmarshal.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python3 - - # pylint: disable=too-many-lines, missing-docstring, invalid-name - -diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index 91ad779..3ebef62 100755 ---- a/gobject/glib-mkenums.in -+++ b/gobject/glib-mkenums.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python3 - - # If the code below looks horrible and unpythonic, do not panic. - # 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 deleted file mode 100644 index 41ecfa1..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH] Enable more tests while cross-compiling - -Upstream disables a few tests while cross-compiling because their build requires -running other built binaries. This usually makes sense but in the cross-compile -case we can depend on glib-2.0-native. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Jussi Kukkonen - ---- - gio/tests/meson.build | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -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 -@@ -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() -- if have_dbus_daemon -+ if true - annotate_args = [ - '--annotate', 'org.project.Bar', 'Key1', 'Value1', - '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -548,12 +548,12 @@ if installed_tests_enabled - endforeach - endif - --if not meson.is_cross_build() or meson.has_exe_wrapper() -+if meson.is_cross_build() - - plugin_resources_c = custom_target('plugin-resources.c', - input : 'test4.gresource.xml', - output : 'plugin-resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate-source', -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - - ld = find_program('ld', required : false) - -- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() -+ if not meson.is_cross_build() - test_gresource_binary = custom_target('test5.gresource', - input : 'test5.gresource.xml', - output : 'test5.gresource', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common deleted file mode 100644 index 0d7c5fa..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common +++ /dev/null @@ -1,3 +0,0 @@ -[properties] -# On all known supported architectures the stack grows down -growing_stack = false diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-glibc b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-glibc deleted file mode 100644 index c4648f5..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-glibc +++ /dev/null @@ -1,5 +0,0 @@ -[properties] -have_c99_vsnprintf = true -have_c99_snprintf = true -have_unix98_printf = true -va_val_copy = true diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux deleted file mode 100644 index adad7e6..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux +++ /dev/null @@ -1,5 +0,0 @@ -[properties] -have_proc_self_cmdline = true - -[binaries] -env = '/usr/bin/env' diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-mingw b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-mingw deleted file mode 100644 index 75f911b..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-mingw +++ /dev/null @@ -1,6 +0,0 @@ -[properties] -have_c99_vsnprintf = false -have_c99_snprintf = false -have_unix98_printf = false -va_val_copy = true -have_proc_self_cmdline = false diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-musl b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-musl deleted file mode 100644 index 3049e51..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-musl +++ /dev/null @@ -1,6 +0,0 @@ -[properties] -have_c99_vsnprintf = true -have_c99_snprintf = true -have_unix98_printf = true -va_val_copy = true -have_strlcpy = true 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 deleted file mode 100644 index e300176..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 - -Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to -determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. - -This solves relocation problems with GIOModule for native builds of glib. - -Upstream-Status: Inappropriate -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 ca1daf2..954a250 100644 ---- a/gio/giomodule.c -+++ b/gio/giomodule.c -@@ -51,6 +51,8 @@ - #ifdef G_OS_WIN32 - #include "gregistrysettingsbackend.h" - #include "giowin32-priv.h" -+#else -+#include - #endif - #include - -@@ -1212,7 +1214,15 @@ get_gio_module_dir (void) - NULL); - g_free (install_dir); - #else -- module_dir = g_strdup (GIO_MODULE_DIR); -+ Dl_info info; -+ -+ if (dladdr (g_io_module_new, &info)) { -+ char *libdir = g_path_get_dirname (info.dli_fname); -+ module_dir = g_build_filename (libdir, "gio", "modules", NULL); -+ g_free (libdir); -+ } else { -+ module_dir = g_strdup (GIO_MODULE_DIR); -+ } - #endif - } - --- -2.25.1 - diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/run-ptest b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/run-ptest deleted file mode 100644 index 7a231b5..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -eux -if id -u glib2-test; then - userdel glib2-test -fi -useradd glib2-test -su glib2-test -c 'gnome-desktop-testing-runner glib' -userdel glib2-test diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.70.1.bb b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.70.1.bb deleted file mode 100644 index 8a2290d..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.70.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -require glib.inc - -PE = "1" - -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://run-ptest \ - file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ - file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ - file://0001-Do-not-ignore-return-value-of-write.patch \ - file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ - 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] = "f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0" - -# Find any meson cross files in FILESPATH that are relevant for the current -# build (using siteinfo) and add them to EXTRA_OEMESON. -inherit siteinfo -def find_meson_cross_files(d): - if bb.data.inherits_class('native', d): - return "" - - thisdir = os.path.normpath(d.getVar("THISDIR")) - import collections - sitedata = siteinfo_data(d) - # filename -> found - files = collections.OrderedDict() - for path in d.getVar("FILESPATH").split(":"): - for element in sitedata: - filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - 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)) - items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] - d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) - -python () { - find_meson_cross_files(d) -} diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib.inc b/meta-gnome/recipes-gnome/glib-2.0/glib.inc deleted file mode 100644 index 10d5938..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib.inc +++ /dev/null @@ -1,196 +0,0 @@ -SUMMARY = "A general-purpose utility library" -DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on." -HOMEPAGE = "https://developer.gnome.org/glib/" - -# docs/reference/COPYING is with a 'public domain'-like license! -LICENSE = "LGPLv2.1+ & BSD & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ - file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ - file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" - -CVE_PRODUCT = "glib" - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "glib-2.0-native \ - virtual/libintl \ - virtual/libiconv \ - libffi \ - libpcre \ - zlib" - -PACKAGES += "${PN}-codegen ${PN}-utils" - -LEAD_SONAME = "libglib-2.0.*" - -inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages - -DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" - -GTKDOC_MESON_OPTION = "gtk_doc" - -S = "${WORKDIR}/glib-${PV}" - -PACKAGECONFIG ??= "libmount \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" -PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" -# libelf is auto-detected without a configuration option -PACKAGECONFIG[libelf] = ",,elfutils" -PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" - -EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=disabled" - -do_configure_prepend() { - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in -} - -FILES_${PN} = "${libdir}/lib*${SOLIBS} \ - ${libdir}/gio \ - ${libexecdir}/*gio-querymodules \ - ${datadir}/glib-2.0/schemas" - -FILES_${PN}-utils += "${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources" - -FILES_${PN}-dev += "${libdir}/glib-2.0/include \ - ${libdir}/gio/modules/lib*${SOLIBSDEV} \ - ${libdir}/gio/modules/*.la \ - ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ - ${datadir}/glib-2.0/schemas/gschema.dtd \ - ${datadir}/glib-2.0/valgrind/glib.supp \ - ${datadir}/gettext/its" -FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" -FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ - ${bindir}/gdbus-codegen" -FILES_${PN}-utils = "${bindir}/*" - -SHAREDMIMEDEP = "shared-mime-info" -SHAREDMIMEDEP_class-native = "" -# When cross compiling for Windows we don't want to include this -SHAREDMIMEDEP_mingw32 = "" - -RRECOMMENDS_${PN} += "${SHAREDMIMEDEP}" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -# Valgrind runtime detection works using hand-written assembly, which -# doesn't support mips16e -CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" - -# GLib generally requires gettext to be present so for USE_NLS to yes. For -# native builds as i18n is disabled globally we have to add a gettext-native dependency. -USE_NLS_class-target = "yes" -USE_NLS_class-nativesdk = "yes" -DEPENDS_append_class-native = " gettext-native" - -EXEEXT = "" -EXEEXT_mingw32 = ".exe" - -do_install_append () { - if [ -f ${D}${bindir}/gtester-report ]; then - sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' - fi - - # Remove some unpackaged files - rm -rf ${D}${datadir}/glib-2.0/codegen/__pycache__ - rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc - rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo - - if [ -e ${D}${libdir}/charset.alias ]; then - rm -f ${D}${libdir}/charset.alias - fi - - # Make sure gio-querymodules is unique among multilibs - if test "x${MLPREFIX}" != "x"; then - mv ${D}${libexecdir}/gio-querymodules${EXEEXT} ${D}${libexecdir}/${MLPREFIX}gio-querymodules${EXEEXT} - fi - # Autotools does this, meson does not - mkdir -p ${D}${libdir}/gio/modules -} - -do_install_append_class-target () { - # Tests are only installed on targets, not native builds. Separating this out - # keeps glib-2.0-native from depending on DISTRO_FEATURES - if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then - if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false", "true", d)}; then - rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test - fi - fi - if [ -f ${D}${datadir}/installed-tests/glib/static-link.test ]; then - if test "x${MLPREFIX}" != "x"; then - mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test - fi - fi -} - -# As we do not build python3 for windows, makes no sense to ship the script that's using it -do_install_append_mingw32() { - rm -f ${D}${bindir}/gtester-report -} - -CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml" -CODEGEN_PYTHON_RDEPENDS_mingw32 = "" - -RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" - -RDEPENDS_${PN}-ptest += "${PN}-utils" - -RDEPENDS_${PN}-ptest += "\ - coreutils \ - libgcc \ - dbus \ - gnome-desktop-testing \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - shared-mime-info \ - ${PN}-locale-ja \ - ${PN}-locale-fr \ - ${PN}-locale-el \ - ${PN}-locale-hr \ - ${PN}-locale-lt \ - ${PN}-locale-pl \ - ${PN}-locale-ru \ - ${PN}-locale-th \ - python3-core \ - python3-modules \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-dbusmock', '', d)} \ - ${PN}-codegen \ - " - -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ - glibc-gconv-utf-16 \ - glibc-charmap-utf-8 \ - glibc-gconv-cp1255 \ - glibc-charmap-cp1255 \ - glibc-gconv-utf-32 \ - glibc-gconv-utf-7 \ - glibc-gconv-euc-jp \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ - glibc-charmap-invariant \ - glibc-localedata-translit-cjk-variants \ - locale-base-tr-tr \ - locale-base-lt-lt \ - locale-base-ja-jp.euc-jp \ - locale-base-fa-ir \ - locale-base-ru-ru \ - locale-base-de-de \ - locale-base-hr-hr \ - locale-base-el-gr \ - locale-base-fr-fr \ - locale-base-es-es \ - locale-base-en-gb \ - locale-base-en-us \ - locale-base-pl-pl \ - locale-base-pl-pl.iso-8859-2 \ - " diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.1.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.1.bb index 85e605e..fd7064a 100644 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.1.bb +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME archive library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ @@ -14,6 +14,6 @@ inherit gnomebase gobject-introspection gtk-doc vala SRC_URI[archive.sha256sum] = "646bd50ebad92d91c1be89097a15364156157442cac1471ded7ecb27d9a9150e" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" } diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb index c482944..7d85779 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Default GNOME desktop background images" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" @@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} SRC_URI[archive.sha256sum] = "1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/backgrounds/gnome \ ${datadir}/gnome-background-properties \ " 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 84f553f..9b83c34 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 @@ -1,6 +1,6 @@ SUMMARY = "Bluetooth integration with GNOME desktop" HOMEPAGE = "https://wiki.gnome.org/Projects/GnomeBluetooth" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343" @@ -10,11 +10,11 @@ SRC_URI[archive.sha256sum] = "0a068e3bddbbdab46991521e6624098579abe80da242398bdd DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" -ERROR_QA_remove = "unknown-configure-option" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext -FILES_${PN} += "${datadir}/icons" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gettext gtk-doc +FILES:${PN} += "${datadir}/icons" -EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.1.bb index b73ac08..fa0aeca 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.1.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME Settings" DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" @@ -71,14 +71,14 @@ SRC_URI[archive.sha256sum] = "ea0c71484c65ce2cc11376f9b01e6211fa4a7ffd334f4307fc SRC_URI += " file://0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/gnome-shell \ ${datadir}/metainfo \ " -FILES_${PN}-dev += "${datadir}/gettext" +FILES:${PN}-dev += "${datadir}/gettext" -RDEPENDS_${PN} += "gsettings-desktop-schemas" +RDEPENDS:${PN} += "gsettings-desktop-schemas" EXTRA_OEMESON = "--buildtype=release -Dcheese=false -Ddocumentation=false -Dstaging_dir=${STAGING_DIR_TARGET}" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.1.bb index 92ba8b8..8a381b8 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.1.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.1.bb @@ -1,31 +1,26 @@ SUMMARY = "GNOME library which provides API shared by several components and applications" SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-icon-cache gconf mime pkgconfig upstream-version-is-even gobject-introspection +inherit gnomebase gtk-icon-cache gconf mime pkgconfig upstream-version-is-even gobject-introspection gtk-doc -ERROR_QA_remove = "unknown-configure-option" +GIR_MESON_OPTION = "" +GTKDOC_MESON_OPTION = "gtk_doc" -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] = "be8aafa64d7ba2fd31079eed639d39fda1ea77ef77d35a678f019c4d91d473c2" DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp" -inherit gtk-doc - EXTRA_OEMESON = "-Ddesktop_docs=false -Dgnome_distributor='Subgraph'" PACKAGES =+ "libgnome-desktop" -FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" +FILES:libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" -RRECOMMENDS_libgnome-desktop += "gsettings-desktop-schemas" +RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb index fecabc8..469ba98 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME disk utility" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "x11/gnome" @@ -37,7 +37,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} " SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/metainfo \ ${datadir}/dbus-1 \ " diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb index e0d5f31..0ec686e 100644 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Screenshot" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" @@ -14,6 +14,6 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} SRC_URI[archive.sha256sum] = "368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2" -FILES_${PN} += "${datadir}/dbus-1/services" -FILES_${PN}-dev += "${datadir}/metainfo" +FILES:${PN} += "${datadir}/dbus-1/services" +FILES:${PN}-dev += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb index 5fbf435..ff1e6b4 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME session" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ @@ -34,7 +34,7 @@ SRC_URI += " \ " EXTRA_OEMESON += "-Dsystemd=true -Dsystemd_journal=true -Ddocbook=false -Dman=false" -FILES_${PN} += " \ +FILES:${PN} += " \ ${bindir}/gnome-session \ ${libexecdir}/gnome-session-ctl \ ${datadir}/xsessions \ @@ -42,4 +42,4 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} += "gnome-shell gnome-settings-daemon gsettings-desktop-schemas" +RDEPENDS:${PN} += "gnome-shell gnome-settings-daemon gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb index 0b20539..9c437a7 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb @@ -1,30 +1,25 @@ SUMMARY = "A set of daemons that manage and provide various parameters to applications" HOMEPAGE = "https://wiki.gnome.org/Initiatives/Wayland/gnome-settings-daemon" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "pango gnome-desktop xorgproto libnotify fontconfig libgudev libxext wayland glib-2.0 libxi libx11 libwacom libxtst gsettings-desktop-schemas intltool-native gtk+3 polkit upower lcms glib-2.0-native wayland colord geoclue libcanberra geocode-glib libgweather pulseaudio networkmanager" -FILES_${PN} += "\ +FILES:${PN} += "\ ${systemd_user_unitdir} \ ${libdir}/gnome-settings-daemon-41 \ " -FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" +FILES:${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext meson-exe-wrapper -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" +GIR_MESON_OPTION = "" SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884" SRC_URI += "file://0001-disable-power-tests-and-sharing.patch" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.1.bb index cee8adf..aa01d54 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.1.bb @@ -1,9 +1,9 @@ -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" REQUIRED_DISTRO_FEATURES = "x11 systemd pam" -ERROR_QA_remove = "unknown-configure-option" +GIR_MESON_OPTION = "" SRCREV = "d85bd654a3c830a8c3982286c1876321c96faf7d" @@ -23,7 +23,7 @@ DEPENDS = " \ mutter \ gcr \ gjs \ - mozjs78 \ + mozjs-91 \ network-manager-applet \ gnome-autoar \ polkit \ @@ -33,9 +33,9 @@ DEPENDS = " \ gsettings-desktop-schemas \ " -RDEPENDS_${PN} = "gsettings-desktop-schemas librsvg-gtk" +RDEPENDS:${PN} = "gsettings-desktop-schemas librsvg-gtk" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/dbus-1 \ ${datadir}/xdg-desktop-portal \ ${datadir}/gnome-control-center \ @@ -44,16 +44,16 @@ FILES_${PN} += "\ " PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools += "\ +FILES:${PN}-tools += "\ /usr/bin/gnome-shell-perf-tool \ /usr/bin/gnome-shell-extension-tool \ " -do_compile_prepend() { +do_compile:prepend() { rm -f ${B}/data/theme/*.css } -do_configure_append () { +do_configure:append () { MUTTER_DIR="/usr/lib/mutter" sed --in-place=.old1 "s;=${MUTTER_DIR};=${PKG_CONFIG_SYSROOT_DIR}${MUTTER_DIR};" ${B}/build.ninja } diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb index f8c4f11..d0cf90b 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = " \ @@ -27,9 +27,9 @@ SRC_URI[archive.sha256sum] = "c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa8 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" -RRECOMMENDS_${PN} = "adwaita-icon-theme" +RRECOMMENDS:${PN} = "adwaita-icon-theme" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ " diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.1.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.1.bb index 77ceb46..d7bd0a3 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.1.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.1.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME terminal emulator" HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = " \ @@ -23,13 +23,13 @@ SRC_URI[archive.sha256sum] = "c319b1405501b8c7693e616f48eced41695d2e786148ca5f9e EXTRA_OEMESON = "-Ddocs=false -Dnautilus_extension=false -Dsearch_provider=false" -FILES_${PN} += "\ +FILES:${PN} += "\ ${systemd_user_unitdir} \ ${datadir}/dbus-1/services \ ${datadir}/glib-2.0/schemas \ ${datadir}/metainfo \ " -FILES_${PN}-doc += "\ +FILES:${PN}-doc += "\ ${datadir}/help \ " diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb index aed9f90..55cf362 100644 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb +++ b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb @@ -2,7 +2,7 @@ SUMMARY = "GNOME desktop-wide GSettings schemas" HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 intltool-native" diff --git a/meta-gnome/recipes-gnome/gtk4/gtk4.inc b/meta-gnome/recipes-gnome/gtk4/gtk4.inc index b5331f5..5795f31 100644 --- a/meta-gnome/recipes-gnome/gtk4/gtk4.inc +++ b/meta-gnome/recipes-gnome/gtk4/gtk4.inc @@ -8,7 +8,7 @@ SECTION = "libs" DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf libepoxy graphene libxcursor libxinerama libxi sassc-native \ gdk-pixbuf-native wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" -LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" GNOMEBASEBUILDCLASS = "meson" @@ -27,7 +27,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # it here avoids rebuilding everything. export PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" -do_configure_prepend() { +do_configure:prepend() { # Do this because the configure script is running ./libtool directly rm -f libtool ln -s ${TARGET_PREFIX}libtool libtool @@ -40,25 +40,25 @@ EXTRA_OEMESON += " \ -Dmedia-gstreamer=disabled \ " -do_compile_prepend() { +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}:append = " ${datadir}/gtk-4.0/emoji " -FILES_${PN}-dev += "\ +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)}" +RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" -python populate_packages_prepend () { +python populate_packages:prepend () { import os.path gtk_libdir = d.expand('${libdir}/gtk-4.0/${LIBV}') diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb index 1a03cc6..abd4956 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" GNOMEBASEBUILDCLASS = "meson" @@ -33,7 +33,7 @@ EXTRA_OEMESON = " \ -Dudisks2=true \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/glib-2.0 \ ${datadir}/GConf \ ${datadir}/dbus-1/services \ @@ -42,17 +42,17 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} = "udisks2" +RDEPENDS:${PN} = "udisks2" -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES_${PN}-dev += "${libdir}/gio/modules/*.la" +FILES:${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES:${PN}-dev += "${libdir}/gio/modules/*.la" PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" # needs meta-filesystems PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" -do_install_append() { +do_install:append() { # After rebuilds (not from scracth) it can happen that the executables in # libexec ar missing executable permission flag. Not sure but it came up diff --git a/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb index 832254a..0011b04 100644 --- a/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb +++ b/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb @@ -5,13 +5,13 @@ SECTION = "libs" DEPENDS = "glib-2.0" BBCLASSEXTEND = "native" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PE = "1" inherit gnomebase vala gobject-introspection -do_configure_prepend() { +do_configure:prepend() { MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" for i in ${MACROS}; do rm -f m4/$i diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index c971d16..5bf1e8a 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Library for accessing information about running processes" HOMEPAGE = "https://developer.gnome.org/libgtop/stable/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "libx11 glib-2.0 libxau" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb index 95e9756..d67dff8 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb @@ -1,30 +1,28 @@ SUMMARY = "Location and timezone database and weather lookup library" HOMEPAGE = "https://wiki.gnome.org/Projects/LibGWeather" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit meson pkgconfig gobject-introspection gettext +GNOMEBASEBUILDCLASS = "meson" -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) +inherit gnomebase meson pkgconfig gobject-introspection gettext features_check -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" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" -FILES_${PN} += "${datadir}/glib-2.0/schemas" +GTKDOC_MESON_OPTION = "gtk_doc" +FILES:${PN} += "${datadir}/glib-2.0/schemas" -#EXTRA_OEMESON = "--buildtype=release -Denable-introspection=true" SECTION ?= "x11/gnome" -FILES_${PN} += "${datadir}/application-registry \ +FILES:${PN} += "${datadir}/application-registry \ ${datadir}/mime-info \ ${datadir}/mime/packages \ ${datadir}/mime/application \ @@ -36,9 +34,9 @@ FILES_${PN} += "${datadir}/application-registry \ ${datadir}/icons \ " -FILES_${PN}-doc += "${datadir}/devhelp" +FILES:${PN}-doc += "${datadir}/devhelp" -do_install_append() { +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/mutter/mutter_41.1.bb b/meta-gnome/recipes-gnome/mutter/mutter_41.1.bb index d02d4c0..84a7682 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_41.1.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Window and compositing manager based on Clutter" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ @@ -14,7 +14,7 @@ DEPENDS = " \ libcanberra \ mesa \ upower \ - xserver-xorg \ + xwayland \ gtk+3 \ gdk-pixbuf \ cairo \ @@ -35,7 +35,7 @@ DEPENDS = " \ gobject-introspection-native \ " -RDEPENDS_${PN} += " xserver-xorg-xwayland zenity" +RDEPENDS:${PN} += " xwayland zenity" SRCREV = "7cab502754edef977215bdfc9f8dfa0849a426f3" @@ -67,7 +67,7 @@ EXTRA_OEMESON += " \ MUTTER_API_NAME = "mutter-9" -do_install_append() { +do_install:append() { # Add gir links in standard paths. That makes dependents life much easier # to find them install -d ${D}${datadir}/gir-1.0 @@ -79,20 +79,20 @@ do_install_append() { PACKAGES =+ "${PN}-tests" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/gnome-control-center \ ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ ${libdir}/${MUTTER_API_NAME}/*.typelib \ ${libdir}/${MUTTER_API_NAME}/plugins \ " -FILES_${PN}-tests += " \ +FILES:${PN}-tests += " \ ${datadir}/installed-tests \ ${datadir}/${MUTTER_API_NAME}/tests \ ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/${MUTTER_API_NAME}/*.gir \ ${libdir}/${MUTTER_API_NAME}/lib*.so \ " 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 index bc3e66c..760c514 100644 --- 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 @@ -1,5 +1,5 @@ SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" @@ -20,9 +20,9 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" -RDEPENDS_${PN} =+ "networkmanager" +RDEPENDS:${PN} =+ "networkmanager" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/nm-applet/ \ ${datadir}/libnma/wifi.ui \ ${datadir}/metainfo \ diff --git a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb index 49cc46d..1ee6ddb 100644 --- a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb +++ b/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb @@ -1,4 +1,4 @@ -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI[archive.md5sum] = "ece4547298a81105f307369d73c21b9d" 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 index af2bab3..9b4e083 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Collection of scripts and build utilities for documentation" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ @@ -16,6 +16,6 @@ DEPENDS += " \ SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e" SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9" -RDEPENDS_${PN} += "yelp-xsl" +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 index 14a8850..bf60129 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb @@ -1,5 +1,5 @@ SUMMARY = "XSL stylesheets for the yelp help browser" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ @@ -13,9 +13,9 @@ DEPENDS += "libxml2" SRC_URI[archive.md5sum] = "7d71af68fff4a92bcb2b8989f126be6c" SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3" -RDEPENDS_${PN}_append_class-target = " libxml2 itstool" +RDEPENDS:${PN}:append:class-target = " libxml2 itstool" # ensure our native consumers are forced to inherit itstool -RDEPENDS_${PN}_append_class-native = " libxml2-native" +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 index b9263f5..cc826cc 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Help browser for the GNOME desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ " @@ -23,13 +23,13 @@ DEPENDS += " \ yelp-xsl \ " -do_configure_prepend() { +do_configure:prepend() { export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/metainfo \ ${datadir}/yelp-xsl \ " -RDEPENDS_${PN} += "yelp-xsl" +RDEPENDS:${PN} += "yelp-xsl" diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb index 5d96c48..4fceb06 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_3.30.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME port of Dialog to display dialog boxes from shell scripts" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" inherit gnomebase gtk-icon-cache gconf mime perlnative gettext diff --git a/meta-gnome/recipes-support/ell/ell_0.44.bb b/meta-gnome/recipes-support/ell/ell_0.44.bb index 35d177c..21406ad 100644 --- a/meta-gnome/recipes-support/ell/ell_0.44.bb +++ b/meta-gnome/recipes-support/ell/ell_0.44.bb @@ -7,7 +7,7 @@ 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" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "dbus" @@ -19,6 +19,6 @@ SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.ta " SRC_URI[sha256sum] = "41a6f8fa4d285b52cb7a5a87bda3e7370ecaac02d94aaa7ec1a23f0480b8bc3f" -do_configure_prepend () { +do_configure:prepend () { mkdir -p ${S}/build-aux } diff --git a/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb b/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb index ca27bd5..b12d963 100644 --- a/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb +++ b/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb @@ -1,5 +1,5 @@ SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "zlib expat" @@ -12,8 +12,8 @@ inherit cmake gettext S = "${WORKDIR}/${BPN}-trunk" -INSANE_SKIP_${PN} = "useless-rpaths" +INSANE_SKIP:${PN} = "useless-rpaths" -do_install_preend() { +do_install:preend() { install -d ${D}${mandir} } diff --git a/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb b/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb index d9cc0c7..73b9eac 100644 --- a/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb +++ b/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb @@ -16,5 +16,5 @@ GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Dinstalled_tests=false" -FILES_${PN} += "${libdir}/graphene-1.0" +FILES:${PN} += "${libdir}/graphene-1.0" BBCLASSEXTEND = "native" 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 65ee1e1..768f1bd 100644 --- a/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb +++ b/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Small gobject library for playing system sounds" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=447b837ae57f08b7060593ac6256163f" DEPENDS = " \ diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb index caec455..2d733ce 100644 --- a/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -19,19 +19,19 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " -do_configure_prepend() { +do_configure:prepend() { # run native unicode-parser sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/GConf \ ${datadir}/glib-2.0 \ ${libdir}/gtk-3.0 \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/gettext \ " diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index ea413cf..23f565f 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -1,6 +1,6 @@ SUMMARY = "Intelligent Input Bus for Linux/Unix" HOMEPAGE = "https://github.com/ibus/ibus/wiki" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala @@ -10,7 +10,7 @@ PV = "1.5.23+git${SRCPV}" DEPENDS = "unicode-ucd" SRC_URI = " \ - git://github.com/ibus/ibus.git \ + git://github.com/ibus/ibus.git;branch=master;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" @@ -30,7 +30,7 @@ EXTRA_OECONF = " \ --disable-python2 \ " -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ChangeLog touch ${S}/ABOUT-NLS } diff --git a/meta-gnome/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-gnome/recipes-support/libcanberra/libcanberra_0.30.bb index 4a10cd5..b99174f 100644 --- a/meta-gnome/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-gnome/recipes-support/libcanberra/libcanberra_0.30.bb @@ -1,6 +1,6 @@ SUMMARY = "An implementation of XDG Sound Theme and Name specification for generating sound events on free desktops" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz" @@ -9,18 +9,18 @@ SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c60 DEPENDS = "libtool glib-2.0 alsa-lib libvorbis systemd gtk+3" -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/${PN}-${PV} \ ${datadir}/gnome \ ${datadir}/gdm \ ${libdir}/gtk-3.0 \ " -FILES_${PN}-dev += "\ +FILES:${PN}-dev += "\ ${libdir}/gnome-settings-daemon-3.0 \ ${libdir}/gtk-3.0/modules/libcanberra-gtk-module.so \ " -do_install_append () { +do_install:append () { rm -rf ${D}/${datadir}/vala } diff --git a/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb b/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb index 65f5b6a..db6cc25 100644 --- a/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb +++ b/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb @@ -1,6 +1,6 @@ SUMMARY = "DVD access multimeda library" SECTION = "libs/multimedia" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8 inherit autotools lib_package binconfig pkgconfig -CONFIGUREOPTS_remove = "--disable-silent-rules" +CONFIGUREOPTS:remove = "--disable-silent-rules" diff --git a/meta-gnome/recipes-support/libgudev/libgudev_237.bb b/meta-gnome/recipes-support/libgudev/libgudev_237.bb deleted file mode 100644 index 808e966..0000000 --- a/meta-gnome/recipes-support/libgudev/libgudev_237.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "GObject wrapper for libudev" -DESCRIPTION = "This library makes it much simpler to use libudev from programs \ -already using GObject. It also makes it possible to easily use libudev from \ -other programming languages, such as Javascript, because of GObject \ -introspection support." -HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" -SRC_URI[archive.sha256sum] = "0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa" - -DEPENDS = "glib-2.0 udev" - -RCONFLICTS_${PN} = "systemd (<= 220)" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -GTKDOC_MESON_OPTION = 'gtk_doc' - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gtk-doc - -UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" -UPSTREAM_CHECK_REGEX = "(?P(\d+))" diff --git a/meta-gnome/recipes-support/libndp/libndp_1.6.bb b/meta-gnome/recipes-support/libndp/libndp_1.6.bb index 5148798..f924edd 100644 --- a/meta-gnome/recipes-support/libndp/libndp_1.6.bb +++ b/meta-gnome/recipes-support/libndp/libndp_1.6.bb @@ -1,9 +1,9 @@ SUMMARY = "Library for IPv6 Neighbor Discovery Protocol" HOMEPAGE = "http://libndp.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/jpirko/libndp \ +SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ file://0001-include-sys-select.h-for-fd_-definitions.patch \ " # tag for v1.6 diff --git a/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb b/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb index c0a7dd6..96e16f6 100644 --- a/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb +++ b/meta-gnome/recipes-support/libnma/libnma_1.8.30.bb @@ -1,5 +1,5 @@ SUMMARY = "NetworkManager GUI library" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0 gtk+3 networkmanager" @@ -20,8 +20,8 @@ PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_inf # 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" +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/libpwquality/libpwquality_1.4.0.bb b/meta-gnome/recipes-support/libpwquality/libpwquality_1.4.0.bb index 56491a5..1e5d99e 100644 --- a/meta-gnome/recipes-support/libpwquality/libpwquality_1.4.0.bb +++ b/meta-gnome/recipes-support/libpwquality/libpwquality_1.4.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Library for password quality checking and generating random passwords" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" SRC_URI = "https://github.com/libpwquality/libpwquality/releases/download/libpwquality-${PV}/libpwquality-${PV}.tar.bz2" @@ -8,8 +8,8 @@ SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232 DEPENDS = "cracklib libpam" -FILES_${PN} += "/usr/lib/security" -FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" +FILES:${PN} += "/usr/lib/security" +FILES:${PN}-staticdev += "${libdir}/security/pam_pwquality.a" inherit gettext autotools diff --git a/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb index e6129e2..9c239d2 100644 --- a/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb +++ b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb @@ -1,6 +1,6 @@ SUMMARY = "A library for loose coupling of C++ method calls" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" @@ -13,8 +13,8 @@ S = "${WORKDIR}/libsigc++-${PV}" inherit autotools -FILES_${PN}-dev += "${libdir}/sigc++-*/" -FILES_${PN}-doc += "${datadir}/devhelp" +FILES:${PN}-dev += "${libdir}/sigc++-*/" +FILES:${PN}-doc += "${datadir}/devhelp" BBCLASSEXTEND = "native" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb index fc4f5d6..818c1b0 100644 --- a/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb +++ b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb @@ -1,6 +1,6 @@ SUMMARY = "A library for loose coupling of C++ method calls" SECTION = "libs" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" DEPENDS = "mm-common" @@ -13,8 +13,8 @@ S = "${WORKDIR}/libsigc++-${PV}" inherit setuptools3 meson -FILES_${PN}-dev += "${libdir}/sigc++-*/" -FILES_${PN}-doc += "${datadir}/devhelp" +FILES:${PN}-dev += "${libdir}/sigc++-*/" +FILES:${PN}-doc += "${datadir}/devhelp" BBCLASSEXTEND = "native" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-gnome/recipes-support/libxfixes/libxfixes_6.0.0.bb b/meta-gnome/recipes-support/libxfixes/libxfixes_6.0.0.bb deleted file mode 100644 index af7426f..0000000 --- a/meta-gnome/recipes-support/libxfixes/libxfixes_6.0.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "XFixes: X Fixes extension library" - -DESCRIPTION = "X applications have often needed to work around various \ -shortcomings in the core X window system. This extension is designed to \ -provide the minimal server-side support necessary to eliminate problems \ -caused by these workarounds." - -require xorg-lib-common.inc -SRC_URI[sha256sum] = "a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c" - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" - -DEPENDS += "virtual/libx11 xorgproto" - -PE = "1" - -XORG_PN = "libXfixes" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-gnome/recipes-support/libxfixes/xorg-lib-common.inc b/meta-gnome/recipes-support/libxfixes/xorg-lib-common.inc deleted file mode 100644 index a566eaa..0000000 --- a/meta-gnome/recipes-support/libxfixes/xorg-lib-common.inc +++ /dev/null @@ -1,26 +0,0 @@ -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "util-macros" - -XORG_PN = "${BPN}" - -SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools features_check pkgconfig - -EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" - -UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ - --disable-specs --without-groff --without-ps2pdf --without-fop \ - --without-xmlto --with-xmlto \ -" - -REQUIRED_DISTRO_FEATURES ?= "x11" diff --git a/meta-gnome/recipes-support/libxfixes/xorgproto_2021.4.99.2.bb b/meta-gnome/recipes-support/libxfixes/xorgproto_2021.4.99.2.bb deleted file mode 100644 index 8db3e6d..0000000 --- a/meta-gnome/recipes-support/libxfixes/xorgproto_2021.4.99.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "X Window System unified protocol definitions" -DESCRIPTION = "This package provides the headers and specification documents defining \ -the core protocol and (many) extensions for the X Window System" -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -SECTION = "x11/libs" -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=dfc4bd2b0568b31725b85b0604e69b56" - -SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2" -SRC_URI[sha256sum] = "c38878053179c6f8bc2daeeeeb4710b5fbf0e46db5b3134aee4a1977ffb06e7a" - -inherit meson - -PACKAGECONFIG ??= "" -PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" - -# Datadir only used to install pc files, $datadir/pkgconfig -datadir="${libdir}" -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb b/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb index 0e09c3a..4769032 100644 --- a/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb +++ b/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb @@ -1,7 +1,7 @@ SUMMARY = "C++ bindings for the atk" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" @@ -16,4 +16,4 @@ SRC_URI[archive.sha256sum] = "4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc EXTRA_OECONF = " --disable-documentation " -FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" +FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb b/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb index d49a509..5a7c468 100644 --- a/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb +++ b/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb @@ -1,6 +1,6 @@ SUMMARY = "C++ bindings for Cairo graphics library" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9" inherit gnomebase @@ -10,6 +10,6 @@ DEPENDS = "cairo libsigc++-2.0" SRC_URI[archive.md5sum] = "c62b476b61bd0abf7e9851f417d73291" SRC_URI[archive.sha256sum] = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6" -FILES_${PN}-doc += "${datadir}/devhelp" -FILES_${PN}-dev += "${libdir}/cairomm-*/" +FILES:${PN}-doc += "${datadir}/devhelp" +FILES:${PN}-dev += "${libdir}/cairomm-*/" diff --git a/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb b/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb index 75eea4e..1f75ace 100644 --- a/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb +++ b/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb @@ -1,7 +1,7 @@ SUMMARY = "C++ bindings for the glib library" HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" @@ -16,7 +16,7 @@ SRC_URI += " \ SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e" SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/glibmm-2.4 install -d ${D}${datadir}/aclocal @@ -28,8 +28,8 @@ do_install_append() { done } -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" +FILES:${PN} = "${libdir}/lib*.so.*" +FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" -RDEPENDS_${PN}-dev = "perl" +RDEPENDS:${PN}-dev = "perl" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb b/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb index adc38d8..d851916 100644 --- a/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb +++ b/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb @@ -2,7 +2,7 @@ SUMMARY = "C++ bindings for the GTK+ toolkit V3" HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" @@ -20,4 +20,4 @@ SRC_URI += "file://0001-do-not-build-demos.patch" EXTRA_OECONF = " --disable-documentation " -FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" +FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb b/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb index 207d939..51e1ab2 100644 --- a/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb +++ b/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Common GNOME build files for C++ bindings" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb b/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb index 57d9ff9..829c0b4 100644 --- a/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb +++ b/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb @@ -1,6 +1,6 @@ SUMMARY = "C++ bindings for the pango library" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" @@ -18,6 +18,6 @@ REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = " --disable-documentation " -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/" +FILES:${PN} = "${libdir}/lib*.so.*" +FILES:${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/" diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch new file mode 100644 index 0000000..e09848f --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch @@ -0,0 +1,29 @@ +From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 1 Oct 2021 13:00:24 +0200 +Subject: [PATCH] Cargo.toml: do not abort on panic + +OE's rust is configured to unwind, and this setting clashes with it/ + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + Cargo.toml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -51,13 +51,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" + + # Optimize build dependencies, because bindgen and proc macros / style + # compilation take more to run than to build otherwise. diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch new file mode 100644 index 0000000..a2ccf6b --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -0,0 +1,28 @@ +From e5b95b3918588e2930c9af7ba304c57e871b2d55 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 7 Oct 2021 12:44:18 +0200 +Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' + names + +The outcome is that processed names no longer match our custom rust +target definitions, and the build fails. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + build/moz.configure/init.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 3a164c6558..99dfc9054a 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -823,7 +823,7 @@ def help_host_target(help, host, target): + + def config_sub(shell, triplet): + config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") +- return check_cmd_output(shell, config_sub, triplet).strip() ++ return triplet + + + @depends("--host", shell) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch new file mode 100644 index 0000000..7b93817 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch @@ -0,0 +1,56 @@ +From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 18 Nov 2021 07:16:39 +0000 +Subject: [PATCH] Rewrite cargo-host-linker in python3 + +Mozjs compile failed with this failure: +/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) + +Root Cause: +cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd +with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links +libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But +host libc is older libc. So the incompatible problem occurred. + +Solution: +rewrite cargo-host-linker in python3 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li +--- + build/cargo-host-linker | 24 +++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/build/cargo-host-linker b/build/cargo-host-linker +index cbd0472bf7..ccd8bffec1 100755 +--- a/build/cargo-host-linker ++++ b/build/cargo-host-linker +@@ -1,3 +1,21 @@ +-#!/bin/sh +-# See comment in cargo-linker. +-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' ++#!/usr/bin/env python3 ++ ++import os,sys ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): ++ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] ++else: ++ sys.exit(0) ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++else: ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] ++ ++os.execvp(binary, args) +-- +2.33.1 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000..5472edd --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -0,0 +1,50 @@ +From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 11 Nov 2021 16:05:54 +0800 +Subject: [PATCH] util.configure: fix one occasionally reproduced configure + failure + +error: +| checking whether the C++ compiler supports -Wno-range-loop-analysis... +| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: +| DEBUG: | int +| DEBUG: | main(void) +| DEBUG: | { +| DEBUG: | +| DEBUG: | ; +| DEBUG: | return 0; +| DEBUG: | } +| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c +| DEBUG: The command returned non-zero exit status 1. +| DEBUG: Its error output was: +... +| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler +| os.remove(path) +| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' + +It should be another process that deleted this file by using +"rm -rf conftest*" inappropriately + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] + +Signed-off-by: Changqing Li +--- + build/moz.configure/util.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index 8f35e89c73..84e256647d 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): + "C++": ".cpp", + }[language] + +- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) ++ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) + try: + source = source.encode("ascii", "replace") + +-- +2.17.1 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch new file mode 100644 index 0000000..6ff83e3 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch @@ -0,0 +1,43 @@ +From 0133ddb86eb6e0741e02b0032c41468db6438530 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 1 Oct 2021 13:01:10 +0200 +Subject: [PATCH] moz.configure: do not look for llvm-objdump + +This avoid dragging in a dependency that isn't even needed +for js builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + moz.configure | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/moz.configure b/moz.configure +index fc66b520d0..15de9a2ee0 100755 +--- a/moz.configure ++++ b/moz.configure +@@ -994,15 +994,15 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): + return (llvm_objdump,) + + +-llvm_objdump = check_prog( +- "LLVM_OBJDUMP", +- llvm_objdump, +- what="llvm-objdump", +- when="--enable-compile-environment", +- paths=clang_search_path, +-) +- +-add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) ++#llvm_objdump = check_prog( ++# "LLVM_OBJDUMP", ++# llvm_objdump, ++# what="llvm-objdump", ++# when="--enable-compile-environment", ++# paths=clang_search_path, ++#) ++ ++#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) + + + option("--enable-dtrace", help="Build with dtrace support") diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch new file mode 100644 index 0000000..c440bf1 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch @@ -0,0 +1,65 @@ +From 749ba11fd6a69c8180945d4866415d16ae06a9c0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 1 Oct 2021 13:02:17 +0200 +Subject: [PATCH] rust.configure: do not try to find a suitable upstream target + +OE is using custom targets and so this is bound to fail. + +Upstream-Status: Inapppropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + build/moz.configure/rust.configure | 34 ++---------------------------- + 1 file changed, 2 insertions(+), 32 deletions(-) + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index cd77d72bb7..4b6481cbe3 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -459,33 +459,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): + def rust_host_triple( + rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target + ): +- rustc_target = detect_rustc_target( +- host, compiler_info, arm_target, rust_supported_targets +- ) +- if rustc_target != rustc_host: +- if host.alias == rustc_target: +- configure_host = host.alias +- else: +- configure_host = "{}/{}".format(host.alias, rustc_target) +- die( +- dedent( +- """\ +- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). +- +- You can solve this by: +- * Set your configure host to match the rust compiler host by editing your +- mozconfig and adding "ac_add_options --host={rustc}". +- * Or, install the rust toolchain for {configure}, if supported, by running +- "rustup default stable-{rustc_target}" +- """.format( +- rustc=rustc_host, +- configure=configure_host, +- rustc_target=rustc_target, +- ) +- ) +- ) +- assert_rust_compile(host, rustc_target, rustc) +- return rustc_target ++ return rustc_host + + + @depends( +@@ -495,11 +469,7 @@ def rust_host_triple( + def rust_target_triple( + rustc, target, compiler_info, rust_supported_targets, arm_target + ): +- rustc_target = detect_rustc_target( +- target, compiler_info, arm_target, rust_supported_targets +- ) +- assert_rust_compile(target, rustc_target, rustc) +- return rustc_target ++ return target.alias + + + set_config("RUST_TARGET", rust_target_triple) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch new file mode 100644 index 0000000..b56f0b9 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch @@ -0,0 +1,35 @@ +From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mfbt/RandomNum.cpp ++++ b/mfbt/RandomNum.cpp +@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV + # elif defined(__s390__) + # define GETRANDOM_NR 349 + # elif defined(__mips__) +-# include ++# include + # if _MIPS_SIM == _MIPS_SIM_ABI32 + # define GETRANDOM_NR 4353 + # elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch new file mode 100644 index 0000000..f308b48 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch @@ -0,0 +1,21 @@ +Fix build when JIT is disabled on 32bit systems + +This fixes a compile time assert +js/src/wasm/WasmFrame.cpp:57:3: error: static_assert failed due to requirement '(__builtin_offsetof(js::wasm::DebugFrame, frame_) + sizeof(js::wasm::Frame)) % Alignment == 0' "Aligned after pushing DebugFrame" + static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/js/src/wasm/WasmFrame.h ++++ b/js/src/wasm/WasmFrame.h +@@ -230,6 +230,8 @@ class DebugFrame { + // Avoid -Wunused-private-field warnings. + protected: + #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ ++ (defined(JS_CODEGEN_NONE) && \ ++ (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ + defined(JS_CODEGEN_X86) || defined(__wasi__) + // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch new file mode 100644 index 0000000..80bf746 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch @@ -0,0 +1,36 @@ +From 0e0548e3f95e22a39db8d5b934afe0672a3f801b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 1 Nov 2021 08:13:29 +0100 +Subject: [PATCH] Fix build on powerpc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Another fix for (this time JIT enabled) +| <...>/irefox-91.2.0/js/src/wasm/WasmFrame.cpp:57:76: error: static assertion failed: Aligned after pushing DebugFrame +| 57 | static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, +| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + js/src/wasm/WasmFrame.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h +index 893762e..2d90656 100644 +--- a/js/src/wasm/WasmFrame.h ++++ b/js/src/wasm/WasmFrame.h +@@ -232,7 +232,7 @@ class DebugFrame { + #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ + (defined(JS_CODEGEN_NONE) && \ + (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ +- defined(JS_CODEGEN_X86) || defined(__wasi__) ++ defined(JS_CODEGEN_X86) || defined(__wasi__) || defined(__powerpc__) + // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte + // alignment. +-- +2.31.1 + diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch new file mode 100644 index 0000000..c0834af --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch @@ -0,0 +1,15 @@ +Upstream: No +Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: +https://github.com/void-linux/void-packages/issues/2598 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1072,6 +1072,9 @@ if test "$ac_cv_thread_keyword" = yes; t + *-android*|*-linuxandroid*) + : + ;; ++ *-musl*) ++ : ++ ;; + *) + AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) + ;; diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch new file mode 100644 index 0000000..fe9c332 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch @@ -0,0 +1,45 @@ +Add RISCV32 support + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -765,6 +765,9 @@ def split_triplet(triplet, allow_msvc=Fa + elif cpu.startswith("aarch64"): + canonical_cpu = "aarch64" + endianness = "little" ++ elif cpu in ("riscv32", "riscv32gc"): ++ canonical_cpu = "riscv32" ++ endianness = "little" + elif cpu in ("riscv64", "riscv64gc"): + canonical_cpu = "riscv64" + endianness = "little" +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -52,6 +52,7 @@ CPU_bitness = { + "mips64": 64, + "ppc": 32, + "ppc64": 64, ++ 'riscv32': 32, + "riscv64": 64, + "s390": 32, + "s390x": 64, +@@ -94,6 +95,7 @@ CPU_preprocessor_checks = OrderedDict( + ("m68k", "__m68k__"), + ("mips64", "__mips64"), + ("mips32", "__mips__"), ++ ("riscv32", "__riscv && __riscv_xlen == 32"), + ("riscv64", "__riscv && __riscv_xlen == 64"), + ("sh4", "__sh__"), + ("wasm32", "__wasm32__"), +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +@@ -1186,6 +1186,7 @@ class LinuxCrossCompileToolchainTest(Bas + "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1}, + "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1}, + "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, ++ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, + "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, + "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, + } diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb b/meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb new file mode 100644 index 0000000..9b990ec --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb @@ -0,0 +1,79 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" + +SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ + file://0001-Cargo.toml-do-not-abort-on-panic.patch \ + file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ + file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ + file://0004-use-asm-sgidefs.h.patch \ + file://fix-musl-build.patch \ + file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ + file://riscv32.patch \ + file://0005-nojit-32bit-arch-fix.patch \ + file://0006-Fix-build-on-powerpc.patch \ + file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ + file://0001-rewrite-cargo-host-linker-in-python3.patch \ + " +SRC_URI[sha256sum] = "d483a853cbf5c7f93621093432e3dc0b7ed847f2a5318b964828d19f9f087f3a" + +S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" + +inherit pkgconfig perlnative python3native rust + +DEPENDS += "zlib cargo-native python3 icu" +DEPENDS:remove:mipsarch = "icu" +DEPENDS:remove:powerpc:toolchain-clang = "icu" + +B = "${WORKDIR}/build" + +export PYTHONPATH = "${S}/build:${S}/third_party/python/PyYAML/lib3:${S}/testing/mozbase/mozfile:${S}/python/mozboot:${S}/third_party/python/distro:${S}/testing/mozbase/mozinfo:${S}/config:${S}/testing/mozbase/manifestparser:${S}/third_party/python/pytoml:${S}/testing/mozbase/mozprocess:${S}/third_party/python/six:${S}/python/mozbuild:${S}/python/mozbuild/mozbuild:${S}/python/mach:${S}/third_party/python/jsmin:${S}/python/mozversioncontrol" + +export HOST_CC = "${BUILD_CC}" +export HOST_CXX = "${BUILD_CXX}" +export HOST_CFLAGS = "${BUILD_CFLAGS}" +export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" +export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" + +export AS = "${CC}" + +export RUSTFLAGS + +JIT ?= "" +JIT:mipsarch = "--disable-jit" +ICU ?= "--with-system-icu" +ICU:mipsarch = "" +ICU:powerpc:toolchain-clang = "" + +do_configure() { + cd ${B} + python3 ${S}/configure.py \ + --enable-project=js \ + --target=${HOST_SYS} \ + --host=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --disable-jemalloc \ + --disable-strip \ + ${JIT} \ + ${ICU} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +inherit multilib_script multilib_header + +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js91-config" + +do_install:append() { + oe_multilib_header mozjs-91/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js91-config + rm -f ${D}${libdir}/libjs_static.ajs +} + +PACKAGES =+ "lib${BPN}" +FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch deleted file mode 100644 index 69024d0..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 598fdeaac5f695c3f6e050e50b0a7397a4642fe3 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Mon, 4 Oct 2021 08:09:52 -0400 -Subject: [PATCH] Cannot use both branch and rev - ---- - Cargo.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 5aefc282f..971afa3dc 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -58,8 +58,8 @@ debug-assertions = false - [patch.crates-io] - packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } - rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } --nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } --spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } -+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } -+spirv_cross = { git = "https://github.com/kvark/spirv_cross", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } - # failure's backtrace feature might break our builds, see bug 1608157. - failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } - failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch deleted file mode 100644 index 8b2c4fb..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c5797daaddc1fd650eaba09c454a866daab291b2 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Tue, 20 Oct 2020 08:00:41 -0400 -Subject: [PATCH] Force the correct target string with environment variable. - -Otherwise, the cc crate will emit incorrect --target compiler flags. ---- - mozglue/static/rust/build.rs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mozglue/static/rust/build.rs b/mozglue/static/rust/build.rs -index 5bc6bae40..75c2e65a2 100644 ---- a/mozglue/static/rust/build.rs -+++ b/mozglue/static/rust/build.rs -@@ -26,6 +26,7 @@ fn main() { - } - path - }; -+ env::set_var("TARGET", "x86_64-oe-linux"); - let mut build = cc::Build::new(); - build.cpp(true); - // For js-confdefs.h, see wrappers.cpp. diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch deleted file mode 100644 index e70bcf1..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch +++ /dev/null @@ -1,85 +0,0 @@ -From de3d0659eb98f32a6da57c585a5417106bf93f99 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Tue, 20 Oct 2020 08:03:45 -0400 -Subject: [PATCH] Set rust host and target correctly - ---- - build/moz.configure/rust.configure | 44 +++++++++++++++++++++--------- - 1 file changed, 31 insertions(+), 13 deletions(-) - -diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index e5122d6b8..5575267d3 100644 ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -48,15 +48,6 @@ def unwrap_rustup(prog, name): - return - - def from_rustup_which(): -- out = check_cmd_output('rustup', 'which', name, -- executable=prog).rstrip() -- # If for some reason the above failed to return something, keep the -- # PROG we found originally. -- if out: -- log.info('Actually using \'%s\'', out) -- return out -- -- log.info('No `rustup which` output, using \'%s\'', prog) - return prog - - (retcode, stdout, stderr) = get_cmd_output(prog, '+stable') -@@ -218,6 +209,26 @@ def rust_supported_targets(rustc): - return data - - -+option(env='RUST_HOST', -+ nargs=1, -+ help='Define the system type for Rust performing the build') -+ -+@depends('RUST_HOST') -+@checking('rust host', lambda host: host) -+def rust_host_env(value): -+ if value: -+ return value[0] -+ -+option(env='RUST_TARGET', -+ nargs=1, -+ help='Define the system type for Rust where the resulting executables will be used') -+ -+@depends('RUST_TARGET') -+@checking('rust target', lambda target: target) -+def rust_target_env(value): -+ if value: -+ return value[0] -+ - @template - def rust_triple_alias(host_or_target, host_or_target_c_compiler): - """Template defining the alias used for rustc's --target flag. -@@ -228,8 +239,9 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): - - host_or_target_str = {host: 'host', target: 'target'}[host_or_target] - -- @depends(rustc, host_or_target, host_or_target_c_compiler, -- rust_supported_targets, arm_target, when=rust_compiler) -+ @depends(rustc, host_or_target, rust_host_env, rust_target_env, -+ c_compiler, rust_supported_targets, arm_target, -+ when=rust_compiler) - @checking('for rust %s triplet' % host_or_target_str) - @imports('os') - @imports(_from='mozbuild.configure.util', _import='LineIO') -@@ -237,8 +249,14 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): - @imports(_from='six', _import='ensure_binary') - @imports(_from='tempfile', _import='mkstemp') - @imports(_from='textwrap', _import='dedent') -- def rust_target(rustc, host_or_target, compiler_info, -- rust_supported_targets, arm_target): -+ def rust_target(rustc, host_or_target, rust_host_env, rust_target_env, -+ compiler_info, rust_supported_targets, arm_target): -+ -+ specified_targets = {"host": rust_host_env, "target": rust_target_env} -+ specified_target = specified_targets[host_or_target_str] -+ if (specified_target): -+ return specified_target -+ - # Rust's --target options are similar to, but not exactly the same - # as, the autoconf-derived targets we use. An example would be that - # Rust uses distinct target triples for targetting the GNU C++ ABI diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch deleted file mode 100644 index 430e343..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch +++ /dev/null @@ -1,19 +0,0 @@ -From f753e54ce3287920c17612d837a0bd18bfba09d3 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Tue, 20 Oct 2020 08:04:40 -0400 -Subject: [PATCH] Do not add RequiredDefines.h here, instead add to gjs recipe - ---- - js/src/build/js.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in -index d40deb174..06f70ae8d 100644 ---- a/js/src/build/js.pc.in -+++ b/js/src/build/js.pc.in -@@ -11,4 +11,4 @@ Libs: -L${libdir} -l@JS_LIBRARY_NAME@ - # Use -isystem for includes rather than -I, to mark them as "system headers" - # that don't generate warning diagnostics. For justification, see - # https://bugzilla.mozilla.org/show_bug.cgi?id=1539036 --Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@ -+Cflags: -isystem ${includedir}/@JS_LIBRARY_NAME@ 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 deleted file mode 100644 index 6b42575..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78/0005-Remove-Abort-Panic-Strategy.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/avoid-running-autoconf2.13.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/avoid-running-autoconf2.13.patch deleted file mode 100644 index 6483c8c..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78/avoid-running-autoconf2.13.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 88652e61a4cfaf20130b73713468c8dc1dcf224a -Author: Takuro Ashie -Date: Sun Jul 14 20:59:21 2019 +0900 - - Avoid running autoconf2.13 - - Use pre-generated old-configure instead. - - Upstream-Status: Inappropriate [OE-specific] - -diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure -index 7286b23ce86a..87702b520806 100644 ---- a/build/moz.configure/old.configure -+++ b/build/moz.configure/old.configure -@@ -20,6 +20,7 @@ option(env='AUTOCONF', nargs=1, help='Path to autoconf 2.13') - @imports(_from='os.path', _import='exists') - @imports('re') - def autoconf(mozconfig, autoconf): -+ return "autoconf2.13" - mozconfig_autoconf = None - if mozconfig['path']: - make_extra = mozconfig['make_extra'] -@@ -110,7 +110,7 @@ def prepare_configure(old_configure, mozillabuild, mozconfig, autoconf, build_en - old_configure = os.path.join(old_configure_dir, 'js', 'src', - os.path.basename(old_configure)) - -- refresh = True -+ refresh = False - if exists(old_configure): - mtime = getmtime(old_configure) - aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78_78.11.0.bb b/meta-gnome/recipes-support/mozjs78/mozjs78_78.11.0.bb deleted file mode 100644 index e5b661c..0000000 --- a/meta-gnome/recipes-support/mozjs78/mozjs78_78.11.0.bb +++ /dev/null @@ -1,117 +0,0 @@ -SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" -HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" - -# Path: /teams/releng/tarballs-needing-help/mozjs/mozjs-78.11.0.tar.xz -SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/mozjs-78.11.0.tar.bz2;downloadfilename=mozjs78-78.11.0.tar.bz2 \ - file://avoid-running-autoconf2.13.patch \ - 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" -SRC_URI[sha256sum] = "5ad54ac2b0368b9748e08756658eb988d65e5bb088d91baf43267486bcbf1d26" -S = "${WORKDIR}/mozjs-78.11.0" - -inherit autotools pkgconfig perlnative python3native -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" - -# nspr's package-config is ignored so set libs manually -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${HOST_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --disable-tests \ - --disable-jemalloc \ - --disable-debug-symbols \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" - -EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" -EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" - - -export TMP="${B}" -export RUST_HOST="${BUILD_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 - -# -# Silence a host leak while linking native binary (nsinstall_real) used during the -# mozjs build. This should be fixed, but I was unable to find a way to do so. -# -# log.do_compile: -# -# recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-clang -std=gnu99 -o nsinstall_real -DXP_UNIX -O3 host_nsinstall.o host_pathsub.o -# -# recipe-sysroot-native/usr/bin/x86_64-oe-linux-ld: -# -# warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9" is unsafe for cross-compilation -# warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu" is unsafe for cross-compilation -# 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 -# -ERROR_QA_remove = "compile-host-path" - -setup_pythonpath() { - export SHELL="/bin/sh" - cd ${S} - PYTHONPATH="${S}/config:${S}/build" - for mod in which pytoml jsmin distro six pyyaml/lib3; do - PYTHONPATH="$PYTHONPATH:${S}/third_party/python/${mod}" - done - - for sub_dir in python testing/mozbase; do - for module_dir in `ls $sub_dir -1`;do - if [ -d "${S}/$sub_dir/$module_dir" ];then - PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" - fi - done - done - export PYTHONPATH - cd ${B} -} - -do_configure() { - setup_pythonpath - mkdir -p "${B}/_virtualenvs" - ln -s "../../recipe-sysroot-native/usr/lib" "${B}/_virtualenvs/lib" - ${S}/js/src/configure ${EXTRA_OECONF} -} - -do_compile_prepend() { - setup_pythonpath -} - -do_install_prepend() { - setup_pythonpath -} - -do_install_append() { - rm -f ${D}/${libdir}/libjs.a -} - -PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} += "${libdir}/lib*.so" - -FILES_${PN}-dev += "${bindir}/js78-config" -RPROVIDES_lib${BPN} += "libmozjs-78" - -DISABLE_STATIC = "" 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 b29bb78..06f9794 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 @@ -19,4 +19,4 @@ do_install() { cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode } -FILES_${PN} = "${datadir}/unicode/ucd" +FILES:${PN} = "${datadir}/unicode/ucd" 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 deleted file mode 100644 index b4100fc..0000000 --- a/meta-gnome/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ /dev/null @@ -1,42 +0,0 @@ -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-support/vte/vte_0.66.0.bb b/meta-gnome/recipes-support/vte/vte_0.66.0.bb deleted file mode 100644 index 125befa..0000000 --- a/meta-gnome/recipes-support/vte/vte_0.66.0.bb +++ /dev/null @@ -1,64 +0,0 @@ -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+ & MIT-X" -LICENSE_libvte = "LGPLv3+" - -LIC_FILES_CHKSUM = " \ - 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" - -GNOMEBASEBUILDCLASS = "meson" -GIR_MESON_OPTION = 'gir' - -inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection - -SRCREV = "956d3bbd265279c296c56d9fb5ada1fee94768ee" -SRC_URI = "git://gitlab.gnome.org/GNOME/vte.git;protocol=https;branch=vte-0-66" -# 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}" - -# Instead of "inherit vala" we do the relevant settings here so we can -# set DEPENDS based on PACKAGECONFIG. - -# Our patched version of Vala looks in STAGING_DATADIR for .vapi files -export STAGING_DATADIR -# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files -export XDG_DATA_DIRS = "${STAGING_DATADIR}" - -# Help g-ir-scanner find the .so for linking -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" -} - -# Package additional files -FILES_${PN}-dev += "${datadir}/vala/vapi/*" - -PACKAGECONFIG ??= "gnutls" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" -PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -# vala requires gir -PACKAGECONFIG_remove_class-native = "vala" - -CFLAGS += "-D_GNU_SOURCE" - -PACKAGES =+ "libvte ${PN}-prompt" -FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" -FILES_${PN}-prompt = " \ - ${sysconfdir}/profile.d \ - ${libexecdir}/vte-urlencode-cwd \ -" - -FILES_${PN}-dev += "${datadir}/glade/" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-gnome/recipes-support/wayland/libinput/determinism.patch b/meta-gnome/recipes-support/wayland/libinput/determinism.patch deleted file mode 100644 index cb55403..0000000 --- a/meta-gnome/recipes-support/wayland/libinput/determinism.patch +++ /dev/null @@ -1,21 +0,0 @@ -This finds our outer git tree and that version information breaks -determinism of this recipe. Disable it. - -RP 2020/2/6 - -Upstream-Status: Pending -Signed-off-by: Richard Purdie - -Index: libinput-1.14.3/meson.build -=================================================================== ---- libinput-1.14.3.orig/meson.build -+++ libinput-1.14.3/meson.build -@@ -387,7 +387,7 @@ pkgconfig.generate( - libraries : lib_libinput - ) - --git_version_h = vcs_tag(command : ['git', 'describe'], -+git_version_h = vcs_tag(command : ['false'], - fallback : 'unknown', - input : 'src/libinput-git-version.h.in', - output :'libinput-git-version.h') diff --git a/meta-gnome/recipes-support/wayland/libinput/run-ptest b/meta-gnome/recipes-support/wayland/libinput/run-ptest deleted file mode 100644 index d11e6eb..0000000 --- a/meta-gnome/recipes-support/wayland/libinput/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -/usr/libexec/libinput/libinput-test-suite -j1 -if [ $? -eq 0 ]; then - echo 'PASS: libinput-test-suite' -else - echo 'FAIL: libinput-test-suite' -fi - diff --git a/meta-gnome/recipes-support/wayland/libinput_1.19.1.bb b/meta-gnome/recipes-support/wayland/libinput_1.19.1.bb deleted file mode 100644 index 0993415..0000000 --- a/meta-gnome/recipes-support/wayland/libinput_1.19.1.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -DESCRIPTION = "libinput is a library to handle input devices in Wayland \ -compositors and to provide a generic X.Org input driver. It provides \ -device detection, device handling, input device event processing and \ -abstraction so minimize the amount of custom input code compositors need to \ -provide the common set of functionality that users expect." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" - -DEPENDS = "libevdev udev mtdev libcheck" - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://run-ptest \ - file://determinism.patch \ - " -SRC_URI[sha256sum] = "0bdcf5b1783b737854b7af1ca22df67bc36a6fe7c9cfa71f01e9149f9220446d" - -UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig lib_package ptest - -# Patch out build directory, otherwise it leaks into ptest binary -do_configure_append() { - sed -i -e "s,${WORKDIR},,g" config.h - if [ -e "litest-config.h" ]; then - sed -i -e "s,${WORKDIR},,g" litest-config.h - fi -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" - -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ - -Ddocumentation=false \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ - -Dzshcompletiondir=no" - -# package name changed in 1.8.1 upgrade: make sure package upgrades work -RPROVIDES_${PN} = "libinput" -RREPLACES_${PN} = "libinput" -RCONFLICTS_${PN} = "libinput" - -FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" diff --git a/meta-gnome/recipes-support/wayland/wayland-protocols_1.21.bb b/meta-gnome/recipes-support/wayland/wayland-protocols_1.21.bb deleted file mode 100644 index 16452f8..0000000 --- a/meta-gnome/recipes-support/wayland/wayland-protocols_1.21.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - " -SRC_URI[sha256sum] = "b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit allarch autotools pkgconfig - -PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" 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 75b9d06..5e6a39a 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 @@ -1,6 +1,6 @@ SUMMARY = "X.Org X cvt" HOMEPAGE = "https://linux.die.net/man/1/cvt" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" DEPENDS += "pixman-native xorgproto-native libxrandr-native" diff --git a/meta-intel b/meta-intel index 3b386a9..fb23bc3 160000 --- a/meta-intel +++ b/meta-intel @@ -1 +1 @@ -Subproject commit 3b386a9dc80eb61055b74d93f2da582ce2c652c7 +Subproject commit fb23bc3e661685383edd3026e21ca25825c48bc4 diff --git a/meta-rust b/meta-rust deleted file mode 160000 index 920db7b..0000000 --- a/meta-rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 920db7b045c1f721efcc2e1d891516b515b7e7a8 diff --git a/poky b/poky index 0a2ca9d..8c48960 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 0a2ca9d60f3851515a79d5aa9ddd8b4069b5a206 +Subproject commit 8c489602f218bcf21de0d3c9f8cf620ea5f06430