From de0582f0e7de86eaf8c8d90d86ed313273a73774 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 8 Apr 2022 10:23:27 -0500 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-raspberrypi: 31c33d155c..cfbb192e5c: Andrei Gherzan (1): docs: Add information for RTC devices Andrew Penner (2): rpi-cmdline: Add ability to specify CPUs to add to the isolcpus list extra-build-config: Add documentation for the ISOLATED_CPUS configuration variable Jan Vermaete (1): docs: untabify the few tabs in the file Khem Raj (3): userland: Update to latest as of 20220323 picamera-libs: Adjust sourcedir omxplayer: Use internal version of ffmpeg meta-openembedded: af11f6ce73..b9e440ead8: Adrian Freihofer (1): srecord: build fix Andreas Müller (40): octave: upgrade 4.4.1 -> 6.4.0 and overhaul recipe mousepad: upgrade 0.5.8 -> 0.5.9 xfce4-terminal: upgrade 0.8.10 -> 1.0.0 orage: upgrade 4.12.1 -> 4.16.0 orage: enable notify PACKAGECONFIG by default ristretto: upgrade 0.12.1 -> 0.12.2 xarchiver: upgrade 0.5.4.14 -> 0.5.4.17 xfce4-cpufreq-plugin: upgrade 1.2.5 -> 1.2.7 xfce4-cpugraph-plugin: upgrade 1.2.5 -> 1.2.6 xfce4-diskperf-plugin: upgrade 2.6.3 -> 2.7.0 xfce4-notifyd: upgrade 0.6.2 -> 0.6.3 xfce4-screenshooter: upgrade 1.9.9 -> 1.9.10 xfce4-sensors-plugin: upgrade 1.4.2 -> 1.4.3 Allow several components notification meta-xfce: Add Andreas Müller back to maintainers list accountsservice: upgrade 0.6.55 -> 22.08.8 colord-gtk: upgrade 0.2.0 -> 0.3.0 evince: upgrade 41.4 -> 42.1 evolution-data-server: upgrade 3.43.1 -> 3.44.0 file-roller: upgrade 3.40.0 -> 3.42.0 gdm: upgrade 41.0 -> 42.0 gedit: upgrade 41.0 -> 42.0 gfbgraph: upgrade 0.2.4 -> 0.2.5 gnome-calculator upgrade 41.1 -> 42-0 libgweather4: initial add 4.0.0 gnome-calendar 41.2 -> 42.0 gnome-desktop: upgrade 41.2 -> 42.0 libnma: upgrade 1.8.34 -> 1.8.36 gnome-bluetooth4: initial add 42.0 gnome-font-viewer: upgrade 41.0 -> 42.0 yelp-xsl: upgrade 41.1 -> 42.0 yelp-tools: upgrade 41.0 -> 42.0 yelp: upgrade 41.2 -> 42.1 upower: upgrade 0.99.13 -> 0.99.17 / build with mesom upower: fix location of udev-rules with sysvinit gnome-commander: initial add 1.14.2 gnome-text-editor: initial add 42.0 evolution-data-server: re-enable gobject-introspection jack: upgrade 1.19.19 -> 1.19.20 fluidsynth: upgrade 2.2.4 -> 2.2.6 Chen Qi (1): blueman: fix python site-packages installation issue Craig McQueen (1): dnsmasq: Fix a typo in initscript Davide Gardenal (2): python3-wxgtk4: add distro feature check to match dependency fwupd: add COMPATIBLE_HOST to match dependency Jose Quaresma (2): srt: 1.4.2 -> 1.4.3 srt: 1.4.3 -> 1.4.4 Khem Raj (2): xfce4-screenshooter: Add dependency on libxml-parser-perl-native open-vm-tools: Use specific BSD-2-Clause for license Matsunaga-Shinji (2): samba: add 2 cves to allowlist libzip: add CVE-2017-12858 to allowlist Minjae Kim (1): multipath-tools: update SRC_URI Potin Lai (1): libimobiledevice-glue: update recipe Robert Yang (2): wxwidgets: Fix checking for PACKAGECONFIG and DISTRO_FEATURES wxwidgets: git -> gitsm to fix build when no x11 Samuli Piippo (1): python3-qface: upgrade 2.0.6 -> 2.0.7 Xu Huan (5): python3-cheetah: upgrade 3.2.6.post2 -> 3.2.6 python3-evdev: upgrade 1.4.0 -> 1.5.0 python3-google-api-python-client: upgrade 2.36.0 -> 2.42.0 python3-itsdangerous: upgrade 2.1.1 -> 2.1.2 python3-grpcio: upgrade 1.44.0 -> 1.45.0 Yi Zhao (1): dracut: upgrade 055 -> 056 wangmy (20): python3-bitarray: upgrade 2.4.0 -> 2.4.1 python3-click: upgrade 8.0.4 -> 8.1.2 python3-cppy: upgrade 1.2.0 -> 1.2.1 python3-pandas: upgrade 1.4.1 -> 1.4.2 python3-protobuf: upgrade 3.19.4 -> 3.20.0 python3-pychromecast: upgrade 10.3.0 -> 11.0.0 python3-pyparted: upgrade 3.11.7 -> 3.12.0 python3-redis: upgrade 4.2.0 -> 4.2.1 python3-sqlalchemy: upgrade 1.4.32 -> 1.4.34 python3-thrift: upgrade 0.15.0 -> 0.16.0 python3-trafaret: upgrade 2.1.0 -> 2.1.1 python3-twine: upgrade 3.8.0 -> 4.0.0 python3-tzlocal: upgrade 4.1 -> 4.2 python3-websocket-client: upgrade 1.3.1 -> 1.3.2 python3-werkzeug: upgrade 2.0.3 -> 2.1.1 zenity: upgrade 3.41.0 -> 3.42.0 ceres-solver: upgrade 2.0.0 -> 2.1.0 grpc: upgrade 1.45.0 -> 1.45.1 poppler: upgrade 22.03.0 -> 22.04.0 xorg-sgml-doctools: upgrade 1.11 -> 1.12 zhengrq.fnst (2): python3-jdatetime: upgrade 4.0.0 -> 4.1.0 python3-kiwisolver: upgrade 1.4.0 -> 1.4.2 meta-security: da93339112..498ca39cd6: Armin Kuster (5): openscap-daemon: use renamaed python_setuptools_build_meta python3-fail2ban: fix compile issue on some hosts lkrg-module: covert to git fetcher linux-yocto_security.inc: add lkrg kfrags samhain: update to 4.4.7 Ashish Sharma (1): meta-security : Use SPDX style licensing format Davide Gardenal (2): clamav: add COMPATIBLE_HOST to fix build error fscrypt: update dependecy from go-dep-native to go-native Robert Yang (1): LICENSE: adopt SPDX standard names poky: 1976521190..ed98f1a1ae: Abongwa Amahnui Bonalais (1): oe-init-build-env: add quotes around variables to prevent word splitting Alessio Igor Bogani (1): kernel.bbclass: Use KERNEL_IMAGEDEST instead of hardcoded boot path Alexandre Belloni (1): pseudo: Fix handling of absolute links Bruce Ashfield (6): linux-yocto/5.15: update to v5.15.32 linux-yocto/5.10: update to v5.10.109 linux-yocto/5.15: aufs: fixes and optimization linux-yocto-rt/5.15: aufs: compile fix linux-yocto/5.15: features/security: Move x86_64 configs to separate file linux-yocto/5.10: features/security: Move x86_64 configs to separate file Carlos Rafael Giani (1): libsdl2: Disable libunwind dependency in native builds Claudius Heine (1): os-release: add os-release-initrd package Ferry Toth (1): package_manager: sign DEB package feeds Joe Slater (1): unzip: fix CVE-2021-4217 Khem Raj (1): glib-2.0: Backport patches C++ variant of g_atomic_int_compare_and_exchange() Oleksandr Kravchuk (1): tzdata: update to 2022a Peter Kjellerstedt (5): python3-jinja2: Correct HOMEPAGE insane.bbclass: Make do_qa_patch() depend on if patch-fuzz is in ERROR_QA insane.bbclass: Make changes to QA_EMPTY_DIRS trigger package_qa to rerun bitbake.conf: Remove ERROR_QA from BB_HASHEXCLUDE_COMMON bitbake: knotty.py: Show elapsed time also for tasks with progress bars Richard Purdie (11): bitbake: parse: Ensure any existing siggen is closed down first bitbake: data: Ensure vardepsexclude or BB_BASEHASH_IGNORE_VARS covers contains items bitbake: server/process: Disable gc around critical section bitbake: cooker: Reset and rebuild inotify watches bitbake: pyinotify: Handle potential latent bug mirrors: Switch glibc and binutils to use shallow mirror tarballs bitbake: data: Fix accidentally added parameter bitbake.conf: Drop unexports from a different era vim: Upgrade 8.2.4524 -> 8.2.4681 Revert "meta: rust: Bug fix for target definitions returning 'NoneType'" build-appliance-image: Update to master head revision Robert Yang (1): waffle: The surfaceless-egl and gbm requires opengl Saul Wold (5): busybox: Exclude .debug from depmod kmod: Add an exclude directive to depmod depmodwrapper: Use nonarch_base_libdir for depmod.d kmod: Update exclude patch to Accepted depmodwrapper-cross: Fix missing $ Sean Anderson (1): u-boot: Fix condition for install_spl_helper Simone Weiss (1): popt: add ptest Sundeep KOKKONDA (3): gcc: sanitizer: Fix tsan against glibc 2.34 meta: rust: Bug fix for target definitions returning 'NoneType' meta: scripts - relocation script adapted to support big-endian machines Xavier Berger (1): gpg-sign: Add parameters to gpg signature function Signed-off-by: Patrick Williams Change-Id: I294af706d7b96796ff360b402b9d011082cf36a7 --- .../recipes-connectivity/libnma/libnma_1.8.34.bb | 26 ---- .../recipes-connectivity/libnma/libnma_1.8.36.bb | 29 ++++ ...Remove-incorrect-args-for-i18n.merge_file.patch | 52 ------- .../meta-gnome/recipes-gnome/evince/evince_41.4.bb | 52 ------- .../meta-gnome/recipes-gnome/evince/evince_42.1.bb | 51 ++++++ .../evolution-data-server/evolution-data-server.bb | 1 - .../evolution-data-server.inc | 4 +- .../file-roller/file-roller_3.40.0.bb | 27 ---- .../file-roller/file-roller_3.42.0.bb | 28 ++++ .../meta-gnome/recipes-gnome/gdm/gdm_41.0.bb | 57 ------- .../meta-gnome/recipes-gnome/gdm/gdm_42.0.bb | 58 +++++++ .../meta-gnome/recipes-gnome/gedit/gedit_41.0.bb | 45 ------ .../meta-gnome/recipes-gnome/gedit/gedit_42.0.bb | 45 ++++++ .../0001-Update-rest-requirement-to-rest-1.0.patch | 14 -- .../recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb | 26 ---- .../recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb | 25 +++ .../gnome-bluetooth/gnome-bluetooth4_42.0.bb | 36 +++++ .../gnome-calculator/gnome-calculator_41.1.bb | 36 ----- .../gnome-calculator/gnome-calculator_42.0.bb | 37 +++++ .../0001-meson.build-fix-meson-0.61-builds.patch | 23 --- .../gnome-calendar/gnome-calendar_41.2.bb | 33 ---- .../gnome-calendar/gnome-calendar_42.0.bb | 32 ++++ .../gnome-commander/gnome-commander_1.14.2.bb | 22 +++ ...on.build-Disable-libseccomp-for-all-archs.patch | 10 +- .../gnome-desktop/gnome-desktop_41.2.bb | 38 ----- .../gnome-desktop/gnome-desktop_42.0.bb | 47 ++++++ .../0001-Fix-meson-build-with-meson-0.60.0.patch | 40 ----- .../gnome-font-viewer/gnome-font-viewer_41.0.bb | 26 ---- .../gnome-font-viewer/gnome-font-viewer_42.0.bb | 25 +++ .../gnome-text-editor/gnome-text-editor_42.0.bb | 27 ++++ .../libgweather/libgweather4_4.0.0.bb | 31 ++++ .../recipes-gnome/yelp/yelp-tools_41.0.bb | 23 --- .../recipes-gnome/yelp/yelp-tools_42.0.bb | 23 +++ .../meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb | 20 --- .../meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb | 20 +++ .../meta-gnome/recipes-gnome/yelp/yelp_41.2.bb | 38 ----- .../meta-gnome/recipes-gnome/yelp/yelp_42.1.bb | 39 +++++ .../recipes-gnome/zenity/zenity_3.41.0.bb | 25 --- .../recipes-gnome/zenity/zenity_3.42.0.bb | 25 +++ .../0001-Fix-build-with-meson-0.60.patch | 29 ---- .../0001-musl-Hack-to-fix-build.patch | 18 ++- .../accountsservice/accountsservice_0.6.55.bb | 35 ----- .../accountsservice/accountsservice_22.08.8.bb | 32 ++++ .../recipes-support/colord-gtk/colord-gtk_0.2.0.bb | 23 --- .../recipes-support/colord-gtk/colord-gtk_0.3.0.bb | 25 +++ .../packagegroups/packagegroup-gnome-apps.bb | 2 + ...uard-against-__GLIBC_PREREQ-for-musl-libc.patch | 35 +++++ .../recipes-devtools/dracut/dracut_055.bb | 70 --------- .../recipes-devtools/dracut/dracut_056.bb | 72 +++++++++ .../recipes-multimedia/fluidsynth/fluidsynth.inc | 6 +- .../0001-core-Fix-build-with-GCC-11.-1806.patch | 26 ---- .../recipes-support/srt/srt_1.4.2.bb | 28 ---- .../recipes-support/srt/srt_1.4.4.bb | 27 ++++ .../0001-meson-add-pythoninstalldir-option.patch | 49 ++++++ .../recipes-connectivity/blueman/blueman_2.2.4.bb | 3 +- .../recipes-connectivity/samba/samba_4.14.12.bb | 5 + .../recipes-support/dnsmasq/files/init | 2 +- .../open-vm-tools/open-vm-tools_11.3.5.bb | 4 +- .../meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb | 2 + ...ed-bswap32-and-bswap64-errors-for-MIPS-ma.patch | 32 ---- .../libimobiledevice-glue_git.bb | 7 +- .../meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb | 88 ----------- .../meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb | 88 +++++++++++ .../recipes-devtools/octave/octave_4.4.1.bb | 40 ----- .../recipes-devtools/octave/octave_6.4.0.bb | 52 +++++++ .../recipes-extended/libzip/libzip_1.8.0.bb | 3 + .../recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 13 +- .../xorg-doc/xorg-sgml-doctools_1.11.bb | 12 -- .../xorg-doc/xorg-sgml-doctools_1.12.bb | 10 ++ ...clients-Use-c-compiler-for-jack_simdtests.patch | 37 ----- .../recipes-multimedia/jack/jack_1.19.19.bb | 53 ------- .../recipes-multimedia/jack/jack_1.19.20.bb | 51 ++++++ .../ceres-solver/ceres-solver_2.0.0.bb | 42 ----- .../ceres-solver/ceres-solver_2.1.0.bb | 42 +++++ .../multipath-tools/multipath-tools_0.8.4.bb | 2 +- .../recipes-support/poppler/poppler_22.03.0.bb | 51 ------ .../recipes-support/poppler/poppler_22.04.0.bb | 51 ++++++ .../recipes-support/srecord/srecord_1.64.bb | 2 +- .../recipes-support/upower/upower_0.99.13.bb | 38 ----- .../recipes-support/upower/upower_0.99.17.bb | 44 ++++++ .../python-thrift/python3-thrift_0.15.0.bb | 19 --- .../python-thrift/python3-thrift_0.16.0.bb | 19 +++ .../python/python3-bitarray_2.4.0.bb | 10 -- .../python/python3-bitarray_2.4.1.bb | 10 ++ .../python/python3-cheetah_3.2.6.bb | 14 ++ .../python/python3-cheetah_3.2.6.post2.bb | 14 -- .../recipes-devtools/python/python3-click_8.0.4.bb | 41 ----- .../recipes-devtools/python/python3-click_8.1.2.bb | 41 +++++ .../recipes-devtools/python/python3-cppy_1.2.0.bb | 12 -- .../recipes-devtools/python/python3-cppy_1.2.1.bb | 12 ++ .../recipes-devtools/python/python3-evdev_1.4.0.bb | 22 --- .../recipes-devtools/python/python3-evdev_1.5.0.bb | 22 +++ .../python3-google-api-python-client_2.36.0.bb | 20 --- .../python3-google-api-python-client_2.42.0.bb | 20 +++ .../python/python3-grpcio_1.44.0.bb | 46 ------ .../python/python3-grpcio_1.45.0.bb | 46 ++++++ .../python/python3-itsdangerous_2.1.1.bb | 17 -- .../python/python3-itsdangerous_2.1.2.bb | 17 ++ .../python/python3-jdatetime_4.0.0.bb | 17 -- .../python/python3-jdatetime_4.1.0.bb | 17 ++ .../python/python3-kiwisolver_1.4.0.bb | 19 --- .../python/python3-kiwisolver_1.4.2.bb | 19 +++ .../python/python3-pandas_1.4.1.bb | 26 ---- .../python/python3-pandas_1.4.2.bb | 26 ++++ .../python/python3-protobuf_3.19.4.bb | 39 ----- .../python/python3-protobuf_3.20.0.bb | 39 +++++ .../python/python3-pychromecast_10.3.0.bb | 18 --- .../python/python3-pychromecast_11.0.0.bb | 18 +++ .../recipes-devtools/python/python3-qface_2.0.6.bb | 24 --- .../recipes-devtools/python/python3-qface_2.0.7.bb | 24 +++ .../recipes-devtools/python/python3-redis_4.2.0.bb | 15 -- .../recipes-devtools/python/python3-redis_4.2.1.bb | 15 ++ .../python/python3-sqlalchemy_1.4.32.bb | 23 --- .../python/python3-sqlalchemy_1.4.34.bb | 23 +++ .../python/python3-trafaret_2.1.0.bb | 17 -- .../python/python3-trafaret_2.1.1.bb | 16 ++ .../recipes-devtools/python/python3-twine_3.8.0.bb | 18 --- .../recipes-devtools/python/python3-twine_4.0.0.bb | 18 +++ .../recipes-devtools/python/python3-tzlocal_4.1.bb | 12 -- .../recipes-devtools/python/python3-tzlocal_4.2.bb | 13 ++ .../python/python3-websocket-client_1.3.1.bb | 17 -- .../python/python3-websocket-client_1.3.2.bb | 17 ++ .../python/python3-werkzeug_2.0.3.bb | 39 ----- .../python/python3-werkzeug_2.1.1.bb | 39 +++++ .../python3-wxgtk4/python3-wxgtk4_4.1.1.bb | 4 + .../python-pyparted/files/setuptools.patch | 82 ---------- .../python-pyparted/python3-pyparted_3.11.7.bb | 27 ---- .../python-pyparted/python3-pyparted_3.12.0.bb | 24 +++ meta-openembedded/meta-xfce/README | 1 + .../recipes-apps/mousepad/mousepad_0.5.8.bb | 19 --- .../recipes-apps/mousepad/mousepad_0.5.9.bb | 19 +++ ...rop-setting-is_utc-member-of-icaltimetype.patch | 77 --------- .../meta-xfce/recipes-apps/orage/orage_4.12.1.bb | 20 --- .../meta-xfce/recipes-apps/orage/orage_4.16.0.bb | 20 +++ .../recipes-apps/ristretto/ristretto_0.12.1.bb | 15 -- .../recipes-apps/ristretto/ristretto_0.12.2.bb | 15 ++ .../recipes-apps/xarchiver/xarchiver_git.bb | 6 +- .../xfce4-notifyd/xfce4-notifyd_0.6.2.bb | 33 ---- .../xfce4-notifyd/xfce4-notifyd_0.6.3.bb | 33 ++++ .../xfce4-screenshooter_1.9.10.bb | 21 +++ .../xfce4-screenshooter_1.9.9.bb | 21 --- .../xfce4-terminal/xfce4-terminal_0.8.10.bb | 13 -- .../xfce4-terminal/xfce4-terminal_1.0.0.bb | 15 ++ .../cpufreq/xfce4-cpufreq-plugin_1.2.5.bb | 8 - .../cpufreq/xfce4-cpufreq-plugin_1.2.7.bb | 8 + .../cpugraph/xfce4-cpugraph-plugin_1.2.5.bb | 8 - .../cpugraph/xfce4-cpugraph-plugin_1.2.6.bb | 8 + .../diskperf/xfce4-diskperf-plugin_2.6.3.bb | 9 -- .../diskperf/xfce4-diskperf-plugin_2.7.0.bb | 9 ++ .../places/xfce4-places-plugin_1.8.1.bb | 2 +- .../pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb | 2 +- .../sensors/xfce4-sensors-plugin_1.4.2.bb | 25 --- .../sensors/xfce4-sensors-plugin_1.4.3.bb | 26 ++++ .../thunar-volman/thunar-volman_4.16.0.bb | 2 +- .../xfce4-settings/xfce4-settings_4.16.2.bb | 1 + .../recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb | 2 +- meta-raspberrypi/docs/extra-build-config.md | 38 ++++- .../recipes-bsp/bootfiles/rpi-cmdline.bb | 13 ++ .../files/0001-mmal-Do-not-use-Werror.patch | 33 ++++ .../recipes-graphics/userland/userland_git.bb | 7 +- ...nd-headers-from-ffmpeg-are-installed-in-u.patch | 16 +- .../recipes-multimedia/omxplayer/omxplayer_git.bb | 2 +- .../picamera-libs/picamera-libs.bb | 2 +- .../openscap-daemon/openscap-daemon_0.1.10.bb | 2 +- meta-security/recipes-ids/samhain/samhain.inc | 6 +- meta-security/recipes-ids/suricata/suricata.inc | 2 +- meta-security/recipes-kernel/linux/files/lkrg.cfg | 4 + meta-security/recipes-kernel/linux/files/lkrg.scc | 5 + .../recipes-kernel/linux/linux-yocto_security.inc | 3 + .../lkrg/files/makefile_cleanup.patch | 6 +- .../recipes-kernel/lkrg/lkrg-module_0.9.2.bb | 10 +- .../recipes-perl/perl/libwhisker2-perl_2.5.bb | 2 +- .../recipes-scanners/clamav/clamav_0.104.0.bb | 4 +- .../recipes-security/bastille/bastille_3.2.1.bb | 2 +- .../ecryptfs-utils/ecryptfs-utils_111.bb | 2 +- .../fail2ban/python3-fail2ban_0.11.2.bb | 7 + .../recipes-security/fscrypt/fscrypt_1.0.0.bb | 2 +- .../recipes-security/libdhash/ding-libs_0.6.1.bb | 2 +- .../recipes-security/libmhash/libmhash_0.9.9.9.bb | 2 +- .../recipes-security/nikto/nikto_2.1.6.bb | 2 +- meta-security/recipes-security/sssd/sssd_2.5.2.bb | 2 +- poky/bitbake/lib/bb/cooker.py | 54 ++++--- poky/bitbake/lib/bb/data.py | 19 ++- poky/bitbake/lib/bb/parse/__init__.py | 2 + poky/bitbake/lib/bb/server/process.py | 3 + poky/bitbake/lib/bb/tests/codeparser.py | 28 +++- poky/bitbake/lib/bb/ui/knotty.py | 22 +-- poky/bitbake/lib/pyinotify.py | 11 ++ poky/meta/classes/insane.bbclass | 5 +- poky/meta/classes/kernel.bbclass | 15 +- poky/meta/classes/mirrors.bbclass | 11 ++ poky/meta/classes/uboot-sign.bbclass | 2 +- poky/meta/conf/bitbake.conf | 15 +- .../conf/distro/include/ptest-packagelists.inc | 1 + poky/meta/lib/oe/gpg_sign.py | 6 +- poky/meta/lib/oe/package_manager/deb/__init__.py | 19 ++- .../0001-depmod-Ignore-.debug-directories.patch | 32 ++++ poky/meta/recipes-core/busybox/busybox_1.35.0.bb | 1 + ...-tests-for-typechecking-with-atomic-compa.patch | 64 ++++++++ ...-a-C-variant-of-g_atomic_int_compare_and_.patch | 70 +++++++++ poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb | 2 + .../images/build-appliance-image_15.0.0.bb | 2 +- poky/meta/recipes-core/os-release/os-release.bb | 7 +- poky/meta/recipes-devtools/gcc/gcc-11.2.inc | 1 + .../gcc/gcc/0042-Fix-thread-stack-size-init.patch | 23 +++ poky/meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- .../python/python3-jinja2_3.1.1.bb | 2 +- poky/meta/recipes-extended/timezone/timezone.inc | 6 +- .../unzip/unzip/CVE-2021-4217.patch | 67 ++++++++ poky/meta/recipes-extended/unzip/unzip_6.0.bb | 1 + ...unwind-in-native-OE-builds-by-not-looking.patch | 38 +++++ .../recipes-graphics/libsdl2/libsdl2_2.0.20.bb | 1 + poky/meta/recipes-graphics/waffle/waffle_1.7.0.bb | 3 +- .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 9 +- ...mod-Add-support-for-excluding-a-directory.patch | 172 +++++++++++++++++++++ poky/meta/recipes-kernel/kmod/kmod_29.bb | 4 + .../recipes-kernel/linux/linux-yocto-rt_5.10.bb | 6 +- .../recipes-kernel/linux/linux-yocto-rt_5.15.bb | 6 +- .../recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 8 +- .../recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 8 +- poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +-- poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 ++-- .../0001-popt-test-output-format-for-ptest.patch | 68 ++++++++ poky/meta/recipes-support/popt/popt/run-ptest | 3 + poky/meta/recipes-support/popt/popt_1.18.bb | 21 ++- poky/meta/recipes-support/vim/vim.inc | 6 +- poky/oe-init-build-env | 4 +- poky/scripts/oe-setup-builddir | 8 +- poky/scripts/relocate_sdk.py | 25 +-- 229 files changed, 2845 insertions(+), 2276 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_056.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.17.bb delete mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.15.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.5.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.36.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_11.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb create mode 100644 meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch create mode 100644 meta-security/recipes-kernel/linux/files/lkrg.cfg create mode 100644 meta-security/recipes-kernel/linux/files/lkrg.scc create mode 100644 poky/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch create mode 100644 poky/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch create mode 100644 poky/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch create mode 100644 poky/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch create mode 100644 poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch create mode 100644 poky/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch create mode 100644 poky/meta/recipes-support/popt/popt/run-ptest diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb deleted file mode 100644 index ea852ce3a0..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "NetworkManager GUI library" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "glib-2.0 gtk+3 networkmanager" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gtk-doc gettext vala features_check - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304" - -PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" -PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" -PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" -PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" - -# go introspection is not supported for mipsn32/riscv32, but vapi needs it -# -EXTRA_OEMESON:append:mipsarchn32 = " -Dvapi=false" -EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" -EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" - -GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb new file mode 100644 index 0000000000..fff7d25d8d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb @@ -0,0 +1,29 @@ +SUMMARY = "NetworkManager GUI library" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0 gtk+3 gtk4 networkmanager" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gobject-introspection gtk-doc gettext vala features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a" + +PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" +PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" +PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" +PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" + +# for gnome-control-center >= 42 +EXTRA_OEMESON = "-Dlibnma_gtk4=true" + +# go introspection is not supported for mipsn32/riscv32, but vapi needs it +# +EXTRA_OEMESON:append:mipsarchn32 = " -Dvapi=false" +EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" +EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch deleted file mode 100644 index 68447bec8b..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b525a64d26bcba4e3a74f09c580429625d8a2104 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index 14629f2..2f972a8 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -53,7 +53,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b8..afc3020 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 07fb8ec..0bb5d0f 100644 ---- a/meson.build -+++ b/meson.build -@@ -498,7 +498,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb deleted file mode 100644 index 6b3479c264..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" -SECTION = "x11/office" -DEPENDS = " \ - gnome-common-native \ - yelp-tools-native \ - appstream-glib \ - gtk+3 \ - gspell \ - libsecret \ - poppler \ - gstreamer1.0-plugins-base \ - orc \ - adwaita-icon-theme \ - libhandy \ - ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop','',d)} \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "ff245240f230922bec32a4d7b0a1d91b247a83d13484f99b74035d51eb232130" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = " \ - -Dsystemduserunitdir=no \ -" - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" - -RDEPENDS:${PN} += "glib-2.0-utils" -RRECOMMMENDS_${PN} = "adwaita-icon-theme" - -PACKAGES =+ "${PN}-nautilus-extension" - -FILES:${PN} += "${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" -FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb new file mode 100644 index 0000000000..2e22f2e703 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb @@ -0,0 +1,51 @@ +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" +SECTION = "x11/office" +DEPENDS = " \ + gnome-common-native \ + yelp-tools-native \ + appstream-glib \ + gtk+3 \ + gspell \ + libsecret \ + poppler \ + gstreamer1.0-plugins-base \ + orc \ + adwaita-icon-theme \ + libhandy \ + ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop','',d)} \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "b24767bb3d5103b4e35b0e15cf033dbe2488f88700cdd882d22a43adeec2e80a" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = " \ + -Dsystemduserunitdir=no \ +" + +do_compile:prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" + +RDEPENDS:${PN} += "glib-2.0-utils" +RRECOMMMENDS_${PN} = "adwaita-icon-theme" + +PACKAGES =+ "${PN}-nautilus-extension" + +FILES:${PN} += "${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" +FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index f6b719392d..48cf6f76bc 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -21,7 +21,6 @@ SRC_URI += " \ LKSTRFTIME = "HAVE_LKSTRFTIME=ON" LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" -GI_DATA_ENABLED="False" EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index bcbe20d752..81b02914d2 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "8c437af75edbef196034f7913f505c3f68acc18515a6eed20f3ef52452785898" -PV = "3.43.1" +SRC_URI[archive.sha256sum] = "0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e" +PV = "3.44.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb deleted file mode 100644 index cce7f211f7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "An archive manager utility for the GNOME Environment" -LICENSE="GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - libarchive \ - libnotify \ -" - -inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg - -SRC_URI[archive.sha256sum] = "4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" - -PACKAGECONFIG[nautilus] = "-Dnautilus-actions=enabled,-Dnautilus-actions=disabled,nautilus" -PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false," - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${libdir}/nautilus \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.42.0.bb new file mode 100644 index 0000000000..f77400564e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.42.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "An archive manager utility for the GNOME Environment" +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + libarchive \ + libnotify \ + libhandy \ +" + +inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg + +SRC_URI[archive.sha256sum] = "1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" + +PACKAGECONFIG[nautilus] = "-Dnautilus-actions=enabled,-Dnautilus-actions=disabled,nautilus" +PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false," + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${libdir}/nautilus \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb deleted file mode 100644 index 94ffdc28eb..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "GNOME Display Manager" -LICENSE="GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - dconf-native \ - gtk+3 \ - accountsservice \ - libcanberra \ - libpam \ -" - -REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit gobject-introspection-data" -GIR_MESON_OPTION = "" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gettext systemd useradd itstool gnome-help features_check - -SRC_URI[archive.sha256sum] = "5738c4293a9f5a80d4a6e9e06f4d0df3e9f313ca7b61bfb4d8afaba983e200dc" - -EXTRA_OEMESON = " \ - -Dplymouth=disabled \ - -Ddefault-pam-config=openembedded \ - -Dpam-mod-dir=${base_libdir}/security \ -" - -do_install:append() { - rm -rf ${D}/run ${D}${localstatedir}/run -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" - -SYSTEMD_SERVICE:${PN} = "${BPN}.service" - -# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm -# components. To allow gnome-images using different display-manager, split them -# out into a seperate package. -PACKAGE_BEFORE_PN = "${PN}-base" -FILES:${PN}-base = " \ - ${datadir}/glib-2.0 \ - ${datadir}/gnome-session \ - ${libdir}/lib*${SOLIBS} \ - ${libdir}/girepository-1.0 \ -" - -CONFFILES:${PN} += "${sysconfdir}/gdm/custom.conf" -FILES:${PN} += " \ - ${datadir}/dconf \ - ${base_libdir}/security/pam_gdm.so \ - ${localstatedir} \ - ${systemd_unitdir} ${systemd_user_unitdir} \ -" - -RDEPENDS:${PN} += "${PN}-base" - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_42.0.bb new file mode 100644 index 0000000000..00fb56b2b1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_42.0.bb @@ -0,0 +1,58 @@ +SUMMARY = "GNOME Display Manager" +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + dconf-native \ + gtk+3 \ + accountsservice \ + libcanberra \ + libpam \ + libgudev \ +" + +REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit gobject-introspection-data" +GIR_MESON_OPTION = "" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gettext systemd useradd itstool gnome-help features_check + +SRC_URI[archive.sha256sum] = "a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855" + +EXTRA_OEMESON = " \ + -Dplymouth=disabled \ + -Ddefault-pam-config=openembedded \ + -Dpam-mod-dir=${base_libdir}/security \ +" + +do_install:append() { + rm -rf ${D}/run ${D}${localstatedir}/run +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" + +# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm +# components. To allow gnome-images using different display-manager, split them +# out into a seperate package. +PACKAGE_BEFORE_PN = "${PN}-base" +FILES:${PN}-base = " \ + ${datadir}/glib-2.0 \ + ${datadir}/gnome-session \ + ${libdir}/lib*${SOLIBS} \ + ${libdir}/girepository-1.0 \ +" + +CONFFILES:${PN} += "${sysconfdir}/gdm/custom.conf" +FILES:${PN} += " \ + ${datadir}/dconf \ + ${base_libdir}/security/pam_gdm.so \ + ${localstatedir} \ + ${systemd_unitdir} ${systemd_user_unitdir} \ +" + +RDEPENDS:${PN} += "${PN}-base" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb deleted file mode 100644 index adba8ab2f9..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - libpeas \ - libsoup-2.4 \ - gspell \ - gtksourceview4 \ - tepl \ -" - -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI[archive.sha256sum] = "7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5" - -# gobject-introspection is mandatory and cannot be configured -# x11 is needed for tepl and gtksourceview4 -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" -GIR_MESON_OPTION = "" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGES += "${PN}-python" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" - -FILES:${PN}-python += " \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" -RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_42.0.bb new file mode 100644 index 0000000000..5bb5525d53 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_42.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + libpeas \ + libsoup-2.4 \ + gspell \ + gtksourceview4 \ + tepl \ +" + +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "a87991f42961eb4f6abcdbaabb784760c23aeaeefae6363d3e21a61e9c458437" + +# gobject-introspection is mandatory and cannot be configured +# x11 is needed for tepl and gtksourceview4 +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGES += "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES:${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" +RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch index c24a9e569f..21c623ea5b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch @@ -13,25 +13,11 @@ Upstream-Status: Submitted Signed-off-by: Tim Orling --- - .dir-locals.el | 2 +- configure.ac | 2 +- gfbgraph/Makefile.am | 2 +- libgfbgraph.pc.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/.dir-locals.el b/.dir-locals.el -index 77abbf0..d39cdf2 100644 ---- a/.dir-locals.el -+++ b/.dir-locals.el -@@ -3,7 +3,7 @@ - "/usr/include/json-glib-1.0" - "/usr/include/goa-1.0" - "/usr/lib64/goa-1.0/include" -- "/usr/include/rest-0.7" -+ "/usr/include/rest-1.0" - "/usr/include/dbus-1.0" - "/usr/lib64/dbus-1.0/include" - "/usr/include/gio-unix-2.0/" diff --git a/configure.ac b/configure.ac index fd1231f..9b49f3f 100644 --- a/configure.ac diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb deleted file mode 100644 index 2b36003635..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A GObject library for Facebook Graph API" -SECTION = "x11/gnome" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" - -DEPENDS = " \ - glib-2.0 \ - json-glib \ - rest \ - gnome-online-accounts \ -" - -inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check - -# for gnome-online-accounts -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" -SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" -SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379" - -do_install:append() { - # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which - # is not a standard path exactly - rm -rf ${D}${prefix}/doc -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb new file mode 100644 index 0000000000..f3b54e7d05 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb @@ -0,0 +1,25 @@ +SUMMARY = "A GObject library for Facebook Graph API" +SECTION = "x11/gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" + +DEPENDS = " \ + glib-2.0 \ + json-glib \ + rest \ + gnome-online-accounts \ +" + +inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check + +# for gnome-online-accounts +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" +SRC_URI[archive.sha256sum] = "9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3" + +do_install:append() { + # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which + # is not a standard path exactly + rm -rf ${D}${prefix}/doc +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb new file mode 100644 index 0000000000..3fe2c35ef4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = " \ + udev \ + libnotify \ + libcanberra \ + bluez5 \ + upower \ + gtk4 \ + gsound \ + libadwaita \ +" + +GNOMEBN = "gnome-bluetooth" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +GTKIC_VERSION = "4" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" + +RDEPENDS:${PN} += "bluez5" + +FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb deleted file mode 100644 index 607f52afeb..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "GNOME calculator" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SECTION = "x11/gnome" - -DEPENDS = " \ - yelp-tools-native \ - gtk+3 \ - libsoup-2.4 \ - libgee \ - libmpc \ - gtksourceview4 \ - libhandy \ -" - -GIR_MESON_OPTION = 'disable-introspection' -GIR_MESON_ENABLE_FLAG = 'false' -GIR_MESON_DISABLE_FLAG = 'true' - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb new file mode 100644 index 0000000000..80cc38c615 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNOME calculator" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SECTION = "x11/gnome" + +DEPENDS = " \ + yelp-tools-native \ + gtk4 \ + libsoup-2.4 \ + libgee \ + libmpc \ + gtksourceview5 \ + libadwaita \ +" + +GIR_MESON_OPTION = 'disable-introspection' +GIR_MESON_ENABLE_FLAG = 'false' +GIR_MESON_DISABLE_FLAG = 'true' + +GNOMEBASEBUILDCLASS = "meson" +GTKIC_VERSION = '4' + +inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch deleted file mode 100644 index 8ec980bb12..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 21 Jan 2022 21:18:39 +0100 -Subject: [PATCH] meson.build: fix meson 0.61 builds - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198] -Signed-off-by: Alexander Kanavin ---- - data/appdata/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/appdata/meson.build b/data/appdata/meson.build -index b5ee6540..200c3507 100644 ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Calendar.appdata.xml.in.in'), - output: 'org.gnome.Calendar.appdata.xml.in', diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb deleted file mode 100644 index c97bf0bec8..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "GNOME calendar" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" - -SECTION = "x11/gnome" - -DEPENDS = " \ - gtk+3 \ - libical \ - gsettings-desktop-schemas \ - evolution-data-server \ - libsoup-2.4 \ - libdazzle \ - libhandy \ - libgweather \ - geoclue \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-meson.build-fix-meson-0.61-builds.patch" -SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a" - -FILES:${PN} += " \ - ${datadir}/gnome-shell \ - ${datadir}/metainfo \ - ${datadir}/dbus-1 \ -" - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb new file mode 100644 index 0000000000..7b32be611d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "GNOME calendar" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk4 \ + libical \ + gsettings-desktop-schemas \ + evolution-data-server \ + libsoup-2.4 \ + libdazzle \ + libadwaita \ + libgweather4 \ + geoclue \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa" + +FILES:${PN} += " \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb new file mode 100644 index 0000000000..c672422992 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "A light and fast file manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = " \ + glib-2.0-native \ + gtk+ \ +" + +inherit gnomebase itstool gettext gnome-help features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "1378efd24f8af18a09031d83d918f9662a3f5eba5a6f9df9fc55870f2e6f0ee9" + +PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" +PACKAGECONFIG[exiv2] = "--with-exiv2,--without-exiv2,exiv2" +PACKAGECONFIG[taglib] = "--with-taglib,--without-taglib,taglib" +PACKAGECONFIG[libgsf] = "--with-libgsf,--without-libgsf,libgsf" +PACKAGECONFIG[poppler] = "--with-poppler,--without-poppler,poppler" + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch index 99cf45830e..8ae1d82b6a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch @@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index cceefe0..df3fdd9 100644 +index 1dc8a73..87d72fe 100644 --- a/meson.build +++ b/meson.build -@@ -59,12 +59,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) +@@ -65,12 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) host_os = host_machine.system() host_cpu = host_machine.cpu() supported_os = ['linux'] @@ -32,9 +32,9 @@ index cceefe0..df3fdd9 100644 - seccomp_dep = dependency('', required: false) -endif +seccomp_dep = dependency('', required: false) - fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') - xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') + fontconfig_cache_path = fontconfig_dep.get_variable(pkgconfig: 'cachedir') + xkb_base = xkb_config_dep.get_variable(pkgconfig: 'xkb_base') -- -2.31.1 +2.34.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb deleted file mode 100644 index 6bf2ab3986..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -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 itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc - -REQUIRED_DISTRO_FEATURES = "x11" -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" - -GIR_MESON_OPTION = "" - -SRC_URI[archive.sha256sum] = "34329eefdacad2332a6adbae538c8da6e52235c7775a908b7c32040a0753ec6a" -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop" -RDEPENDS:${PN} += "libgnome-desktop" -FILES:libgnome-desktop = " \ - ${libdir}/lib*${SOLIBS} \ - ${datadir}/libgnome-desktop*/pnp.ids \ - ${datadir}/gnome/*xml \ -" - -RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb new file mode 100644 index 0000000000..aae927a70b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb @@ -0,0 +1,47 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +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 itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" + +GIR_MESON_OPTION = "" + +SRC_URI[archive.sha256sum] = "f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6" +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += " \ + gsettings-desktop-schemas \ + virtual/libx11 \ + gtk+3 \ + gtk4 \ + startup-notification \ + xkeyboard-config \ + iso-codes \ + udev \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop" +RDEPENDS:${PN} += "libgnome-desktop" +FILES:libgnome-desktop = " \ + ${libdir}/lib*${SOLIBS} \ + ${datadir}/libgnome-desktop*/pnp.ids \ + ${datadir}/gnome/*xml \ +" + +RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch deleted file mode 100644 index f32e120c1d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9c5ce6836498fdb057a7f865f516ce28609f542a Mon Sep 17 00:00:00 2001 -From: r-value -Date: Thu, 30 Dec 2021 17:14:47 +0800 -Subject: [PATCH] Fix meson build with meson 0.60.0+ - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 - -Upstrean-Status: Backport -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 2 +- - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bfc9caa..8e42134 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,6 @@ - appdatadir = join_paths(datadir, 'metainfo') - appdata_file = 'org.gnome.font-viewer.appdata.xml' --merged_appdata = i18n.merge_file(appdata_file, -+merged_appdata = i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -diff --git a/src/meson.build b/src/meson.build -index f863d45..826c59b 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' - desktop_conf = configuration_data() - desktop_conf.set('VERSION', meson.project_version()) - desktop_conf.set('APPLICATION_ID', application_id) --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: configure_file(input: desktop_file + '.in.in', - output: desktop_file + '.in', - configuration: desktop_conf), diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb deleted file mode 100644 index 2e2927f1c7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "GNOME font viewer" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SECTION = "x11/gnome" - -DEPENDS = " \ - gtk+3 \ - gnome-desktop \ - libhandy \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gtk-icon-cache gettext features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-Fix-meson-build-with-meson-0.60.0.patch" -SRC_URI[archive.sha256sum] = "5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb new file mode 100644 index 0000000000..c14e57c7c0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GNOME font viewer" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk4 \ + gnome-desktop \ + libadwaita \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gtk-icon-cache gettext features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb new file mode 100644 index 0000000000..01504b1cb7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple text editor" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + desktop-file-utils-native \ + libadwaita \ + gtk4 \ + gtksourceview5 \ + enchant2 \ +" + +GTKIC_VERSION = "4" + +inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI[archive.sha256sum] = "0e32140ee1c13428563bcd5f784e61ee22ffd1ad27d8c02283b4358a81dfab50" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb new file mode 100644 index 0000000000..acfb97655a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "A library to access weather information from online services" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" +GNOMEBN = "libgweather" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even + +SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +DEPENDS = " \ + geocode-glib \ + gtk+3 \ + json-glib \ + libsoup-2.4 \ + python3-pygobject-native \ +" + +FILES:${PN} += " \ + ${datadir}/libgweather-4 \ + ${libdir}/libgweather-4 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb deleted file mode 100644 index 13dada4438..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Collection of scripts and build utilities for documentation" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool - -DEPENDS += " \ - libxslt-native \ - libxml2-native \ - python3-lxml-native \ - yelp-xsl \ -" - -SRC_URI[archive.sha256sum] = "37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272" - -RDEPENDS:${PN} += "python3-core yelp-xsl" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb new file mode 100644 index 0000000000..a5da8590ff --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Collection of scripts and build utilities for documentation" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool + +DEPENDS += " \ + libxslt-native \ + libxml2-native \ + python3-lxml-native \ + yelp-xsl \ +" + +SRC_URI[archive.sha256sum] = "2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4" + +RDEPENDS:${PN} += "python3-core yelp-xsl" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb deleted file mode 100644 index 50cc8fc3a7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "XSL stylesheets for the yelp help browser" -LICENSE = "LGPL-2.1-only & GPL-2.0-only & BSD-3-Clause" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -inherit gnomebase gettext itstool - -DEPENDS += "libxml2" - -SRC_URI[archive.sha256sum] = "0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54" - -RDEPENDS:${PN}:append:class-target = " libxml2 itstool" - -# ensure our native consumers are forced to inherit itstool -RDEPENDS:${PN}:append:class-native = " libxml2-native" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb new file mode 100644 index 0000000000..54a6aa6163 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "XSL stylesheets for the yelp help browser" +LICENSE = "LGPL-2.1-only & GPL-2.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +inherit gnomebase gettext itstool + +DEPENDS += "libxml2" + +SRC_URI[archive.sha256sum] = "29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846" + +RDEPENDS:${PN}:append:class-target = " libxml2 itstool" + +# ensure our native consumers are forced to inherit itstool +RDEPENDS:${PN}:append:class-native = " libxml2-native" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb deleted file mode 100644 index 01427b157d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Help browser for the GNOME desktop" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ -" - -inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features_check mime-xdg - -# for webkitgtk -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5" - -DEPENDS += " \ - libxml2-native \ - glib-2.0-native \ - gtk+3 \ - appstream-glib \ - libxslt \ - sqlite3 \ - webkitgtk \ - yelp-xsl \ -" -PACKAGECONFIG ?= "" - -# Enable if soup3 is enabled in webkit recipe -PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0," - -do_configure:prepend() { - export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool -} - -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/yelp-xsl \ -" - -RDEPENDS:${PN} += "yelp-xsl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb new file mode 100644 index 0000000000..ab8b9c37ba --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Help browser for the GNOME desktop" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ +" + +inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features_check mime-xdg + +# for webkitgtk +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41" + +DEPENDS += " \ + libxml2-native \ + glib-2.0-native \ + gtk+3 \ + appstream-glib \ + libxslt \ + sqlite3 \ + libhandy \ + webkitgtk \ + yelp-xsl \ +" +PACKAGECONFIG ?= "" + +# Enable if soup3 is enabled in webkit recipe +PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0," + +do_configure:prepend() { + export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool +} + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/yelp-xsl \ +" + +RDEPENDS:${PN} += "yelp-xsl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.41.0.bb deleted file mode 100644 index ea1db575e4..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.41.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Display dialog boxes from the command line and shell scripts" -SECTION = "x11/gnome" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase pkgconfig itstool gnome-help features_check gettext - -DEPENDS = " \ - yelp-tools-native \ - gtk+3 \ -" - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "19b676c3510e22badfcc3204062d432ba537402f5e0ae26128c0d90c954037e1" -SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch" - -PACKAGECONFIG[libnotify] = "-Dlibnotify=true,-Dlibnotify=false,libnotify" -PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" - -PACKAGES =+ "${PN}-gdialog" -FILES:${PN}-gdialog = "${bindir}/gdialog" -RDEPENDS:${PN}-gdialog += "perl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.42.0.bb new file mode 100644 index 0000000000..ba2d4594a8 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.42.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Display dialog boxes from the command line and shell scripts" +SECTION = "x11/gnome" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase pkgconfig itstool gnome-help features_check gettext + +DEPENDS = " \ + yelp-tools-native \ + gtk+3 \ +" + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "c24c7fe6bb43163ced8adf232d583b2e013d3ba6c28deb5fcf807985e3deb5ef" +SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch" + +PACKAGECONFIG[libnotify] = "-Dlibnotify=true,-Dlibnotify=false,libnotify" +PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" + +PACKAGES =+ "${PN}-gdialog" +FILES:${PN}-gdialog = "${bindir}/gdialog" +RDEPENDS:${PN}-gdialog += "perl" diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch deleted file mode 100644 index 98b483d53e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bedec82615ca6858c3e9494650a5bbf33c710ebb Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Sun, 31 Oct 2021 12:29:14 +0000 -Subject: [PATCH] Fix build with meson 0.60 - -Positional parameters to merge_file() were never allowed and always -ignored, so just drop it. -See: https://github.com/mesonbuild/meson/issues/9441 - -Fixes #97 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 4987937..ed0e2c4 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -29,7 +29,6 @@ configure_file( - policy = act_namespace.to_lower() + '.policy' - - i18n.merge_file( -- policy, - input: policy + '.in', - output: policy, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch index 429192cd0d..99bd09a6c3 100644 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch +++ b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -4,19 +4,20 @@ Date: Sun, 8 Dec 2019 23:42:00 +0100 Subject: [PATCH] musl: Hack to fix configure --- - meson.build | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) + meson.build | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build -index 4465a26..726c9fe 100644 +index 075776f..dfd7421 100644 --- a/meson.build +++ b/meson.build -@@ -82,8 +82,14 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC - elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') +@@ -101,9 +101,14 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + config_h.set('PATH_WTMP', '_PATH_WTMPX') else -- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes') -- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') +- path_wtmp = '/var/log/utx.log' +- assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes') +- config_h.set_quoted('PATH_WTMP', path_wtmp) + # musl: This is just a build fix hack. + # As usual they know better, consider all other projects crap and offer zero + # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken @@ -28,3 +29,6 @@ index 4465a26..726c9fe 100644 endif # compiler flags +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb deleted file mode 100644 index 551ff5dc9d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "D-Bus interfaces for querying and manipulating user account information" -HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService/" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = " \ - dbus \ - polkit \ -" - -inherit meson gobject-introspection gtk-doc features_check systemd - -REQUIRED_DISTRO_FEATURES = "polkit" - -SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-Fix-build-with-meson-0.60.patch \ - " -SRC_URI:append:libc-musl = " \ - file://0001-musl-Hack-to-fix-build.patch \ - file://0002-musl-add-missing-fgetspent_r.patch \ -" -SRC_URI[md5sum] = "6e4c6fbd490260cfe17de2e76f5d803a" -SRC_URI[sha256sum] = "ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false -Dsystemdsystemunitdir='no', systemd" - -SYSTEMD_SERVICE:${PN} = "accounts-daemon.service" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ -" diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb new file mode 100644 index 0000000000..439958c7d2 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "D-Bus interfaces for querying and manipulating user account information" +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService/" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = " \ + dbus \ + polkit \ +" + +inherit meson gobject-introspection gtk-doc features_check systemd vala + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI:append:libc-musl = " \ + file://0001-musl-Hack-to-fix-build.patch \ + file://0002-musl-add-missing-fgetspent_r.patch \ +" +SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd" + +SYSTEMD_SERVICE:${PN} = "accounts-daemon.service" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb deleted file mode 100644 index e9c79e28b2..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "GTK support library for colord" -HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "LGPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" - -inherit meson gobject-introspection gettext gtk-doc features_check - -DEPENDS = " \ - gtk+3 \ - colord \ -" - -SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" -SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" - -EXTRA_OEMESON = "-Dman=false" -GIR_MESON_OPTION = "" -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" - -# colord -REQUIRED_DISTRO_FEATURES += "polkit" diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb new file mode 100644 index 0000000000..0e86d781ce --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit meson gobject-introspection gettext gtk-doc features_check + +DEPENDS = " \ + colord \ +" + +SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0" + +PACKAGECONFIG ??= "gtk3 gtk4" +PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" +PACKAGECONFIG[gtk4] = "-Dgtk4=true, -Dgtk4=false, gtk4" + +EXTRA_OEMESON = "-Dman=false" +GIR_MESON_OPTION = "" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +# colord +REQUIRED_DISTRO_FEATURES += "polkit" diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 481dd727d0..7151f93267 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -15,10 +15,12 @@ RDEPENDS:${PN} = " \ ghex \ gnome-calculator \ gnome-calendar \ + gnome-commander \ gnome-font-viewer \ gnome-photos \ gnome-screenshot \ gnome-terminal \ + gnome-text-editor \ gthumb \ libwnck3 \ nautilus \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch new file mode 100644 index 0000000000..bd768d00d2 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch @@ -0,0 +1,35 @@ +From ff5e1a662ba93ba79e2aeaaaec48a2a8ec4b4701 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 31 Mar 2022 22:22:44 +0800 +Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao +--- + src/install/util.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/install/util.c b/src/install/util.c +index 5721de89..784aec48 100644 +--- a/src/install/util.c ++++ b/src/install/util.c +@@ -27,6 +27,7 @@ + + #include "util.h" + ++#if defined(__GLIBC__) + #if __GLIBC_PREREQ(2, 30) == 0 + #include + #ifndef SYS_gettid +@@ -35,6 +36,7 @@ + + #define gettid() ((pid_t) syscall(SYS_gettid)) + #endif /*__GLIBC_PREREQ */ ++#endif /*__GLIBC__*/ + + size_t page_size(void) + { +-- +2.25.1 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb deleted file mode 100644 index a8fc5462f7..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "Initramfs generator using udev" -HOMEPAGE = "https://dracut.wiki.kernel.org/index.php/Main_Page" -DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the tool) is used to create an initramfs image by copying tools and files from an installed system and combining it with the dracut framework, usually found in /usr/lib/dracut/modules.d." - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PE = "1" - -SRCREV = "86bf2533d77762e823ad7a3e06a574522c1a90e3" -SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http;branch=master \ - file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ - " - -DEPENDS += "kmod" -DEPENDS:append:libc-musl = " fts" - -inherit bash-completion pkgconfig - -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--prefix=${prefix} \ - --libdir=${prefix}/lib \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sbindir=${sbindir} \ - --disable-documentation \ - --bindir=${bindir} \ - --includedir=${includedir} \ - --localstatedir=${localstatedir} \ - " - -# RDEPEND on systemd optionally -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" - -EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"' - -LDLIBS:append:libc-musl = " -lfts" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install() { - oe_runmake install DESTDIR=${D} - # Its Makefile uses cp -arx to install modules.d, so fix the owner - # to root:root - chown -R root:root ${D}/${prefix}/lib/dracut/modules.d -} - -FILES:${PN} += "${prefix}/lib/kernel \ - ${prefix}/lib/dracut \ - ${systemd_unitdir} \ - " -FILES:${PN}-dbg += "${prefix}/lib/dracut/.debug" - -CONFFILES:${PN} += "${sysconfdir}/dracut.conf" - -RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" - -# This could be optimized a bit, but let's avoid non-booting systems :) -RRECOMMENDS:${PN} = " \ - kernel-modules \ - busybox \ - coreutils \ - " - -# CVE-2010-4176 affects only Fedora -CVE_CHECK_IGNORE += "CVE-2010-4176" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_056.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_056.bb new file mode 100644 index 0000000000..7b89006103 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_056.bb @@ -0,0 +1,72 @@ +SUMMARY = "Initramfs generator using udev" +HOMEPAGE = "https://dracut.wiki.kernel.org/index.php/Main_Page" +DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the tool) is used to create an initramfs image by copying tools and files from an installed system and combining it with the dracut framework, usually found in /usr/lib/dracut/modules.d." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PE = "1" + +SRCREV = "631d5f72a223288aa1f48bb8e8d0313e75947400" +SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http;branch=master \ + file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ + file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ + " + +DEPENDS += "kmod" +DEPENDS:append:libc-musl = " fts" + +inherit bash-completion pkgconfig + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--prefix=${prefix} \ + --libdir=${prefix}/lib \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sbindir=${sbindir} \ + --disable-documentation \ + --bindir=${bindir} \ + --includedir=${includedir} \ + --localstatedir=${localstatedir} \ + " + +# RDEPEND on systemd optionally +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" + +EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"' + +CFLAGS:append = " -fPIC" +LDLIBS:append:libc-musl = " -lfts" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +do_install() { + oe_runmake install DESTDIR=${D} + # Its Makefile uses cp -arx to install modules.d, so fix the owner + # to root:root + chown -R root:root ${D}/${prefix}/lib/dracut/modules.d +} + +FILES:${PN} += "${prefix}/lib/kernel \ + ${prefix}/lib/dracut \ + ${systemd_unitdir} \ + " +FILES:${PN}-dbg += "${prefix}/lib/dracut/.debug" + +CONFFILES:${PN} += "${sysconfdir}/dracut.conf" + +RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" + +# This could be optimized a bit, but let's avoid non-booting systems :) +RRECOMMENDS:${PN} = " \ + kernel-modules \ + busybox \ + coreutils \ + " + +# CVE-2010-4176 affects only Fedora +CVE_CHECK_IGNORE += "CVE-2010-4176" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 218a51fc48..14d09e5f0b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -4,9 +4,9 @@ SECTION = "libs/multimedia" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" -SRCREV = "6c807bdd37748411801e93c48fcd5789d5a6a278" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.2.x;protocol=https" +SRCREV = "8b00644751578ba67b709a827cbe5133d849d339" S = "${WORKDIR}/git" -PV = "2.2.4" +PV = "2.2.6" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch deleted file mode 100644 index 0cb6943ccb..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Wed, 10 Feb 2021 12:42:45 +0000 -Subject: [PATCH] [core] Fix build with GCC 11. (#1806) - -The 'limits' header must be included explicitly. ---- -Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c] - srtcore/sync.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/srtcore/sync.h b/srtcore/sync.h -index 59c125a7..9f01ca91 100644 ---- a/srtcore/sync.h -+++ b/srtcore/sync.h -@@ -15,6 +15,7 @@ - //#define ENABLE_CXX17 - - #include -+#include - #ifdef ENABLE_STDCXX_SYNC - #include - #include --- -2.30.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb deleted file mode 100644 index 5b5c1f24d9..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Secure Reliable Transport (SRT) Protocol" -DESCRIPTION = "Secure Reliable Transport (SRT) is an open source transport technology \ -that optimizes streaming performance across unpredictable networks, such as the Internet." -SECTION = "libs" -HOMEPAGE = "https://github.com/Haivision/srt" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" - -SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036" -SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \ - file://0001-don-t-install-srt-ffplay.patch \ - file://0001-core-Fix-build-with-GCC-11.-1806.patch \ - " -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DENABLE_UNITTESTS=OFF" - -PACKAGECONFIG ??= "crypt" -PACKAGECONFIG[debug] = "-DENABLE_DEBUG=1,," -PACKAGECONFIG[crypt] = "-DENABLE_ENCRYPTION=ON,-DENABLE_ENCRYPTION=OFF,openssl" -PACKAGECONFIG[utils] = "-DENABLE_APPS=ON,-DENABLE_APPS=OFF," - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'utils', '${PN}-utils', '', d)}" -FILES:${PN}-utils += "${bindir}" -RDEPENDS:${PN}-utils += "${PN}" diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb new file mode 100644 index 0000000000..d6cf36dfbe --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.4.bb @@ -0,0 +1,27 @@ +SUMMARY = "Secure Reliable Transport (SRT) Protocol" +DESCRIPTION = "Secure Reliable Transport (SRT) is an open source transport technology \ +that optimizes streaming performance across unpredictable networks, such as the Internet." +SECTION = "libs" +HOMEPAGE = "https://github.com/Haivision/srt" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +SRCREV = "8b32f3734ff6af7cc7b0fef272591cb80a2d1aae" +SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \ + file://0001-don-t-install-srt-ffplay.patch \ + " +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DENABLE_UNITTESTS=OFF" + +PACKAGECONFIG ??= "crypt" +PACKAGECONFIG[debug] = "-DENABLE_DEBUG=1,," +PACKAGECONFIG[crypt] = "-DENABLE_ENCRYPTION=ON,-DENABLE_ENCRYPTION=OFF,openssl" +PACKAGECONFIG[utils] = "-DENABLE_APPS=ON,-DENABLE_APPS=OFF," + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'utils', '${PN}-utils', '', d)}" +FILES:${PN}-utils += "${bindir}" +RDEPENDS:${PN}-utils += "${PN}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch new file mode 100644 index 0000000000..a52821915e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch @@ -0,0 +1,49 @@ +From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Fri, 1 Apr 2022 23:12:17 -0700 +Subject: [PATCH] meson: add pythoninstalldir option + +In case of cross build, using host python to determine the python +site-packages directory for target is not feasible, add a new option +pythoninstalldir to fix the issue. + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] + +Signed-off-by: Chen Qi +--- + meson.build | 7 ++++++- + meson_options.txt | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bc990cd..a37aacd 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) + bindir = join_paths([prefix, get_option('bindir')]) + libexecdir = join_paths([prefix, get_option('libexecdir')]) + schemadir = join_paths([datadir, 'glib-2.0', 'schemas']) +-pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++pythoninstalldir = get_option('pythoninstalldir') ++if pythoninstalldir != '' ++ pythondir = join_paths([prefix, pythoninstalldir]) ++else ++ pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++endif + + if get_option('policykit') + have_polkit = 'True' +diff --git a/meson_options.txt b/meson_options.txt +index b3e939f..96acbbc 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -5,5 +5,6 @@ option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAud + option('appindicator', type: 'boolean', value: true, description: 'Enable Libappindicator support') + option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') + option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') ++option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') + option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') + option('thunar-sendto', type: 'boolean', value: true, description: 'Install Thunar sendto plugin') +-- +2.33.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb index ea06ee67f7..d5aeceeb42 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb @@ -10,10 +10,11 @@ SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ + file://0001-meson-add-pythoninstalldir-option.patch \ " SRC_URI[sha256sum] = "55d639feeda0b43b18a659e65985213a54b47dcb1348f3b4effb5238db242602" -EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false" +EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index dc6e4b5e16..3da397f5c7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -340,3 +340,8 @@ RDEPENDS:${PN}-test = "\ " ALLOW_EMPTY:${PN}-test = "1" + +# Patch for CVE-2018-1050 is applied in version 4.5.15, 4.6.13, 4.7.5. +# Patch for CVE-2018-1057 is applied in version 4.3.13, 4.4.16. +CVE_CHECK_IGNORE += "CVE-2018-1050" +CVE_CHECK_IGNORE += "CVE-2018-1057" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init index 51c95dfedd..43c286f9c7 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init @@ -16,7 +16,7 @@ fi DNSMASQ_CONF="/etc/dnsmasq.conf" test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*" -test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid" +test -z "${PIDFILE}" && PIDFILE="/run/dnsmasq.pid" if [ -z "$IGNORE_RESOLVCONF" ] then diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb index a3e090fbd5..1c3545f960 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb @@ -17,9 +17,9 @@ for better management of and seamless user interactions with guests.\ " SECTION = "vmware-tools" -LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD & CDDL-1.0" +LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD-2-Clause & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE:modules/freebsd/vmblock = "BSD" +LICENSE:modules/freebsd/vmblock = "BSD-2-Clause" LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb index 53f1720b04..20dccc2356 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" +COMPATIBLE_HOST:libc-musl = 'null' + SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://run-ptest" SRC_URI[sha256sum] = "7ebe1514acb688d2649cecc392db929094da3f03cfc98a9c0faccabb084912fa" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch deleted file mode 100644 index cff37fb5dc..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 73fcf0b54f4c1fc07a2aa003dddaeb5a97177cce Mon Sep 17 00:00:00 2001 -From: Potin Lai -Date: Thu, 31 Mar 2022 08:44:31 +0800 -Subject: [PATCH 1/1] fix undefined bswap32 and bswap64 errors for MIPS machine - -Replace bswap32 and bswap64 with internal defined version (__bswap_X) - -Upstream Status: Submitted [libimobiledevice-devel@libimobiledevice.org] - -Signed-off-by: Potin Lai ---- - include/endianness.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/endianness.h b/include/endianness.h -index 099877a..88b63db 100644 ---- a/include/endianness.h -+++ b/include/endianness.h -@@ -113,8 +113,8 @@ - && !defined(__FLOAT_WORD_ORDER__)) \ - || (defined(__FLOAT_WORD_ORDER__) \ - && __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__) --#define float_bswap64(x) bswap64(x) --#define float_bswap32(x) bswap32(x) -+#define float_bswap64(x) __bswap_64(x) -+#define float_bswap32(x) __bswap_32(x) - #else - #define float_bswap64(x) (x) - #define float_bswap32(x) (x) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb index d5d90ea137..6d872b9f81 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb @@ -10,11 +10,8 @@ DEPENDS = "libplist" PV = "1.0.0+git${SRCPV}" -SRCREV = "ecb0996fd2a3b0539153dd3ef901d137bf498ffe" -SRC_URI = "\ - git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master \ - file://0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch \ -" +SRCREV = "bc6c44b92091c9587a9bed0ed3f2c3248bfd13b3" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb deleted file mode 100644 index d25a01cf34..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb +++ /dev/null @@ -1,88 +0,0 @@ -DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ -Provides gRPC libraries for multiple languages written on top of shared C core library \ -(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" -HOMEPAGE = "https://github.com/grpc/grpc" -SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" - -DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" -DEPENDS:append:class-target = " googletest grpc-native " -DEPENDS:append:class-nativesdk = " grpc-native " - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" -# Configuration above allows to cross-compile gRPC applications -# In order to compile applications on the target, use the dependency below -# Both dependencies are mutually exclusive -# RDEPENDS:${PN}-dev += "${PN}-compiler" - -S = "${WORKDIR}/git" -SRCREV_grpc = "494b08ada4009ead0d0b70e44d354be72f9c283a" -BRANCH = "v1.45.x" -SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ - " -# Fixes build with older compilers 4.8 especially on ubuntu 14.04 -CXXFLAGS:append:class-native = " -Wl,--no-as-needed" - -inherit cmake pkgconfig - -EXTRA_OECMAKE = " \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_INSTALL=ON \ - -DCMAKE_CROSSCOMPILING=ON \ - -DgRPC_INSTALL_LIBDIR=${baselib} \ - -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ - " - -PACKAGECONFIG ??= "cpp shared" -PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" -PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" -PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" -PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" -PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" -PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" -PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" -PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure:prepend() { - sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt -} - -do_configure:prepend:mipsarch() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:powerpc() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:riscv64() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:riscv32() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:toolchain-clang:x86() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -BBCLASSEXTEND = "native nativesdk" - -SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" - -FILES:${PN}-compiler += " \ - ${bindir} \ - ${libdir}/libgrpc_plugin_support${SOLIBS} \ - " diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb new file mode 100644 index 0000000000..872bc6afcb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb @@ -0,0 +1,88 @@ +DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ +Provides gRPC libraries for multiple languages written on top of shared C core library \ +(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" +HOMEPAGE = "https://github.com/grpc/grpc" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" + +DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" +DEPENDS:append:class-target = " googletest grpc-native " +DEPENDS:append:class-nativesdk = " grpc-native " + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" +# Configuration above allows to cross-compile gRPC applications +# In order to compile applications on the target, use the dependency below +# Both dependencies are mutually exclusive +# RDEPENDS:${PN}-dev += "${PN}-compiler" + +S = "${WORKDIR}/git" +SRCREV_grpc = "1c159689ceda2c408f7f9d97d96a264c9521b806" +BRANCH = "v1.45.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ + file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ + " +# Fixes build with older compilers 4.8 especially on ubuntu 14.04 +CXXFLAGS:append:class-native = " -Wl,--no-as-needed" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = " \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ + -DgRPC_INSTALL=ON \ + -DCMAKE_CROSSCOMPILING=ON \ + -DgRPC_INSTALL_LIBDIR=${baselib} \ + -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ + " + +PACKAGECONFIG ??= "cpp shared" +PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" +PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" +PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" +PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" +PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" +PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" +PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" +PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure:prepend() { + sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt +} + +do_configure:prepend:mipsarch() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:powerpc() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:riscv64() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:riscv32() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:toolchain-clang:x86() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +BBCLASSEXTEND = "native nativesdk" + +SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" + +FILES:${PN}-compiler += " \ + ${bindir} \ + ${libdir}/libgrpc_plugin_support${SOLIBS} \ + " diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb deleted file mode 100644 index 433175fb6f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "High-level language, primarily intended for numerical computations" -HOMEPAGE = "http://www.gnu.org/software/octave/" -SECTION = "math" - -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = "gperf-native texinfo lapack pcre readline" - -inherit autotools pkgconfig texinfo gettext mime-xdg - -EXTRA_OECONF = "--disable-java --disable-docs" - -SRC_URI = "${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \ - file://fix-blas-library-integer-size.patch \ -" - -SRC_URI[md5sum] = "b43bd5f4309a0c048c91af10cf8e8674" -SRC_URI[sha256sum] = "09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97" - -do_compile:prepend() { - for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do - mkdir -p ${B}/${folder} - done -} - -PACKAGES =+ " octave-common liboctave liboctave-dev liboctave-dbg" - -FILES:${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${datadir}/${PN} \ - ${libdir}/${PN}/${PV}/oct ${libdir}/${PN}/${PV}/site \ - ${libdir}/${PN}/site ${datadir}/applications ${datadir}/metainfo" -FILES:${PN}-common = "${datadir}/icons" - -FILES:liboctave = "${libdir}/${PN}/${PV}/lib*${SOLIBS}" -FILES:liboctave-dev = "${libdir}/${PN}/${PV}/lib*${SOLIBSDEV}" -FILES:liboctave-dbg = "${libdir}/${PN}/${PV}/.debug" - -FILES:${PN}-dbg = "${bindir}/.debug ${libdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb new file mode 100644 index 0000000000..a7ff84fad7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb @@ -0,0 +1,52 @@ +SUMMARY = "High-level language, primarily intended for numerical computations" +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "math" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +# To build, add 'FORTRAN:forcevariable = ",fortran"' to your local.conf (or use +# meta-mortsgna as distro :) + +DEPENDS = " \ + gperf-native \ + libglu \ + lapack \ + fftw \ + curl \ + freetype \ + fontconfig \ + texinfo \ + pcre \ + readline \ + fltk \ + hdf5 \ + libsndfile1 \ +" + +inherit autotools pkgconfig texinfo gettext gtk-icon-cache mime-xdg features_check + +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +SRC_URI = " \ + ${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \ + file://fix-blas-library-integer-size.patch \ +" +SRC_URI[sha256sum] = "b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd" + +EXTRA_OECONF = " \ + --disable-java \ + --disable-docs \ +" + +do_compile:prepend() { + for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do + mkdir -p ${B}/${folder} + done +} + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/${PV}/lib*${SOLIBSDEV}" + +# fortran is not enabled by default +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb index 23ac76a2d2..71072a5927 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb @@ -22,3 +22,6 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" SRC_URI[sha256sum] = "f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e" + +# Patch for CVE-2017-12858 is applied in version 1.2.0. +CVE_CHECK_IGNORE += "CVE-2017-12858" diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index f9349b02ab..e821430406 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -10,10 +10,7 @@ LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} -inherit features_check lib_package binconfig pkgconfig - -# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" +inherit lib_package binconfig pkgconfig DEPENDS += " \ jpeg \ @@ -22,7 +19,7 @@ DEPENDS += " \ " SRC_URI = " \ - git://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ + gitsm://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ file://fix-libdir-for-multilib.patch \ file://respect-DESTDIR-when-create-link.patch \ @@ -46,7 +43,11 @@ EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " -PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" +# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +" + PACKAGECONFIG:remove:class-native = "opengl" # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt' diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb deleted file mode 100644 index c9da9f5a1e..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-doc-common.inc -PE = "1" -PR = "${INC_PR}.0" - -DEPENDS += "util-macros" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449" - -SRC_URI[md5sum] = "ee6dc0a8a693a908857af328b2462661" -SRC_URI[sha256sum] = "e71ce1df82dcc51eb14be6f42171dcc6bdd11ef46c0c605d6da8af12bd73b74c" - -FILES:${PN} += " /usr/share/sgml/X11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb new file mode 100644 index 0000000000..050cb29824 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb @@ -0,0 +1,10 @@ +require xorg-doc-common.inc +PE = "1" + +DEPENDS += "util-macros" + +LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449" + +SRC_URI[sha256sum] = "65a9fdddedc17bd5e9c0b00d904960f03f047c3a62de5458989d493c29fec806" + +FILES:${PN} += " /usr/share/sgml/X11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch deleted file mode 100644 index 1bdc5adbc1..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 15 Jan 2020 20:21:58 -0800 -Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests - -It uses c++ sources and runtime therefore its best to use c++ compiler -to build it so it can find the correct runtime, cross compiling with -clang fails - -x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] -Signed-off-by: Khem Raj ---- - example-clients/wscript | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - ---- a/example-clients/wscript -+++ b/example-clients/wscript -@@ -49,10 +49,15 @@ def build(bld): - else: - use = ['clientlib'] - -+ if example_program == 'jack_simdtests': -+ ftrs = 'cxx cxxprogram' -+ else: -+ ftrs = 'c cprogram' -+ - if bld.env['IS_MACOSX']: -- prog = bld(features='c cprogram', framework = ['Foundation']) -+ prog = bld(features = ftrs, framework = ['Foundation']) - else: -- prog = bld(features='c cprogram') -+ prog = bld(features = ftrs) - prog.includes = os_incdir + ['../common/jack', '../common'] - prog.source = example_program_source - prog.use = use diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb deleted file mode 100644 index 97b0edeed0..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \ -server for multi-processor machines. It is a new implementation of the \ -JACK server core features that aims in removing some limitations of \ -the JACK1 design. The activation system has been changed for a data \ -flow model and lock-free programming techniques for graph access have \ -been used to have a more dynamic and robust system." -SECTION = "libs/multimedia" - -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ - file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ -" - -DEPENDS = "libsamplerate0 libsndfile1 readline" - -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ - file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ - " -SRCREV = "3e6ca6b734b69e2f5dfb85935068e15006fb5acf" - -S = "${WORKDIR}/git" - -inherit waf pkgconfig - -PACKAGECONFIG ??= "alsa" -PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib" -# --dbus only stops building jackd -> add --classic -PACKAGECONFIG[dbus] = "--dbus --classic,,dbus" -PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" - -# portaudio is for windows builds only -EXTRA_OECONF = "--portaudio=no" - -do_install:append() { - if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then - rm -f ${D}${bindir}/jack_control - fi -} - -PACKAGES =+ "libjack jack-server jack-utils" - -RDEPENDS:jack-dev:remove = "${PN} (= ${EXTENDPKGV})" - -FILES:libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES:jack-server = " \ - ${datadir}/dbus-1/services \ - ${bindir}/jackdbus \ - ${bindir}/jackd \ -" -FILES:jack-utils = "${bindir}/*" - -FILES:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb new file mode 100644 index 0000000000..452f066559 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \ +server for multi-processor machines. It is a new implementation of the \ +JACK server core features that aims in removing some limitations of \ +the JACK1 design. The activation system has been changed for a data \ +flow model and lock-free programming techniques for graph access have \ +been used to have a more dynamic and robust system." +SECTION = "libs/multimedia" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ + file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ +" + +DEPENDS = "libsamplerate0 libsndfile1 readline" + +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRCREV = "a2fe7ec2fdbd315f112c8035282d94a429451178" + +S = "${WORKDIR}/git" + +inherit waf pkgconfig + +PACKAGECONFIG ??= "alsa" +PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib" +# --dbus only stops building jackd -> add --classic +PACKAGECONFIG[dbus] = "--dbus --classic,,dbus" +PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" + +# portaudio is for windows builds only +EXTRA_OECONF = "--portaudio=no" + +do_install:append() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then + rm -f ${D}${bindir}/jack_control + fi +} + +PACKAGES =+ "libjack jack-server jack-utils" + +RDEPENDS:jack-dev:remove = "${PN} (= ${EXTENDPKGV})" + +FILES:libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" +FILES:jack-server = " \ + ${datadir}/dbus-1/services \ + ${bindir}/jackdbus \ + ${bindir}/jackd \ +" +FILES:jack-utils = "${bindir}/*" + +FILES:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb deleted file mode 100644 index bfd2d035fa..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." -AUTHOR = "Sameer Agarwal and Keir Mierle and Others" -HOMEPAGE = "http://ceres-solver.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" - -DEPENDS = "libeigen glog" - -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" -SRCREV = "399cda773035d99eaf1f4a129a666b3c4df9d1b1" - -S = "${WORKDIR}/git" - -inherit cmake - -do_configure:prepend() { - # otherwise https://github.com/ceres-solver/ceres-solver/blob/0b748597889f460764f6c980a00c6f502caa3875/cmake/AddGerritCommitHook.cmake#L68 - # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure - # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) - # and we really don't need Gerrit's Change-Id tags when just building this - touch ${S}/.git/hooks/commit-msg -} - -# We don't want path to eigen3 in ceres-solver RSS to be -# used by components which use CeresConfig.cmake from their -# own RSS -# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) -# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) -# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) -SSTATE_SCAN_FILES += "*.cmake" - -PACKAGECONFIG ??= "" - -# suitesparse* recipes will be in meta-ros layer -PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" -PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" -PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" - -# Only a static library and headers are created -RDEPENDS:${PN}-dev = "" -RRECOMMENDS:${PN}-dev = "${PN}-staticdev" -RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb new file mode 100644 index 0000000000..2b74ad845b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." +AUTHOR = "Sameer Agarwal and Keir Mierle and Others" +HOMEPAGE = "http://ceres-solver.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" + +DEPENDS = "libeigen glog" + +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" +SRCREV = "f68321e7de8929fbcdb95dd42877531e64f72f66" + +S = "${WORKDIR}/git" + +inherit cmake + +do_configure:prepend() { + # otherwise https://github.com/ceres-solver/ceres-solver/blob/0b748597889f460764f6c980a00c6f502caa3875/cmake/AddGerritCommitHook.cmake#L68 + # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure + # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) + # and we really don't need Gerrit's Change-Id tags when just building this + touch ${S}/.git/hooks/commit-msg +} + +# We don't want path to eigen3 in ceres-solver RSS to be +# used by components which use CeresConfig.cmake from their +# own RSS +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) +SSTATE_SCAN_FILES += "*.cmake" + +PACKAGECONFIG ??= "" + +# suitesparse* recipes will be in meta-ros layer +PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" +PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" +PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" + +# Only a static library and headers are created +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index c0c4412c7d..5a8db08771 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \ LICENSE = "GPL-2.0-only" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http;branch=master \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ file://0021-RH-fixup-udev-rules-for-redhat.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb deleted file mode 100644 index a0d8be6aff..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure:append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES:libpoppler = "${libdir}/libpoppler.so.*" -FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS:libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb new file mode 100644 index 0000000000..9c9122160c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure:append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS:libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb index 85deabde17..5765272ce8 100644 --- a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb @@ -21,7 +21,7 @@ inherit autotools-brokensep do_configure:prepend() { # To autoreconf we need the script in ${S}, we can't tell autotools to use # etc/ because then it can't find the Makefile.in - ln -s ${S}/etc/configure.ac ${S} + ln -sf ${S}/etc/configure.ac ${S} } PACKAGECONFIG ??= "gcrypt" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb deleted file mode 100644 index 55a7354820..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.13.bb +++ /dev/null @@ -1,38 +0,0 @@ -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 = "0f6cc0a10be22d7ddd684e1cd851e4364a440494" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P\d+(\_\d+)+)" - -inherit autotools pkgconfig gtk-doc gettext gobject-introspection systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdutildir --without-systemdsystemunitdir,systemd" - -EXTRA_OECONF = " --with-backend=linux" - -SYSTEMD_SERVICE:${PN} = "upower.service" -# don't start on boot by default - dbus does that on demand -SYSTEMD_AUTO_ENABLE = "disable" - -do_configure:prepend() { - touch ${S}/ABOUT-NLS - mkdir -p ${S}/build-aux - touch ${S}/build-aux/config.rpath - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -RDEPENDS:${PN} += "dbus" -RRECOMMENDS:${PN} += "pm-utils" -FILES:${PN} += "${datadir}/dbus-1/ \ - ${base_libdir}/udev/* \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.17.bb new file mode 100644 index 0000000000..0572cc801b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/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-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.15.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.15.0.bb deleted file mode 100644 index 78cbba6b27..0000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.15.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Python bindings for the Apache Thrift RPC system" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -SRC_URI[sha256sum] = "87c8205a71cf8bbb111cb99b1f7495070fbc9cabb671669568854210da5b3e29" - -inherit pypi setuptools3 - -# Use different filename to prevent conflicts with thrift itself -PYPI_SRC_URI:append = ";downloadfilename=${BP}.${PYPI_PACKAGE_EXT}" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb new file mode 100644 index 0000000000..6eb896d1d2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Python bindings for the Apache Thrift RPC system" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +SRC_URI[sha256sum] = "2b5b6488fcded21f9d312aa23c9ff6a0195d0f6ae26ddbd5ad9e3e25dfc14408" + +inherit pypi setuptools3 + +# Use different filename to prevent conflicts with thrift itself +PYPI_SRC_URI:append = ";downloadfilename=${BP}.${PYPI_PACKAGE_EXT}" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb deleted file mode 100644 index 39d1618cb1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" -HOMEPAGE = "https://github.com/ilanschnell/bitarray" -LICENSE = "PSF-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" - -SRC_URI[sha256sum] = "f1203e902d51df31917d77eeba9c3fe78d032873a2ad78c737e26420f0080e58" - -inherit setuptools3 pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.1.bb new file mode 100644 index 0000000000..fbb89b8dd7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" +HOMEPAGE = "https://github.com/ilanschnell/bitarray" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" + +SRC_URI[sha256sum] = "faeca03f979e992cc76f7406af7eb9795cb111b8d8969c891a032bd7497c87da" + +inherit setuptools3 pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb new file mode 100644 index 0000000000..802eab2a07 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.bb @@ -0,0 +1,14 @@ +SUMMARY = "Python template engine and code generation tool" +HOMEPAGE = "https://cheetahtemplate.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=15e13a4ed0e5880e3e55ec88b0921181" + +PYPI_PACKAGE = "Cheetah3" +inherit pypi setuptools3 + +RDEPENDS:${PN} = "python3-pickle python3-pprint" +RDEPENDS:${PN}:class-native = "" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[sha256sum] = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb deleted file mode 100644 index 8eed99ee30..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Python template engine and code generation tool" -HOMEPAGE = "https://cheetahtemplate.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=15e13a4ed0e5880e3e55ec88b0921181" - -PYPI_PACKAGE = "Cheetah3" -inherit pypi setuptools3 - -RDEPENDS:${PN} = "python3-pickle python3-pprint" -RDEPENDS:${PN}:class-native = "" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[sha256sum] = "63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb deleted file mode 100644 index 76f7a8e652..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "A simple wrapper around optparse for powerful command line utilities." -DESCRIPTION = "\ -Click is a Python package for creating beautiful command line interfaces \ -in a composable way with as little code as necessary. It's the "Command \ -Line Interface Creation Kit". It's highly configurable but comes with \ -sensible defaults out of the box." -HOMEPAGE = "http://click.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" - -SRC_URI[sha256sum] = "8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ - cp -rf ${S}/docs ${D}${PTEST_PATH}/ -} - -UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" - -CLEANBROKEN = "1" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-threading \ - " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.2.bb new file mode 100644 index 0000000000..a623fe104c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "A simple wrapper around optparse for powerful command line utilities." +DESCRIPTION = "\ +Click is a Python package for creating beautiful command line interfaces \ +in a composable way with as little code as necessary. It's the "Command \ +Line Interface Creation Kit". It's highly configurable but comes with \ +sensible defaults out of the box." +HOMEPAGE = "http://click.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" + +SRC_URI[sha256sum] = "479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ + cp -rf ${S}/docs ${D}${PTEST_PATH}/ +} + +UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" + +CLEANBROKEN = "1" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-threading \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb deleted file mode 100644 index f86f571938..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "C++ headers for C extension development" -HOMEPAGE = "https://cppy.readthedocs.io/en/latest/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371" - -SRC_URI[sha256sum] = "95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc" - -RDEPENDS:${PN} += "python3-setuptools python3-distutils" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb new file mode 100644 index 0000000000..b84b46164c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "C++ headers for C extension development" +HOMEPAGE = "https://cppy.readthedocs.io/en/latest/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371" + +SRC_URI[sha256sum] = "83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b" + +RDEPENDS:${PN} += "python3-setuptools python3-distutils" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb deleted file mode 100644 index ca324c9ae9..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.4.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Python evdev lib" -HOMEPAGE = "https://github.com/gvalkov/python-evdev" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" - -SRC_URI[sha256sum] = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1" - -inherit pypi setuptools3 - -do_compile:prepend() { - rm -rf ${S}/evdev/ecodes.c -} - -SETUPTOOLS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.5.0.bb new file mode 100644 index 0000000000..141411da0c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.5.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Python evdev lib" +HOMEPAGE = "https://github.com/gvalkov/python-evdev" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" + +SRC_URI[sha256sum] = "5b33b174f7c84576e7dd6071e438bf5ad227da95efd4356a39fe4c8355412fe6" + +inherit pypi setuptools3 + +do_compile:prepend() { + rm -rf ${S}/evdev/ecodes.c +} + +SETUPTOOLS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.36.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.36.0.bb deleted file mode 100644 index 502ebad3f0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.36.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, \ -Moderator, and many other Google APIs." -HOMEPAGE = "https://github.com/googleapis/google-api-python-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[sha256sum] = "533c69e8ddce6630a2ce5b98348f6a58a23df49cb92040a0086315df979404af" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-httplib2 \ - ${PYTHON_PN}-uritemplate \ - ${PYTHON_PN}-google-api-core \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb new file mode 100644 index 0000000000..8fcf669952 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, \ +Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[sha256sum] = "7bf58b665b635d06adb47797a9a4f73482e739e02ed036cd960dc7c183361f67" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-httplib2 \ + ${PYTHON_PN}-uritemplate \ + ${PYTHON_PN}-google-api-core \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb deleted file mode 100644 index ffa009d7b7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Google gRPC" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" - -DEPENDS += "${PYTHON_PN}-protobuf" - -SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ - file://boring_ssl.patch \ - file://mips_bigendian.patch \ - file://0001-absl-always-use-asm-sgidefs.h.patch \ - file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ -" -SRC_URI[sha256sum] = "4bae1c99896045d3062ab95478411c8d5a52cb84b91a1517312629fa6cfeb50e" - -RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ -" - -inherit setuptools3 -inherit pypi - -export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" - -BORING_SSL_PLATFORM:arm = "linux-arm" -BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" -BORING_SSL_PLATFORM ?= "unsupported" -export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" - -BORING_SSL:x86-64 = "1" -BORING_SSL:arm = "1" -BORING_SSL ?= "0" -export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" - -GRPC_CFLAGS ?= "" -GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" -export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" - -CLEANBROKEN = "1" - -BBCLASSEXTEND = "native nativesdk" - -CCACHE_DISABLE = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb new file mode 100644 index 0000000000..ca55a7f091 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Google gRPC" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" + +DEPENDS += "${PYTHON_PN}-protobuf" + +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" +SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ + file://boring_ssl.patch \ + file://mips_bigendian.patch \ + file://0001-absl-always-use-asm-sgidefs.h.patch \ + file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ +" +SRC_URI[sha256sum] = "ff2c8b965b0fc25cf281961aa46619c10900543effe3f806ef818231c40aaff3" + +RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ +" + +inherit setuptools3 +inherit pypi + +export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" + +BORING_SSL_PLATFORM:arm = "linux-arm" +BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" +BORING_SSL_PLATFORM ?= "unsupported" +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" + +BORING_SSL:x86-64 = "1" +BORING_SSL:arm = "1" +BORING_SSL ?= "0" +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" + +GRPC_CFLAGS ?= "" +GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" + +CLEANBROKEN = "1" + +BBCLASSEXTEND = "native nativesdk" + +CCACHE_DISABLE = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb deleted file mode 100644 index ef1d7cc07b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." -HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4cda9a0ebd516714f360b0e9418cfb37" - -SRC_URI[sha256sum] = "7b7d3023cd35d9cb0c1fd91392f8c95c6fa02c59bf8ad64b8849be3401b95afb" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-simplejson \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-json \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb new file mode 100644 index 0000000000..2e8c7e7802 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." +HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4cda9a0ebd516714f360b0e9418cfb37" + +SRC_URI[sha256sum] = "5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-simplejson \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-json \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb deleted file mode 100644 index f76f275036..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Jalali implementation of Python's datetime module" -HOMEPAGE = "https://github.com/slashmili/python-jalali" -LICENSE = "Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c80be45b33471b4a23cf53d06a8172be" - -SRC_URI[sha256sum] = "d35baea2ed213e4e87bb840c61637001540bd21e8e4454bd12352b06591ec08e" - -PYPI_PACKAGE = "jdatetime" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-modules \ -" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb new file mode 100644 index 0000000000..c96e5c39ed --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Jalali implementation of Python's datetime module" +HOMEPAGE = "https://github.com/slashmili/python-jalali" +LICENSE = "Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c80be45b33471b4a23cf53d06a8172be" + +SRC_URI[sha256sum] = "4a67a82ee57e35b5f6f9f7fbe6a0eda63f56ce1dd8af409b4c2a26a3340457db" + +PYPI_PACKAGE = "jdatetime" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-modules \ +" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb deleted file mode 100644 index ab1ad717b4..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A fast implementation of the Cassowary constraint solver" -HOMEPAGE = "https://github.com/nucleic/kiwi" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" - -SRC_URI[sha256sum] = "7508b01e211178a85d21f1f87029846b77b2404a4c68cbd14748d4d4142fa3b8" - -inherit pypi python_setuptools_build_meta - -DEPENDS += "\ - python3-cppy-native \ -" - -RDEPENDS:${PN} += "\ - python3-core \ - python3-setuptools \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb new file mode 100644 index 0000000000..48ff7df52d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A fast implementation of the Cassowary constraint solver" +HOMEPAGE = "https://github.com/nucleic/kiwi" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" + +SRC_URI[sha256sum] = "7f606d91b8a8816be476513a77fd30abe66227039bd6f8b406c348cb0247dcc9" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "\ + python3-cppy-native \ +" + +RDEPENDS:${PN} += "\ + python3-core \ + python3-setuptools \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb deleted file mode 100644 index 4877194a5c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "pandas library for high-performance data analysis tools" -DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ -high-performance, easy-to-use data structures and data analysis tools for \ -the Python programming language." -HOMEPAGE = "http://pandas.pydata.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" - -SRC_URI[sha256sum] = "8db93ec98ac7cb5f8ac1420c10f5e3c43533153f253fe7fb6d891cf5aa2b80d2" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ -" - -CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-dateutil-zoneinfo \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-profile \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb new file mode 100644 index 0000000000..6d0f669d53 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "pandas library for high-performance data analysis tools" +DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ +high-performance, easy-to-use data structures and data analysis tools for \ +the Python programming language." +HOMEPAGE = "http://pandas.pydata.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" + +SRC_URI[sha256sum] = "92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ +" + +CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-dateutil-zoneinfo \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb deleted file mode 100644 index 85147544e7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Protocol Buffers" -HOMEPAGE = "https://developers.google.com/protocol-buffers/" -SECTION = "devel/python" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de84f8d949cfcfd4e" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a" - -# http://errors.yoctoproject.org/Errors/Details/184715/ -# Can't find required file: ../src/google/protobuf/descriptor.proto -CLEANBROKEN = "1" - -UPSTREAM_CHECK_REGEX = "protobuf/(?P\d+(\.\d+)+)/" - -DEPENDS += "protobuf" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-unittest \ -" - -# For usage in other recipies when compiling protobuf files (e.g. by grpcio-tools) -BBCLASSEXTEND = "native nativesdk" - -DISTUTILS_BUILD_ARGS += "--cpp_implementation" -DISTUTILS_INSTALL_ARGS += "--cpp_implementation" - -do_compile:prepend:class-native () { - export KOKORO_BUILD_NUMBER="1" -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.0.bb new file mode 100644 index 0000000000..5c4de4ac2b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.0.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Protocol Buffers" +HOMEPAGE = "https://developers.google.com/protocol-buffers/" +SECTION = "devel/python" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "71b2c3d1cd26ed1ec7c8196834143258b2ad7f444efff26fdc366c6f5e752702" + +# http://errors.yoctoproject.org/Errors/Details/184715/ +# Can't find required file: ../src/google/protobuf/descriptor.proto +CLEANBROKEN = "1" + +UPSTREAM_CHECK_REGEX = "protobuf/(?P\d+(\.\d+)+)/" + +DEPENDS += "protobuf" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-unittest \ +" + +# For usage in other recipies when compiling protobuf files (e.g. by grpcio-tools) +BBCLASSEXTEND = "native nativesdk" + +DISTUTILS_BUILD_ARGS += "--cpp_implementation" +DISTUTILS_INSTALL_ARGS += "--cpp_implementation" + +do_compile:prepend:class-native () { + export KOKORO_BUILD_NUMBER="1" +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb deleted file mode 100644 index 43ba3a9dd0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[sha256sum] = "4eb107446fdbed876f48c83202b6212b221286168a55c16b3eb8edf4200f10a1" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-zeroconf \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-protobuf \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_11.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_11.0.0.bb new file mode 100644 index 0000000000..f556963731 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_11.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[sha256sum] = "151723b178110052b673b8765a120c85d16eae8c22d75575dceebe2be1eb1ef6" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-zeroconf \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-protobuf \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb deleted file mode 100644 index 63453517ec..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A generator framework based on a common modern IDL" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" - -SRC_URI[sha256sum] = "87ce8ce7123ae57d91ac903c6c330a99273e7f4665a0ab88e6a17f9c98143a68" - -inherit pypi python_setuptools_build_meta - -DEPS = "\ - python3-jinja2 \ - python3-click \ - python3-pyyaml \ - python3-pytest \ - python3-six \ - python3-path \ - python3-antlr4-runtime \ - python3-watchdog \ - python3-markupsafe \ - python3-setuptools \ -" -DEPENDS += "${DEPS}" -RDEPENDS:${PN} += "${DEPS}" - -BBCLASSEXTEND = "nativesdk native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb new file mode 100644 index 0000000000..c42b91fcd4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.7.bb @@ -0,0 +1,24 @@ +SUMMARY = "A generator framework based on a common modern IDL" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" + +SRC_URI[sha256sum] = "fae48ba129c55da8445580eb711905c03911c4250761c0cd53c67e33495b0cee" + +inherit pypi python_setuptools_build_meta + +DEPS = "\ + python3-jinja2 \ + python3-click \ + python3-pyyaml \ + python3-pytest \ + python3-six \ + python3-path \ + python3-antlr4-runtime \ + python3-watchdog \ + python3-markupsafe \ + python3-setuptools \ +" +DEPENDS += "${DEPS}" +RDEPENDS:${PN} += "${DEPS}" + +BBCLASSEXTEND = "nativesdk native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb deleted file mode 100644 index d4fc98817d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python client for Redis key-value store" -DESCRIPTION = "The Python interface to the Redis key-value store." -HOMEPAGE = "http://github.com/andymccurdy/redis-py" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" - -SRC_URI[sha256sum] = "6758d01dec81af191b98a35cce3402675d115456584c39b500ab485a5e386bbb" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-packaging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb new file mode 100644 index 0000000000..9370cbab67 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python client for Redis key-value store" +DESCRIPTION = "The Python interface to the Redis key-value store." +HOMEPAGE = "http://github.com/andymccurdy/redis-py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" + +SRC_URI[sha256sum] = "fe45513881229dbee610620b9e0817b1f48c47ba635870320fd44a712204bbdd" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-cryptography \ + ${PYTHON_PN}-packaging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb deleted file mode 100644 index 93a49df53a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ -application developers the full power and flexibility of SQL" -HOMEPAGE = "http://www.sqlalchemy.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" - -SRC_URI[sha256sum] = "6fdd2dc5931daab778c2b65b03df6ae68376e028a3098eb624d0909d999885bc" - -PYPI_PACKAGE = "SQLAlchemy" -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-profile \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb new file mode 100644 index 0000000000..b99ed83f6f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ +application developers the full power and flexibility of SQL" +HOMEPAGE = "http://www.sqlalchemy.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" + +SRC_URI[sha256sum] = "623bac2d6bdca3f3e61cf1e1c466c5fb9f5cf08735736ee1111187b7a4108891" + +PYPI_PACKAGE = "SQLAlchemy" +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-profile \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.0.bb deleted file mode 100644 index 0b3d2427cd..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Ultimate transformation library that supports validation, contexts and aiohttp." - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=21ecc7aa8f699874e706fc1354903437" - -SRC_URI[sha256sum] = "72c342ede27fb34cd219b62855119380ae1c87006b6106be163c01159eb955ff" -SRC_URI[md5sum] = "228675376012fb27dd7f70ab685e7766" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-urllib3 \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb new file mode 100644 index 0000000000..97c56abde4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Ultimate transformation library that supports validation, contexts and aiohttp." + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=21ecc7aa8f699874e706fc1354903437" + +SRC_URI[sha256sum] = "d9d00800318fbd343fdfb3353e947b2ebb5557159c844696c5ac24846f76d41c" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-urllib3 \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb deleted file mode 100644 index 4296ab2b33..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Utilities for interacting with PyPI" -HOMEPAGE = "https://twine.readthedocs.io/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" - -SRC_URI[sha256sum] = "8efa52658e0ae770686a13b675569328f1fba9837e5de1867bfe5f46a9aefe19" - -inherit pypi python_setuptools_build_meta - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-importlib-metadata \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb new file mode 100644 index 0000000000..08252e837b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Utilities for interacting with PyPI" +HOMEPAGE = "https://twine.readthedocs.io/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" + +SRC_URI[sha256sum] = "817aa0c0bdc02a5ebe32051e168e23c71a0608334e624c793011f120dbbc05b7" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-importlib-metadata \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb deleted file mode 100644 index 1c910920e0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Library to return tzinfo with the local timezone information" -HOMEPAGE = "https://pypi.org/project/tzlocal/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" - -SRC_URI[sha256sum] = "0f28015ac68a5c067210400a9197fc5d36ba9bc3f8eaf1da3cbd59acdfed9e09" - -inherit pypi python_setuptools_build_meta - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-pytz-deprecation-shim \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb new file mode 100644 index 0000000000..b9307f100f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Library to return tzinfo with the local timezone information" +HOMEPAGE = "https://pypi.org/project/tzlocal/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" + +SRC_URI[sha256sum] = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-pytz-deprecation-shim \ + ${PYTHON_PN}-datetime \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb deleted file mode 100644 index 166dd0355c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "websocket client for python" -DESCRIPTION = "\ -websocket-client module is WebSocket client for python. \ -This provide the low level APIs for WebSocket. All APIs \ -are the synchronous functions." -HOMEPAGE = "https://github.com/websocket-client/websocket-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b969e9612325987c823fc0737063ebc8" - -SRC_URI[sha256sum] = "6278a75065395418283f887de7c3beafb3aa68dada5cacbe4b214e8d26da499b" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-logging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb new file mode 100644 index 0000000000..3f09d267de --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "websocket client for python" +DESCRIPTION = "\ +websocket-client module is WebSocket client for python. \ +This provide the low level APIs for WebSocket. All APIs \ +are the synchronous functions." +HOMEPAGE = "https://github.com/websocket-client/websocket-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b969e9612325987c823fc0737063ebc8" + +SRC_URI[sha256sum] = "50b21db0058f7a953d67cc0445be4b948d7fc196ecbeb8083d68d94628e4abf6" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb deleted file mode 100644 index ed7a509ad3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "The Swiss Army knife of Python web development" -DESCRIPTION = "\ -Werkzeug started as simple collection of various utilities for WSGI \ -applications and has become one of the most advanced WSGI utility modules. \ -It includes a powerful debugger, full featured request and response objects, \ -HTTP utilities to handle entity tags, cache control headers, HTTP dates, \ -cookie handling, file uploads, a powerful URL routing system and a bunch \ -of community contributed addon modules." -HOMEPAGE = "http://werkzeug.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" - -PYPI_PACKAGE = "Werkzeug" - -SRC_URI[sha256sum] = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-simplejson \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-profile \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb new file mode 100644 index 0000000000..476a3a5964 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "The Swiss Army knife of Python web development" +DESCRIPTION = "\ +Werkzeug started as simple collection of various utilities for WSGI \ +applications and has become one of the most advanced WSGI utility modules. \ +It includes a powerful debugger, full featured request and response objects, \ +HTTP utilities to handle entity tags, cache control headers, HTTP dates, \ +cookie handling, file uploads, a powerful URL routing system and a bunch \ +of community contributed addon modules." +HOMEPAGE = "http://werkzeug.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" + +PYPI_PACKAGE = "Werkzeug" + +SRC_URI[sha256sum] = "f8e89a20aeabbe8a893c24a461d3ee5dad2123b05cc6abd73ceed01d39c3ae74" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-simplejson \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb index e61b00efa4..dcb373a1f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb @@ -4,6 +4,10 @@ HOMEPAGE = "http://www.wxpython.org" LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce1d18e2d633d41786c0a8dfbc80917" +inherit features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" + DEPENDS = "wxwidgets-native wxwidgets" PYPI_PACKAGE = "wxPython" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch b/meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch deleted file mode 100644 index 51fe8c7c56..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/files/setuptools.patch +++ /dev/null @@ -1,82 +0,0 @@ -Upstream-Status: Submitted [https://github.com/dcantrell/pyparted/pull/85] -Signed-off-by: Ross Burton - -From 3f5ca7eb6f57d8bcaa3b333497aba6e53d847450 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 14 Jan 2022 16:06:31 +0000 -Subject: [PATCH] setup.py: port to setuptools - -Python 3.10 has deprecated distutils[1], and it will be removed entirely -in Python 3.12. - -As the setuptools API is identical, moving to setuptools is trivial by -changing the import. - -Remove check_mod_version, a version specifier can be passed directly -to pkg-config. - -Remove unused imports. - -[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated - -Signed-off-by: Ross Burton ---- - setup.py | 29 +++++++++-------------------- - 1 file changed, 9 insertions(+), 20 deletions(-) - -diff --git a/setup.py b/setup.py -index da71d9c..1e9e367 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,12 +25,7 @@ import glob - import os - import platform - import sys --from distutils.ccompiler import new_compiler --from distutils.errors import CompileError --from distutils.errors import LinkError --from distutils.core import setup --from distutils.core import Extension --from distutils.version import LooseVersion -+from setuptools import setup, Extension - - pyparted_version = '3.11.7' - python_version = sys.version_info -@@ -45,19 +40,13 @@ if python_version < need_python_version: - # http://code.activestate.com/recipes/502261-python-distutils-pkg-config/ - def pkgconfig(*packages, **kwargs): - flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} -- for token in subprocess.check_output(["pkg-config", "--libs", "--cflags"] + list(packages)).decode('utf-8').split(): -- -- kwargs.setdefault(flag_map.get(token[:2]), []).append(token[2:]) -- return kwargs -- --def check_mod_version(module, version): -- modversion = subprocess.check_output(["pkg-config", "--modversion", module]).decode('utf-8').split()[0] -- if not LooseVersion(modversion) >= LooseVersion(version): -- sys.stderr.write("*** Minimum required %s version: %s, found: %s\n" % (module, version, modversion,)) -- sys.exit(1) -- return -- --check_mod_version('libparted', need_libparted_version) -+ try: -+ for token in subprocess.check_output(["pkg-config", "--libs", "--cflags"] + list(packages), -+ universal_newlines=True).split(): -+ kwargs.setdefault(flag_map.get(token[:2]), []).append(token[2:]) -+ return kwargs -+ except subprocess.CalledProcessError as e: -+ sys.exit("Cannot find pkg-config dependencies:\n" + e.output) - - # This list is in the format necessary for the define_macros parameter - # for an Extension() module definition. See: -@@ -77,6 +66,6 @@ setup(name='pyparted', - ext_modules=[Extension('_ped', - sorted(glob.glob(os.path.join('src', '*.c'))), - define_macros=features, -- **pkgconfig('libparted', -+ **pkgconfig('libparted >= %s' % need_libparted_version, - include_dirs=['include'])) - ]) --- -2.25.1 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb deleted file mode 100644 index 2cdf82365a..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "pyparted is a set of Python modules that provide Python programmers \ -an interface to libparted, the GNU parted library for disk partitioning and \ -filesystem manipulation." -SUMMARY = "Python bindings for libparted" -HOMEPAGE = "https://github.com/rhinstaller/pyparted" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \ -" - -SRC_URI += "file://setuptools.patch" - -SRC_URI[md5sum] = "69284f943982f54ded76960c92098a02" -SRC_URI[sha256sum] = "61cde7b096bccd69ddc75c85b17f8baed45c3687d404706d91403a319453b903" - -inherit pkgconfig pypi setuptools3 - -DEPENDS += "parted" - -RDEPENDS:${PN}:class-target += " \ - parted (>= 2.3) \ - python3-stringold python3-codecs python3-math \ -" -RDEPENDS:${PN}:class-native = "" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb new file mode 100644 index 0000000000..9dd362766d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "pyparted is a set of Python modules that provide Python programmers \ +an interface to libparted, the GNU parted library for disk partitioning and \ +filesystem manipulation." +SUMMARY = "Python bindings for libparted" +HOMEPAGE = "https://github.com/rhinstaller/pyparted" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ + file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \ +" + +SRC_URI[sha256sum] = "da985e116beb733371feb605b174db9eec8bd0eedffc8f739f8e603f51b521e7" + +inherit pkgconfig pypi setuptools3 + +DEPENDS += "parted" + +RDEPENDS:${PN}:class-target += " \ + parted (>= 2.3) \ + python3-stringold python3-codecs python3-math \ +" +RDEPENDS:${PN}:class-native = "" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index 1e9acc471d..3d6158628f 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -19,3 +19,4 @@ When sending single patches, please using something like: git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' Layer maintainer: Kai Kang +Layer maintainer: Andreas Müller diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb deleted file mode 100644 index 90a75bf5a3..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A simple text editor for Xfce" -SECTION = "x11/application" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" - -inherit xfce-app gsettings mime-xdg - -SRC_URI[sha256sum] = "921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" - -FILES:${PN} += " \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/metainfo \ - ${datadir}/polkit-1 \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb new file mode 100644 index 0000000000..1be015bfbb --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb @@ -0,0 +1,19 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" + +inherit xfce-app gsettings mime-xdg + +SRC_URI[sha256sum] = "f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" + +FILES:${PN} += " \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch b/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch deleted file mode 100644 index 517de5f922..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5bdf11fe3638d279edcad911906f801751e024da Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 23 Jul 2019 14:22:08 -0700 -Subject: [PATCH] drop setting is_utc member of icaltimetype - -This seems to be gone in libical3 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/ical-code.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/ical-code.c b/src/ical-code.c -index d583140..d8e5543 100644 ---- a/src/ical-code.c -+++ b/src/ical-code.c -@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_current_local_time() - && (strcmp(g_par.local_timezone, "floating") != 0)) - ctime = icaltime_current_time_with_zone(local_icaltimezone); - else { / * use floating time * / -- ctime.is_utc = 0; - ctime.is_date = 0; - ctime.is_daylight = 0; - ctime.zone = NULL; -@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - * when counting alarm time. */ - if (rel == ICAL_RELATED_START) { - per.stime.is_date = 0; -- per.stime.is_utc = 1; - per.stime.is_daylight = 0; - per.stime.zone = utc_icaltimezone; - per.stime.hour = 0; -@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - } - else { - per.etime.is_date = 0; -- per.etime.is_utc = 1; - per.etime.is_daylight = 0; - per.etime.zone = utc_icaltimezone; - per.etime.hour = 0; -@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time - /* HACK: convert to UTC time so that we can use time arithmetic - * when counting alarm time. */ - start_time.is_date = 0; -- start_time.is_utc = 1; - start_time.is_daylight = 0; - start_time.zone = utc_icaltimezone; - start_time.hour = 0; -@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s" - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } --- -2.22.0 - diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb deleted file mode 100644 index ed7f42024e..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Xfce Calender" -SECTION = "x11/application" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "gtk+ xfce4-panel libical popt" - -inherit xfce-app mime-xdg - -SRC_URI += "file://0001-drop-setting-is_utc-member-of-icaltimetype.patch" - -SRC_URI[md5sum] = "2b7f5d38cb5c6edbcc65d0f52a742e46" -SRC_URI[sha256sum] = "3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" - -PACKAGES =+ "xfce4-orageclock-plugin" -FILES:${PN} += "${datadir}/dbus-1" -FILES:xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" -FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.16.0.bb new file mode 100644 index 0000000000..d10cdaac49 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.16.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Xfce Calender" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ xfce4-panel libical popt" + +inherit xfce-app mime-xdg + +SRC_URI[sha256sum] = "26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" + +PACKAGES =+ "xfce4-orageclock-plugin" +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" +FILES:xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" +FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb deleted file mode 100644 index f2156a3e2a..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Tiny image-viewer" -HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" -SECTION = "x11/application" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" - -DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" - -inherit xfce-app mime-xdg - -RRECOMMENDS:${PN} += "tumbler" - -SRC_URI[sha256sum] = "13853f9ca18466a8e4788e92c7bde3388a93e8340283568f5dee1a9396ffd7ee" - -FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb new file mode 100644 index 0000000000..66836422ed --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Tiny image-viewer" +HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" + +DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" + +inherit xfce-app mime-xdg + +RRECOMMENDS:${PN} += "tumbler" + +SRC_URI[sha256sum] = "0eee869922ec00a253dafa446c2aad2a2f98e07e1db7262e8337ce9ec2dad969" + +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index d8f0033b3e..ea7e8005ef 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -3,13 +3,13 @@ HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" SRC_URI = "git://github.com/ib/xarchiver.git;branch=master;protocol=https" -SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" -PV = "0.5.4.14" +SRCREV = "2f6c91e756678f0723305d8636e8e393c1eef32c" +PV = "0.5.4.17" S = "${WORKDIR}/git" inherit gettext pkgconfig autotools gtk-icon-cache features_check mime-xdg diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb deleted file mode 100644 index 2174d2af4f..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = " \ - dbus \ - dbus-glib \ - libnotify \ - libxfce4util \ - libxfce4ui \ - xfconf \ - xfce4-panel \ -" - -inherit xfce-app - -SRC_URI[sha256sum] = "19ab84c6665c7819998f2269322d53f462c30963ce26042df23ae525e7d16545" - -# Avoid trouble with other desktops e.g KDE which also ships dbus service named -# org.freedesktop.Notifications -EXTRA_OECONF = "--disable-dbus-start-daemon" - -do_compile:prepend() { - mkdir -p xfce4-notifyd xfce4-notifyd-config -} - -FILES:${PN} += " \ - ${systemd_user_unitdir} \ - ${datadir}/xfce4 \ - ${datadir}/themes \ - ${datadir}/dbus-1 \ - ${libdir}/xfce4 \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb new file mode 100644 index 0000000000..6086608110 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb @@ -0,0 +1,33 @@ +SUMMARY = "Easily themable notification daemon with transparency effects" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + dbus \ + dbus-glib \ + libnotify \ + libxfce4util \ + libxfce4ui \ + xfconf \ + xfce4-panel \ +" + +inherit xfce-app + +SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f" + +# Avoid trouble with other desktops e.g KDE which also ships dbus service named +# org.freedesktop.Notifications +EXTRA_OECONF = "--disable-dbus-start-daemon" + +do_compile:prepend() { + mkdir -p xfce4-notifyd xfce4-notifyd-config +} + +FILES:${PN} += " \ + ${systemd_user_unitdir} \ + ${datadir}/xfce4 \ + ${datadir}/themes \ + ${datadir}/dbus-1 \ + ${libdir}/xfce4 \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb new file mode 100644 index 0000000000..bb44ec7829 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb @@ -0,0 +1,21 @@ +SUMMARY = "Application to take screenshots" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" + +inherit xfce-app perlnative + +SRC_URI[sha256sum] = "04b4178527f5b98cfe76ae427e95581067edf262a530639d332f6db9a68292d7" + +do_compile:prepend() { + mkdir -p lib + mkdir -p src panel-plugin +} + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb deleted file mode 100644 index 78e0848177..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" -SECTION = "x11/application" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" - -inherit xfce-app - -SRC_URI[sha256sum] = "33c8aeb53fbdb82dbd7d40bca77a8affbb4116ba0993cd59474b554558e5daa4" - -do_compile:prepend() { - mkdir -p lib - mkdir -p src panel-plugin -} - -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/xfce4/panel/plugins \ - ${libdir}/xfce4/panel/plugins \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb deleted file mode 100644 index e9f2e40593..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Terminal emulator for the Xfce desktop environment" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" - -inherit xfce-app - -FILES:${PN} += "${datadir}/xfce4 \ - ${datadir}/gnome-control-center" - -SRC_URI[sha256sum] = "7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7" - -RRECOMMENDS:${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb new file mode 100644 index 0000000000..85b0812ed5 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Terminal emulator for the Xfce desktop environment" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" + +inherit xfce-app + +FILES:${PN} += " \ + ${datadir}/xfce4 \ + ${datadir}/gnome-control-center \ +" + +SRC_URI[sha256sum] = "593b6a7bd9b18851e51854e075990109b7896a22713b5dd8b913b23f21db6576" + +RRECOMMENDS:${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb deleted file mode 100644 index f3d78c11df..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "Panel plugin to display frequency of all cpus" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" - -inherit xfce-panel-plugin - -SRC_URI[sha256sum] = "f8bd728de2d33e7ab30c682716b1cac4776b9884ce48b03fd7c32c9b24b13498" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb new file mode 100644 index 0000000000..c98fe4a5c3 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin to display frequency of all cpus" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb deleted file mode 100644 index 583eacb2bc..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "Panel plugin with graphical representation of the cpu frequency" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" - -inherit xfce-panel-plugin - -SRC_URI[sha256sum] = "c2f6dbd7f83c79b63b83c98232c79d050e18640e82464b9ec8d3643a92c3a1b0" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb new file mode 100644 index 0000000000..a9ac08989e --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb deleted file mode 100644 index 31eeefd6ac..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying instant disk/partition performance" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" - -inherit xfce-panel-plugin - -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" -SRC_URI[sha256sum] = "73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb new file mode 100644 index 0000000000..25a57f3233 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying instant disk/partition performance" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" + +inherit xfce-panel-plugin + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI[sha256sum] = "5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb index e2075a6d32..e8e133035d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb @@ -9,5 +9,5 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "bde92cbd08f129d517524784e5060816" SRC_URI[sha256sum] = "f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb index b2d61a1d22..5168efe1fe 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb @@ -11,7 +11,7 @@ DEPENDS += "dbus-glib pulseaudio" SRC_URI[md5sum] = "3d86032acb9364d47e0a144350c63e1a" SRC_URI[sha256sum] = "5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "libnotify" PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" RRECOMMENDS:${PN} = "pavucontrol" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb deleted file mode 100644 index 68f3f64295..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Sensors plugin for the Xfce Panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" - -inherit xfce-panel-plugin - -SRC_URI[sha256sum] = "da90f12e6ae995bcd1c81be35479a7a9d32308c65ecd64e568ba8c9592d39fcb" -SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" - -EXTRA_OECONF = " \ - --disable-procacpi \ - --disable-xnvctrl \ -" - -do_configure:prepend() { - sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac -} - -PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" -PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" -PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" -PACKAGECONFIG[libnotify] = "--enable-notification,--disable-notification, libnotify" - -FILES_SOLIBSDEV = "${libdir}/xfce4/modules/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb new file mode 100644 index 0000000000..13933b6cd9 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb @@ -0,0 +1,26 @@ +SUMMARY = "Sensors plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" + +EXTRA_OECONF = " \ + --disable-procacpi \ + --disable-xnvctrl \ +" + +do_configure:prepend() { + sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac +} + +PACKAGECONFIG ??= "libnotify" +PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" +PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" +PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" +PACKAGECONFIG[libnotify] = "--enable-notification,--disable-notification, libnotify" + +FILES_SOLIBSDEV = "${libdir}/xfce4/modules/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb index e529bc80c9..4b72d3a790 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" RDEPENDS:${PN} = "eject" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb index 83b624f120..aa4265f7b0 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb @@ -14,6 +14,7 @@ SRC_URI[sha256sum] = "4dd7cb420860535e687f673c0b5c0274e0d2fb67181281d4b85be9197d EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" PACKAGECONFIG ??= " \ + notify \ ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ " PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb index b0dc8e1762..4a1ece8bef 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[sha256sum] = "934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" FILES:${PN} += "${datadir}/backgrounds" diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md index ab87637dfe..6c546794b7 100644 --- a/meta-raspberrypi/docs/extra-build-config.md +++ b/meta-raspberrypi/docs/extra-build-config.md @@ -278,6 +278,18 @@ the header extension should set the following in local.conf: ENABLE_DWC2_HOST = "1" +## Set CPUs to be isolated from the standard Linux scheduler + +By default Linux will use all available CPUs for scheduling tasks. For real time +purposes there can be an advantage to isolating one or more CPUs from the +standard scheduler. It should be noted that CPU 0 is special, it is the only CPU +available during the early stages of the boot process and cannot be isolated. + +The string assigned to this variable may be a single CPU number, a comma +separated list ("1,2"), a range("1-3"), or a mixture of these ("1,3-5") + + ISOLATED_CPUS = "1-2" + ## Enable Openlabs 802.15.4 radio module When using device tree kernels, set this variable to enable the 802.15.4 hat: @@ -290,13 +302,13 @@ See: In order to use CAN with an MCP2515-based module, set the following variables: - ENABLE_SPI_BUS = "1" - ENABLE_CAN = "1" + ENABLE_SPI_BUS = "1" + ENABLE_CAN = "1" In case of dual CAN module (e.g. PiCAN2 Duo), set following variables instead: ENABLE_SPI_BUS = "1" - ENABLE_DUAL_CAN = "1" + ENABLE_DUAL_CAN = "1" Some modules may require setting the frequency of the crystal oscillator used on the particular board. The frequency is usually marked on the package of the crystal. By default, it is set to 16 MHz. To change that to 8 MHz, the following variable also has to be set: @@ -388,3 +400,23 @@ You may need to adjust volume and toggle switches that are off by default ``` Audio capture on ReSpeaker 2 / 4 / 6 Mics Pi HAT from Seeed Studio is very noisy. + +## Support for RTC devices + +The RaspberryPi boards don't feature an RTC module and the machine +configurations provided in this BSP layer have this assumption (until, if at +all, some later boards will come with one). + +`rtc` is handled as a `MACHINE_FEATURES` in the context of the build system +which means that if an attached device is provided for which support is needed, +the recommended way forward is to write a new machine configuration based on an +existing one. Check the documentation for +`MACHINE_FEATURES_BACKFILL_CONSIDERED` for how this is disabled for the +relevant machines. + +Even when `MACHINE_FEATURES` is tweaked to include the needed `rtc` string, +make sure that your kernel configuration is supporting the attached device and +the device tree is properly tweaked. Also, mind the runtime components that +take advantage of your RTC device. You can do that by checking what is +included/configured in the build system based on the inclusion of `rtc` in +`MACHINE_FEATURES`. diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 50c2b53185..413ca4d527 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -29,6 +29,18 @@ CMDLINE_LOGO ?= '${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nol # to enable kernel debugging. CMDLINE_DEBUG ?= "" +# Add a request to isolate processors from the Linux scheduler. ISOLATED_CPUS +# may have the form of a comma separated list of processor numbers "0,1,3", a +# range "0-2", a combination of the two "0-1,3", or a single processor you may +# not specify ALL processors simultaneously +def setup_isolcpus(d): + string = "" + if d.getVar('ISOLATED_CPUS'): + string = 'isolcpus=' + d.getVar('ISOLATED_CPUS') + return string + +CMDLINE_ISOL_CPUS ?= "${@setup_isolcpus(d)}" + # Add RNDIS capabilities (must be after rootwait) # example: # CMDLINE_RNDIS = "modules-load=dwc2,g_ether g_ether.host_addr= Makefile.ffmpeg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile +--- a/Makefile ++++ b/Makefile @@ -2,9 +2,9 @@ CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST @@ -27,11 +25,11 @@ Index: git/Makefile +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -+INCLUDES+=-I./ -Ilinux ++INCLUDES+=-I./ -Ilinux -I./ffmpeg DIST ?= omxplayer-dist STRIP ?= strip -@@ -90,7 +90,7 @@ dist: omxplayer.bin omxplayer.1 +@@ -91,7 +91,7 @@ dist: omxplayer.bin omxplayer.1 cp COPYING $(DIST)/usr/share/doc/omxplayer cp README.md $(DIST)/usr/share/doc/omxplayer/README cp omxplayer.1 $(DIST)/usr/share/man/man1 @@ -40,10 +38,8 @@ Index: git/Makefile cd $(DIST); tar -czf ../$(DIST).tgz * install: -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg @@ -238,7 +238,8 @@ configure: --disable-decoder=xbin \ --disable-decoder=idf \ diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb index 25196929f5..c15b40b4af 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -7,7 +7,7 @@ SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=00a27da7ac0f9bcd17320ec29ef4bbf6" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" +DEPENDS = "alsa-lib libpcre virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" PR = "r5" diff --git a/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb b/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb index c1356f00ae..2ebe413942 100644 --- a/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb +++ b/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://opt/vc/LICENCE;md5=86e53f5f5909ee66900418028de11780" include recipes-bsp/common/raspberrypi-firmware.inc -S = "${WORKDIR}/firmware-${SRCREV}" +S = "${WORKDIR}/raspberrypi-firmware-1.${PV}" do_install(){ install -m 0755 -d ${D}${libdir} diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb index cf6d531e8f..965932395d 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/OpenSCAP/openscap-daemon.git;branch=master;protocol= file://0001-Renamed-module-and-variables-to-get-rid-of-async.patch \ " -inherit setuptools_build_meta +inherit python_setuptools_build_meta S = "${WORKDIR}/git" diff --git a/meta-security/recipes-ids/samhain/samhain.inc b/meta-security/recipes-ids/samhain/samhain.inc index 077e1181e4..5c1d6f57a7 100644 --- a/meta-security/recipes-ids/samhain/samhain.inc +++ b/meta-security/recipes-ids/samhain/samhain.inc @@ -1,9 +1,9 @@ DESCRIPTION = "Provides file integrity checking and log file monitoring/analysis" HOMEPAGE = "http://www.la-samhna.de/samhain/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "4.4.6" +PV = "4.4.7" SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://${INITSCRIPT_NAME}.init \ @@ -21,7 +21,7 @@ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://samhain-fix-initializer-element-is-not-constant.patch \ " -SRC_URI[sha256sum] = "0b511a184066759cd864f6d15fe941ed3fe60f0cdc886dab68daa191d567de24" +SRC_URI[sha256sum] = "0aa978accb635000c2d9170f307bff8a95836f8ec01615a53dbd9c2af9564d44" UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html" UPSTREAM_CHECK_REGEX = "samhain_signed-(?P(\d+(\.\d+)+))\.tar" diff --git a/meta-security/recipes-ids/suricata/suricata.inc b/meta-security/recipes-ids/suricata/suricata.inc index 5754617fbd..906423c15f 100644 --- a/meta-security/recipes-ids/suricata/suricata.inc +++ b/meta-security/recipes-ids/suricata/suricata.inc @@ -1,5 +1,5 @@ HOMEPAGE = "http://suricata-ids.org/" SECTION = "security Monitor/Admin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" COMPATIBLE_HOST:powerpc = 'null' diff --git a/meta-security/recipes-kernel/linux/files/lkrg.cfg b/meta-security/recipes-kernel/linux/files/lkrg.cfg new file mode 100644 index 0000000000..e02bf76174 --- /dev/null +++ b/meta-security/recipes-kernel/linux/files/lkrg.cfg @@ -0,0 +1,4 @@ +CONFIG_DEBUG_KERNEL=y +CONFIG_KALLSYMS_ALL=y +CONFIG_JUMP_LABEL=y +CONFIG_DEBUG_SECTION_MISMATCH=y diff --git a/meta-security/recipes-kernel/linux/files/lkrg.scc b/meta-security/recipes-kernel/linux/files/lkrg.scc new file mode 100644 index 0000000000..83397f8853 --- /dev/null +++ b/meta-security/recipes-kernel/linux/files/lkrg.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Support for LKRG" +define KFEATURE_COMPATIBILITY board + +kconf hardware lkrg.cfg diff --git a/meta-security/recipes-kernel/linux/linux-yocto_security.inc b/meta-security/recipes-kernel/linux/linux-yocto_security.inc index defca570cb..b79af808db 100644 --- a/meta-security/recipes-kernel/linux/linux-yocto_security.inc +++ b/meta-security/recipes-kernel/linux/linux-yocto_security.inc @@ -1,3 +1,6 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" KERNEL_FEATURES:append = " ${@bb.utils.contains("IMAGE_CLASSES", "dm-verity-img", " features/device-mapper/dm-verity.scc", "" ,d)}" +SRC_URI += " ${@bb.utils.contains("DISTRO_FEATURES", "lkrg", "file://lkrg.scc", "" ,d)}" diff --git a/meta-security/recipes-kernel/lkrg/files/makefile_cleanup.patch b/meta-security/recipes-kernel/lkrg/files/makefile_cleanup.patch index a4db2d99ba..799b1a60c5 100644 --- a/meta-security/recipes-kernel/lkrg/files/makefile_cleanup.patch +++ b/meta-security/recipes-kernel/lkrg/files/makefile_cleanup.patch @@ -4,10 +4,10 @@ This needs more work. Its my starting point. Signed-off-by: Armin Kuster -Index: lkrg-0.9.2/Makefile +Index: git/Makefile =================================================================== ---- lkrg-0.9.2.orig/Makefile -+++ lkrg-0.9.2/Makefile +--- git.orig/Makefile ++++ git/Makefile @@ -4,28 +4,10 @@ # Author: # - Adam 'pi3' Zabrocki (http://pi3.com.pl) diff --git a/meta-security/recipes-kernel/lkrg/lkrg-module_0.9.2.bb b/meta-security/recipes-kernel/lkrg/lkrg-module_0.9.2.bb index e055fbed11..85f7d44573 100644 --- a/meta-security/recipes-kernel/lkrg/lkrg-module_0.9.2.bb +++ b/meta-security/recipes-kernel/lkrg/lkrg-module_0.9.2.bb @@ -3,18 +3,18 @@ DESCRIPTION="LKRG performs runtime integrity checking of the Linux \ kernel and detection of security vulnerability exploits against the kernel." SECTION = "security" HOMEPAGE = "https://www.openwall.com/lkrg/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=5105ead24b08a32954f34cbaa7112432" DEPENDS = "virtual/kernel elfutils" -SRC_URI = "https://download.openwall.net/pub/projects/lkrg/lkrg-${PV}.tar.gz \ - file://makefile_cleanup.patch " +SRCREV = "43db5f19fca259feb1962f6db33382348cbc8320" -SRC_URI[sha256sum] = "c2b501c47089cce3ec3114cef6520b73aa3a098836183186b9bb5e097c99ac27" +SRC_URI = "git://github.com/lkrg-org/lkrg.git;protocol=https;branch=main \ + file://makefile_cleanup.patch " -S = "${WORKDIR}/lkrg-${PV}" +S = "${WORKDIR}/git" inherit module kernel-module-split diff --git a/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb b/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb index 5889a058e4..42c0b42d3f 100644 --- a/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb +++ b/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Libwhisker is a Perl module geared specificly for HTTP testing." SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=254b8e29606fce6d1c1a4c9e32354573" diff --git a/meta-security/recipes-scanners/clamav/clamav_0.104.0.bb b/meta-security/recipes-scanners/clamav/clamav_0.104.0.bb index f0889de4e0..3bcb5eb7a9 100644 --- a/meta-security/recipes-scanners/clamav/clamav_0.104.0.bb +++ b/meta-security/recipes-scanners/clamav/clamav_0.104.0.bb @@ -2,10 +2,12 @@ SUMMARY = "ClamAV anti-virus utility for Unix - command-line interface" DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats." HOMEPAGE = "http://www.clamav.net/index.html" SECTION = "security" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2 json-c libcheck" +COMPATIBLE_HOST:libc-musl:class-target = "null" + LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=2;endline=3;md5=f7029fbbc5898b273d5902896f7bbe17" # July 27th diff --git a/meta-security/recipes-security/bastille/bastille_3.2.1.bb b/meta-security/recipes-security/bastille/bastille_3.2.1.bb index 2d82983521..e7852d9f58 100644 --- a/meta-security/recipes-security/bastille/bastille_3.2.1.bb +++ b/meta-security/recipes-security/bastille/bastille_3.2.1.bb @@ -2,7 +2,7 @@ #consult the README file for the meta-security layer for additional information. SUMMARY = "Linux hardening tool" DESCRIPTION = "Bastille Linux is a Hardening and Reporting/Auditing Program which enhances the security of a Linux box, by configuring daemons, system settings and firewalling." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" # Bash is needed for set +o privileged (check busybox), might also need ncurses DEPENDS = "virtual/kernel" diff --git a/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb index 9aefc32cf2..5f8cf3c2e5 100644 --- a/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb +++ b/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb @@ -6,7 +6,7 @@ DESCRIPTION = "eCryptfs is a stacked cryptographic filesystem \ HOMEPAGE = "https://launchpad.net/ecryptfs" SECTION = "base" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "keyutils libgcrypt intltool-native glib-2.0-native" diff --git a/meta-security/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb b/meta-security/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb index 41187326db..96e17b77f5 100644 --- a/meta-security/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb +++ b/meta-security/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb @@ -9,6 +9,8 @@ HOMEPAGE = "http://www.fail2ban.org" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ecabc31e90311da843753ba772885d9f" +DEPENDS = "python3-native" + SRCREV ="4fe4ac8dde6ba14841da598ec37f8c6911fe0f64" SRC_URI = " git://github.com/fail2ban/fail2ban.git;branch=0.11;protocol=https \ file://initd \ @@ -21,6 +23,11 @@ S = "${WORKDIR}/git" do_compile () { cd ${S} + + #remove symlink to python3 + # otherwise 2to3 is run against it + rm -f bin/fail2ban-python + ./fail2ban-2to3 } diff --git a/meta-security/recipes-security/fscrypt/fscrypt_1.0.0.bb b/meta-security/recipes-security/fscrypt/fscrypt_1.0.0.bb index 66bf429a46..663d8e25d6 100644 --- a/meta-security/recipes-security/fscrypt/fscrypt_1.0.0.bb +++ b/meta-security/recipes-security/fscrypt/fscrypt_1.0.0.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854dd BBCLASSEXTEND = "native nativesdk" # fscrypt depends on go and libpam -DEPENDS += "go-dep-native libpam" +DEPENDS += "go-native libpam" SRCREV = "92b1e9a8670ccd3916a7d24a06cab1e4c9815bc4" SRC_URI = "git://github.com/google/fscrypt.git;branch=master;protocol=https" diff --git a/meta-security/recipes-security/libdhash/ding-libs_0.6.1.bb b/meta-security/recipes-security/libdhash/ding-libs_0.6.1.bb index 6046fa0b16..843850f6c4 100644 --- a/meta-security/recipes-security/libdhash/ding-libs_0.6.1.bb +++ b/meta-security/recipes-security/libdhash/ding-libs_0.6.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Dynamic hash table implementation" DESCRIPTION = "Dynamic hash table implementation" HOMEPAGE = "https://fedorahosted.org/released/ding-libs" SECTION = "base" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "https://fedorahosted.org/released/${BPN}/${BP}.tar.gz" diff --git a/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb b/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb index 9b34cb18ca..35c5ff81da 100644 --- a/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb +++ b/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb @@ -7,7 +7,7 @@ DESCRIPTION = "\ " HOMEPAGE = "http://mhash.sourceforge.net/" -LICENSE = "LGPLv2.0" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" S = "${WORKDIR}/mhash-${PV}" diff --git a/meta-security/recipes-security/nikto/nikto_2.1.6.bb b/meta-security/recipes-security/nikto/nikto_2.1.6.bb index 8542d69216..8c21b3072e 100644 --- a/meta-security/recipes-security/nikto/nikto_2.1.6.bb +++ b/meta-security/recipes-security/nikto/nikto_2.1.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Nikto is an Open Source web server scanner which performs compreh SECTION = "security" HOMEPAGE = "https://cirt.net/Nikto2" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "f1bbd1a8756c076c8fd4f4dd0bc34a8ef215ae79" diff --git a/meta-security/recipes-security/sssd/sssd_2.5.2.bb b/meta-security/recipes-security/sssd/sssd_2.5.2.bb index 8bc8787b88..9f1d627e1b 100644 --- a/meta-security/recipes-security/sssd/sssd_2.5.2.bb +++ b/meta-security/recipes-security/sssd/sssd_2.5.2.bb @@ -2,7 +2,7 @@ SUMMARY = "system security services daemon" DESCRIPTION = "SSSD is a system security services daemon" HOMEPAGE = "https://pagure.io/SSSD/sssd/" SECTION = "base" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "acl attr openldap cyrus-sasl libtdb ding-libs libpam c-ares krb5 autoconf-archive" diff --git a/poky/bitbake/lib/bb/cooker.py b/poky/bitbake/lib/bb/cooker.py index df4acca18a..08593d114a 100644 --- a/poky/bitbake/lib/bb/cooker.py +++ b/poky/bitbake/lib/bb/cooker.py @@ -169,27 +169,15 @@ class BBCooker: bb.debug(1, "BBCooker starting %s" % time.time()) sys.stdout.flush() - self.configwatcher = pyinotify.WatchManager() - bb.debug(1, "BBCooker pyinotify1 %s" % time.time()) - sys.stdout.flush() + self.configwatcher = None + self.confignotifier = None - self.configwatcher.bbseen = set() - self.configwatcher.bbwatchedfiles = set() - self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications) - bb.debug(1, "BBCooker pyinotify2 %s" % time.time()) - sys.stdout.flush() self.watchmask = pyinotify.IN_CLOSE_WRITE | pyinotify.IN_CREATE | pyinotify.IN_DELETE | \ pyinotify.IN_DELETE_SELF | pyinotify.IN_MODIFY | pyinotify.IN_MOVE_SELF | \ pyinotify.IN_MOVED_FROM | pyinotify.IN_MOVED_TO - self.watcher = pyinotify.WatchManager() - bb.debug(1, "BBCooker pyinotify3 %s" % time.time()) - sys.stdout.flush() - self.watcher.bbseen = set() - self.watcher.bbwatchedfiles = set() - self.notifier = pyinotify.Notifier(self.watcher, self.notifications) - bb.debug(1, "BBCooker pyinotify complete %s" % time.time()) - sys.stdout.flush() + self.watcher = None + self.notifier = None # If being called by something like tinfoil, we need to clean cached data # which may now be invalid @@ -240,9 +228,29 @@ class BBCooker: sys.stdout.flush() self.handlePRServ() + def setupConfigWatcher(self): + if self.configwatcher: + self.configwatcher.close() + self.confignotifier = None + self.configwatcher = None + self.configwatcher = pyinotify.WatchManager() + self.configwatcher.bbseen = set() + self.configwatcher.bbwatchedfiles = set() + self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications) + + def setupParserWatcher(self): + if self.watcher: + self.watcher.close() + self.notifier = None + self.watcher = None + self.watcher = pyinotify.WatchManager() + self.watcher.bbseen = set() + self.watcher.bbwatchedfiles = set() + self.notifier = pyinotify.Notifier(self.watcher, self.notifications) + def process_inotify_updates(self): for n in [self.confignotifier, self.notifier]: - if n.check_events(timeout=0): + if n and n.check_events(timeout=0): # read notified events and enqeue them n.read_events() n.process_events() @@ -262,10 +270,6 @@ class BBCooker: self.configwatcher.bbseen.remove(event.pathname) # Could remove all entries starting with the directory but for now... bb.parse.clear_cache() - if "IN_CREATE" in event.maskname: - self.add_filewatch([[event.pathname]], watcher=self.configwatcher, dirs=True) - elif "IN_DELETE" in event.maskname and event.pathname in self.configwatcher.bbseen: - self.configwatcher.bbseen.remove(event.pathname) if not event.pathname in self.inotify_modified_files: self.inotify_modified_files.append(event.pathname) self.baseconfig_valid = False @@ -285,10 +289,6 @@ class BBCooker: self.watcher.bbseen.remove(event.pathname) # Could remove all entries starting with the directory but for now... bb.parse.clear_cache() - if "IN_CREATE" in event.maskname: - self.add_filewatch([[event.pathname]], dirs=True) - elif "IN_DELETE" in event.maskname and event.pathname in self.watcher.bbseen: - self.watcher.bbseen.remove(event.pathname) if not event.pathname in self.inotify_modified_files: self.inotify_modified_files.append(event.pathname) self.parsecache_valid = False @@ -358,6 +358,8 @@ class BBCooker: if mod not in self.orig_sysmodules: del sys.modules[mod] + self.setupConfigWatcher() + # Need to preserve BB_CONSOLELOG over resets consolelog = None if hasattr(self, "data"): @@ -1639,6 +1641,8 @@ class BBCooker: self.updateCacheSync() if self.state != state.parsing and not self.parsecache_valid: + self.setupParserWatcher() + bb.parse.siggen.reset(self.data) self.parseConfiguration () if CookerFeatures.SEND_SANITYEVENTS in self.featureset: diff --git a/poky/bitbake/lib/bb/data.py b/poky/bitbake/lib/bb/data.py index 5d02bab99b..62ec214762 100644 --- a/poky/bitbake/lib/bb/data.py +++ b/poky/bitbake/lib/bb/data.py @@ -272,7 +272,7 @@ def update_data(d): """Performs final steps upon the datastore, including application of overrides""" d.finalize(parent = True) -def build_dependencies(key, keys, shelldeps, varflagsexcl, d): +def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d): deps = set() try: if key[-1] == ']': @@ -283,12 +283,15 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): return deps, value varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "exports", "postfuncs", "prefuncs", "lineno", "filename"]) or {} vardeps = varflags.get("vardeps") + exclusions = varflags.get("vardepsexclude", "").split() - def handle_contains(value, contains, d): + def handle_contains(value, contains, exclusions, d): newvalue = [] if value: newvalue.append(str(value)) for k in sorted(contains): + if k in exclusions or k in ignored_vars: + continue l = (d.getVar(k) or "").split() for item in sorted(contains[k]): for word in item.split(): @@ -316,7 +319,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): parser.parse_python(value, filename=varflags.get("filename"), lineno=varflags.get("lineno")) deps = deps | parser.references deps = deps | (keys & parser.execs) - value = handle_contains(value, parser.contains, d) + value = handle_contains(value, parser.contains, exclusions, d) else: value, parsedvar = d.getVarFlag(key, "_content", False, retparser=True) parser = bb.codeparser.ShellParser(key, logger) @@ -324,7 +327,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): deps = deps | shelldeps deps = deps | parsedvar.references deps = deps | (keys & parser.execs) | (keys & parsedvar.execs) - value = handle_contains(value, parsedvar.contains, d) + value = handle_contains(value, parsedvar.contains, exclusions, d) if hasattr(parsedvar, "removes"): value = handle_remove(value, deps, parsedvar.removes, d) if vardeps is None: @@ -339,7 +342,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): value, parser = d.getVarFlag(key, "_content", False, retparser=True) deps |= parser.references deps = deps | (keys & parser.execs) - value = handle_contains(value, parser.contains, d) + value = handle_contains(value, parser.contains, exclusions, d) if hasattr(parser, "removes"): value = handle_remove(value, deps, parser.removes, d) @@ -359,7 +362,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): deps |= set(varfdeps) deps |= set((vardeps or "").split()) - deps -= set(varflags.get("vardepsexclude", "").split()) + deps -= set(exclusions) except bb.parse.SkipRecipe: raise except Exception as e: @@ -380,7 +383,7 @@ def generate_dependencies(d, ignored_vars): tasklist = d.getVar('__BBTASKS', False) or [] for task in tasklist: - deps[task], values[task] = build_dependencies(task, keys, shelldeps, varflagsexcl, d) + deps[task], values[task] = build_dependencies(task, keys, shelldeps, varflagsexcl, ignored_vars, d) newdeps = deps[task] seen = set() while newdeps: @@ -389,7 +392,7 @@ def generate_dependencies(d, ignored_vars): newdeps = set() for dep in nextdeps: if dep not in deps: - deps[dep], values[dep] = build_dependencies(dep, keys, shelldeps, varflagsexcl, d) + deps[dep], values[dep] = build_dependencies(dep, keys, shelldeps, varflagsexcl, ignored_vars, d) newdeps |= deps[dep] newdeps -= seen #print "For %s: %s" % (task, str(deps[task])) diff --git a/poky/bitbake/lib/bb/parse/__init__.py b/poky/bitbake/lib/bb/parse/__init__.py index c01807ba87..347609513b 100644 --- a/poky/bitbake/lib/bb/parse/__init__.py +++ b/poky/bitbake/lib/bb/parse/__init__.py @@ -113,6 +113,8 @@ def init(fn, data): return h['init'](data) def init_parser(d): + if hasattr(bb.parse, "siggen"): + bb.parse.siggen.exit() bb.parse.siggen = bb.siggen.init(d) def resolve_file(fn, d): diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py index ce53fdc678..19ef83980f 100644 --- a/poky/bitbake/lib/bb/server/process.py +++ b/poky/bitbake/lib/bb/server/process.py @@ -28,6 +28,7 @@ import re import datetime import pickle import traceback +import gc import bb.server.xmlrpcserver from bb import daemonize from multiprocessing import queues @@ -739,8 +740,10 @@ class ConnectionWriter(object): self.event = self def _send(self, obj): + gc.disable() with self.wlock: self.writer.send_bytes(obj) + gc.enable() def send(self, obj): obj = multiprocessing.reduction.ForkingPickler.dumps(obj) diff --git a/poky/bitbake/lib/bb/tests/codeparser.py b/poky/bitbake/lib/bb/tests/codeparser.py index f485204791..71ed382ab8 100644 --- a/poky/bitbake/lib/bb/tests/codeparser.py +++ b/poky/bitbake/lib/bb/tests/codeparser.py @@ -318,7 +318,7 @@ d.getVar(a(), False) "filename": "example.bb", }) - deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d) + deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d) self.assertEqual(deps, set(["somevar", "bar", "something", "inexpand", "test", "test2", "a"])) @@ -365,7 +365,7 @@ esac self.d.setVarFlags("FOO", {"func": True}) self.setEmptyVars(execs) - deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d) + deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d) self.assertEqual(deps, set(["somevar", "inverted"] + execs)) @@ -375,7 +375,7 @@ esac self.d.setVar("FOO", "foo=oe_libinstall; eval $foo") self.d.setVarFlag("FOO", "vardeps", "oe_libinstall") - deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d) + deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d) self.assertEqual(deps, set(["oe_libinstall"])) @@ -384,7 +384,7 @@ esac self.d.setVar("FOO", "foo=oe_libinstall; eval $foo") self.d.setVarFlag("FOO", "vardeps", "${@'oe_libinstall'}") - deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d) + deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d) self.assertEqual(deps, set(["oe_libinstall"])) @@ -399,7 +399,7 @@ esac # Check dependencies self.d.setVar('ANOTHERVAR', expr) self.d.setVar('TESTVAR', 'anothervalue testval testval2') - deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), self.d) + deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(), self.d) self.assertEqual(sorted(values.splitlines()), sorted([expr, 'TESTVAR{anothervalue} = Set', @@ -412,6 +412,24 @@ esac # Check final value self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['anothervalue', 'yetanothervalue', 'lastone']) + def test_contains_vardeps_excluded(self): + # Check the ignored_vars option to build_dependencies is handled by contains functionality + varval = '${TESTVAR2} ${@bb.utils.filter("TESTVAR", "somevalue anothervalue", d)}' + self.d.setVar('ANOTHERVAR', varval) + self.d.setVar('TESTVAR', 'anothervalue testval testval2') + self.d.setVar('TESTVAR2', 'testval3') + deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(["TESTVAR"]), self.d) + self.assertEqual(sorted(values.splitlines()), sorted([varval])) + self.assertEqual(deps, set(["TESTVAR2"])) + self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['testval3', 'anothervalue']) + + # Check the vardepsexclude flag is handled by contains functionality + self.d.setVarFlag('ANOTHERVAR', 'vardepsexclude', 'TESTVAR') + deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(), self.d) + self.assertEqual(sorted(values.splitlines()), sorted([varval])) + self.assertEqual(deps, set(["TESTVAR2"])) + self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['testval3', 'anothervalue']) + #Currently no wildcard support #def test_vardeps_wildcards(self): # self.d.setVar("oe_libinstall", "echo test") diff --git a/poky/bitbake/lib/bb/ui/knotty.py b/poky/bitbake/lib/bb/ui/knotty.py index b2e7520ee7..3f410fd525 100644 --- a/poky/bitbake/lib/bb/ui/knotty.py +++ b/poky/bitbake/lib/bb/ui/knotty.py @@ -252,26 +252,26 @@ class TerminalFilter(object): return tasks = [] for t in runningpids: + start_time = activetasks[t].get("starttime", None) + if start_time: + msg = "%s - %s (pid %s)" % (activetasks[t]["title"], self.elapsed(currenttime - start_time), activetasks[t]["pid"]) + else: + msg = "%s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"]) progress = activetasks[t].get("progress", None) if progress is not None: pbar = activetasks[t].get("progressbar", None) rate = activetasks[t].get("rate", None) - start_time = activetasks[t].get("starttime", None) if not pbar or pbar.bouncing != (progress < 0): if progress < 0: - pbar = BBProgress("0: %s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"]), 100, widgets=[' ', progressbar.BouncingSlider(), ''], extrapos=3, resize_handler=self.sigwinch_handle) + pbar = BBProgress("0: %s" % msg, 100, widgets=[' ', progressbar.BouncingSlider(), ''], extrapos=3, resize_handler=self.sigwinch_handle) pbar.bouncing = True else: - pbar = BBProgress("0: %s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"]), 100, widgets=[' ', progressbar.Percentage(), ' ', progressbar.Bar(), ''], extrapos=5, resize_handler=self.sigwinch_handle) + pbar = BBProgress("0: %s" % msg, 100, widgets=[' ', progressbar.Percentage(), ' ', progressbar.Bar(), ''], extrapos=5, resize_handler=self.sigwinch_handle) pbar.bouncing = False activetasks[t]["progressbar"] = pbar - tasks.append((pbar, progress, rate, start_time)) + tasks.append((pbar, msg, progress, rate, start_time)) else: - start_time = activetasks[t].get("starttime", None) - if start_time: - tasks.append("%s - %s (pid %s)" % (activetasks[t]["title"], self.elapsed(currenttime - start_time), activetasks[t]["pid"])) - else: - tasks.append("%s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"])) + tasks.append(msg) if self.main.shutdown: content = pluralise("Waiting for %s running task to finish", @@ -308,12 +308,12 @@ class TerminalFilter(object): if not self.quiet: for tasknum, task in enumerate(tasks[:(self.rows - 1 - lines)]): if isinstance(task, tuple): - pbar, progress, rate, start_time = task + pbar, msg, progress, rate, start_time = task if not pbar.start_time: pbar.start(False) if start_time: pbar.start_time = start_time - pbar.setmessage('%s:%s' % (tasknum, pbar.msg.split(':', 1)[1])) + pbar.setmessage('%s: %s' % (tasknum, msg)) pbar.setextra(rate) if progress > -1: content = pbar.update(progress) diff --git a/poky/bitbake/lib/pyinotify.py b/poky/bitbake/lib/pyinotify.py index 8c94b3e334..5c9b6d0fe2 100644 --- a/poky/bitbake/lib/pyinotify.py +++ b/poky/bitbake/lib/pyinotify.py @@ -603,6 +603,17 @@ class _ProcessEvent: unknown event. """ stripped_mask = event.mask - (event.mask & IN_ISDIR) + # Bitbake hack - we see event masks of 0x6, IN_MODIFY & IN_ATTRIB + # The kernel inotify code can set more than one of the bits in the mask, + # fsnotify_change() in linux/fsnotify.h is quite clear that IN_ATTRIB, + # IN_MODIFY and IN_ACCESS can arrive together. + # This breaks the code below which assume only one mask bit is ever + # set in an event. We don't care about attrib or access in bitbake so drop those + if (stripped_mask & IN_MODIFY) and (stripped_mask & IN_ATTRIB): + stripped_mask = stripped_mask - (stripped_mask & IN_ATTRIB) + if (stripped_mask & IN_MODIFY) and (stripped_mask & IN_ACCESS): + stripped_mask = stripped_mask - (stripped_mask & IN_ACCESS) + maskname = EventsCodes.ALL_VALUES.get(stripped_mask) if maskname is None: raise ProcessEventError("Unknown mask 0x%08x" % stripped_mask) diff --git a/poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass index 0deebdb148..0bc6492c83 100644 --- a/poky/meta/classes/insane.bbclass +++ b/poky/meta/classes/insane.bbclass @@ -1117,6 +1117,7 @@ python do_package_qa () { # binutils is used for most checks, so need to set as dependency # POPULATESYSROOTDEPS is defined in staging class. do_package_qa[depends] += "${POPULATESYSROOTDEPS}" +do_package_qa[vardeps] = "${@bb.utils.contains('ERROR_QA', 'empty-dirs', 'QA_EMPTY_DIRS', '', d)}" do_package_qa[vardepsexclude] = "BB_TASKDEPDATA" do_package_qa[rdeptask] = "do_packagedata" addtask do_package_qa after do_packagedata do_package before do_build @@ -1182,9 +1183,9 @@ python do_qa_patch() { msg += " devtool modify %s\n" % d.getVar('PN') msg += " devtool finish --force-patch-refresh %s \n\n" % d.getVar('PN') msg += "Don't forget to review changes done by devtool!\n" - if 'patch-fuzz' in d.getVar('ERROR_QA'): + if bb.utils.filter('ERROR_QA', 'patch-fuzz', d): bb.error(msg) - elif 'patch-fuzz' in d.getVar('WARN_QA'): + elif bb.utils.filter('WARN_QA', 'patch-fuzz', d): bb.warn(msg) msg = "Patch log indicates that patches do not apply cleanly." oe.qa.handle_error("patch-fuzz", msg, d) diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index b3bbd3b276..7ca847f0a3 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -447,7 +447,6 @@ kernel_do_install() { # Install various kernel output (zImage, map file, config, module support files) # install -d ${D}/${KERNEL_IMAGEDEST} - install -d ${D}/boot # # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task @@ -465,10 +464,10 @@ kernel_do_install() { fi done - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} - install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} - install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} + install -m 0644 System.map ${D}/${KERNEL_IMAGEDEST}/System.map-${KERNEL_VERSION} + install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION} + install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION} install -d ${D}${sysconfdir}/modules-load.d install -d ${D}${sysconfdir}/modprobe.d } @@ -649,8 +648,8 @@ PACKAGES = "${KERNEL_PACKAGE_NAME} ${KERNEL_PACKAGE_NAME}-base ${KERNEL_PACKAGE_ FILES:${PN} = "" FILES:${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo" FILES:${KERNEL_PACKAGE_NAME}-image = "" -FILES:${KERNEL_PACKAGE_NAME}-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" -FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}" +FILES:${KERNEL_PACKAGE_NAME}-dev = "/${KERNEL_IMAGEDEST}/System.map* /${KERNEL_IMAGEDEST}/Module.symvers* /${KERNEL_IMAGEDEST}/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" +FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION_NAME}" FILES:${KERNEL_PACKAGE_NAME}-modules = "" RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV})" # Allow machines to override this dependency if kernel image files are @@ -712,7 +711,7 @@ python do_strip() { extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS') kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux" - if (extra_sections and kernel_image.find('boot/vmlinux') != -1): + if (extra_sections and kernel_image.find('${KERNEL_IMAGEDEST}/vmlinux') != -1): kernel_image_stripped = kernel_image + ".stripped" shutil.copy2(kernel_image, kernel_image_stripped) oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections)) diff --git a/poky/meta/classes/mirrors.bbclass b/poky/meta/classes/mirrors.bbclass index 37dc449ade..ffdccff5fb 100644 --- a/poky/meta/classes/mirrors.bbclass +++ b/poky/meta/classes/mirrors.bbclass @@ -76,3 +76,14 @@ git://git.gnome.org/.* git://gitlab.gnome.org/GNOME/PATH;protocol=https \ git://.*/.* git://HOST/PATH;protocol=https \ git://.*/.* git://HOST/git/PATH;protocol=https \ " + +# Switch glibc and binutils recipes to use shallow clones as they're large and this +# improves user experience whilst allowing the flexibility of git urls in the recipes +BB_GIT_SHALLOW:pn-binutils = "1" +BB_GIT_SHALLOW:pn-binutils-cross-${TARGET_ARCH} = "1" +BB_GIT_SHALLOW:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "1" +BB_GIT_SHALLOW:pn-binutils-cross-testsuite = "1" +BB_GIT_SHALLOW:pn-binutils-crosssdk-${SDK_SYS} = "1" +BB_GIT_SHALLOW:pn-glibc = "1" +PREMIRRORS += "git://sourceware.org/git/glibc.git https://downloads.yoctoproject.org/mirror/sources/ \ + git://sourceware.org/git/binutils-gdb.git https://downloads.yoctoproject.org/mirror/sources/" diff --git a/poky/meta/classes/uboot-sign.bbclass b/poky/meta/classes/uboot-sign.bbclass index 8d136e9405..4ca8118eb2 100644 --- a/poky/meta/classes/uboot-sign.bbclass +++ b/poky/meta/classes/uboot-sign.bbclass @@ -250,7 +250,7 @@ do_install:append() { [ -n "${UBOOT_DTB_BINARY}" ]; then install_helper fi - if [ "${SPL_SIGN_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then + if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then install_spl_helper fi done diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 7705415a4f..3fa2bee053 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -915,19 +915,6 @@ SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE').replace(' ', ';')}" NO_RECOMMENDATIONS ??= "" BAD_RECOMMENDATIONS ?= "" -# Make sure MACHINE isn't exported -# (breaks binutils at least) -MACHINE[unexport] = "1" - -# Make sure TARGET_ARCH isn't exported -# (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this -# in them, undocumented) -TARGET_ARCH[unexport] = "1" - -# Make sure DISTRO isn't exported -# (breaks sysvinit at least) -DISTRO[unexport] = "1" - # Make sure SHELL isn't exported # (can break any number of things if the user's shell isn't POSIX-compliant, # including the flock command). The user's shell shouldn't affect our builds. @@ -949,7 +936,7 @@ BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ STAMPS_DIR PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ - WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ + WARN_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES \ diff --git a/poky/meta/conf/distro/include/ptest-packagelists.inc b/poky/meta/conf/distro/include/ptest-packagelists.inc index ac3295d1aa..b51cce4d9e 100644 --- a/poky/meta/conf/distro/include/ptest-packagelists.inc +++ b/poky/meta/conf/distro/include/ptest-packagelists.inc @@ -48,6 +48,7 @@ PTESTS_FAST = "\ opkg-ptest \ pango-ptest \ parted-ptest \ + popt-ptest \ python3-atomicwrites-ptest \ python3-bcrypt-ptest \ python3-hypothesis-ptest \ diff --git a/poky/meta/lib/oe/gpg_sign.py b/poky/meta/lib/oe/gpg_sign.py index 1bce6cb792..aa9bb49f2c 100644 --- a/poky/meta/lib/oe/gpg_sign.py +++ b/poky/meta/lib/oe/gpg_sign.py @@ -58,7 +58,7 @@ class LocalSigner(object): for i in range(0, len(files), sign_chunk): subprocess.check_output(shlex.split(cmd + ' '.join(files[i:i+sign_chunk])), stderr=subprocess.STDOUT) - def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None, armor=True): + def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None, armor=True, output_suffix=None, use_sha256=False): """Create a detached signature of a file""" if passphrase_file and passphrase: @@ -71,6 +71,10 @@ class LocalSigner(object): cmd += ['--homedir', self.gpg_path] if armor: cmd += ['--armor'] + if output_suffix: + cmd += ['-o', input_file + "." + output_suffix] + if use_sha256: + cmd += ['--digest-algo', "SHA256"] #gpg > 2.1 supports password pipes only through the loopback interface #gpg < 2.1 errors out if given unknown parameters diff --git a/poky/meta/lib/oe/package_manager/deb/__init__.py b/poky/meta/lib/oe/package_manager/deb/__init__.py index 9f112ae25b..86ddb130ad 100644 --- a/poky/meta/lib/oe/package_manager/deb/__init__.py +++ b/poky/meta/lib/oe/package_manager/deb/__init__.py @@ -53,6 +53,7 @@ class DpkgIndexer(Indexer): index_cmds = [] deb_dirs_found = False + index_sign_files = set() for arch in arch_list: arch_dir = os.path.join(self.deploy_dir, arch) if not os.path.isdir(arch_dir): @@ -62,7 +63,10 @@ class DpkgIndexer(Indexer): cmd += "%s -fcn Packages > Packages.gz;" % gzip - with open(os.path.join(arch_dir, "Release"), "w+") as release: + release_file = os.path.join(arch_dir, "Release") + index_sign_files.add(release_file) + + with open(release_file, "w+") as release: release.write("Label: %s\n" % arch) cmd += "PSEUDO_UNLOAD=1 %s release . >> Release" % apt_ftparchive @@ -76,8 +80,17 @@ class DpkgIndexer(Indexer): return oe.utils.multiprocess_launch(create_index, index_cmds, self.d) - if self.d.getVar('PACKAGE_FEED_SIGN') == '1': - raise NotImplementedError('Package feed signing not implementd for dpkg') + if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': + signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) + else: + signer = None + if signer: + for f in index_sign_files: + signer.detach_sign(f, + self.d.getVar('PACKAGE_FEED_GPG_NAME', True), + self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), + output_suffix="gpg", + use_sha256=True) class PMPkgsList(PkgsList): diff --git a/poky/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch b/poky/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch new file mode 100644 index 0000000000..354f83a4a5 --- /dev/null +++ b/poky/meta/recipes-core/busybox/busybox/0001-depmod-Ignore-.debug-directories.patch @@ -0,0 +1,32 @@ +From 5f6ed003f10ee0bd4a508d5f59129a29f0920dfc Mon Sep 17 00:00:00 2001 +From: Saul Wold +Date: Thu, 31 Mar 2022 11:21:45 -0700 +Subject: [PATCH] depmod: Ignore .debug directories + +The .debug/.ko files do not have the correct symbol information +since it's split away from the actual .ko file. Just ignore it. + +Upstream-Status: Pending + +Signed-off-by: Saul Wold +--- + modutils/depmod.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/modutils/depmod.c b/modutils/depmod.c +index bb42bbe..aa5a2de 100644 +--- a/modutils/depmod.c ++++ b/modutils/depmod.c +@@ -43,6 +43,9 @@ static int FAST_FUNC parse_module(struct recursive_state *state, + /* Arbitrary. Was sb->st_size, but that breaks .gz etc */ + size_t len = (64*1024*1024 - 4096); + ++ if (strstr(fname, ".debug") == NULL) ++ return TRUE; ++ + if (strrstr(fname, ".ko") == NULL) + return TRUE; + +-- +2.31.1 + diff --git a/poky/meta/recipes-core/busybox/busybox_1.35.0.bb b/poky/meta/recipes-core/busybox/busybox_1.35.0.bb index 7ce1717046..ab11f3d89a 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.35.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.35.0.bb @@ -1,6 +1,7 @@ require busybox.inc SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + file://0001-depmod-Ignore-.debug-directories.patch \ file://busybox-udhcpc-no_deconfig.patch \ file://find-touchscreen.sh \ file://busybox-cron \ diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch new file mode 100644 index 0000000000..4842f462e1 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch @@ -0,0 +1,64 @@ +From 44b4bcd56d7ac2bd8ebf00e9fa433ad897d68216 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Fri, 1 Apr 2022 13:44:45 +0100 +Subject: [PATCH 1/2] tests: Add C++ tests for typechecking with atomic compare + and exchanges + +Signed-off-by: Philip Withnall + +Helps: #2625 +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578] +Signed-off-by: Khem Raj +--- + glib/tests/cxx.cpp | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp +index be0a6bfa1..7d7f27c91 100644 +--- a/glib/tests/cxx.cpp ++++ b/glib/tests/cxx.cpp +@@ -53,6 +53,32 @@ test_typeof (void) + #endif + } + ++static void ++test_atomic_pointer_compare_and_exchange (void) ++{ ++ const gchar *str1 = "str1"; ++ const gchar *str2 = "str2"; ++ const gchar *atomic_string = str1; ++ ++ g_test_message ("Test that g_atomic_pointer_compare_and_exchange() with a " ++ "non-void* pointer doesn’t have any compiler warnings in C++ mode"); ++ ++ g_assert_true (g_atomic_pointer_compare_and_exchange (&atomic_string, str1, str2)); ++ g_assert_true (atomic_string == str2); ++} ++ ++static void ++test_atomic_int_compare_and_exchange (void) ++{ ++ gint atomic_int = 5; ++ ++ g_test_message ("Test that g_atomic_int_compare_and_exchange() doesn’t have " ++ "any compiler warnings in C++ mode"); ++ ++ g_assert_true (g_atomic_int_compare_and_exchange (&atomic_int, 5, 50)); ++ g_assert_cmpint (atomic_int, ==, 50); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -63,6 +89,8 @@ main (int argc, char *argv[]) + #endif + + g_test_add_func ("/C++/typeof", test_typeof); ++ g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); ++ g_test_add_func ("/C++/atomic-int-compare-and-exchange", test_atomic_int_compare_and_exchange); + + return g_test_run (); + } +-- +2.35.1 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch new file mode 100644 index 0000000000..a07f94672f --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch @@ -0,0 +1,70 @@ +From 2668390454bc0efe52a262eb2faa4a2bd5a062e2 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Fri, 1 Apr 2022 13:47:19 +0100 +Subject: [PATCH 2/2] gatomic: Add a C++ variant of + g_atomic_int_compare_and_exchange() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The C++ variant implements type safety differently, to avoid warnings +from C++ compilers about: +``` +../../../gnome-commander-1.14.2/src/intviewer/searcher.cc:303:5: error: cannot initialize a parameter of type 'gint *' (aka 'int *') with an rvalue of type 'void *' + g_atomic_int_compare_and_exchange ((gint*)&src->priv->progress_value, oldval, (gint)d); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/gnome-commander/1.14.2-r0/recipe-sysroot/usr/include/glib-2.0/glib/gatomic.h:160:44: note: expanded from macro 'g_atomic_int_compare_and_exchange' + __atomic_compare_exchange_n ((atomic), (void *) (&(gaicae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +``` + +This complements the existing C++ variant for +`g_atomic_pointer_compare_and_exchange()`, and fixes a regression on C++ +from https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2114. + +With the addition of the unit tests in the previous commit, this is +effectively tested by the FreeBSD and macOS CI jobs, as they use +`clang++` in C++ mode. `g++` doesn’t seem to emit a warning about this. + +Signed-off-by: Philip Withnall + +Fixes: #2625 +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578] +Signed-off-by: Khem Raj +--- + glib/gatomic.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/glib/gatomic.h b/glib/gatomic.h +index 5eba1dbc7..8b2b880c8 100644 +--- a/glib/gatomic.h ++++ b/glib/gatomic.h +@@ -152,6 +152,17 @@ G_END_DECLS + (void) (0 ? *(atomic) ^ *(atomic) : 1); \ + __atomic_fetch_sub ((atomic), 1, __ATOMIC_SEQ_CST) == 1; \ + })) ++#if defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L ++/* See comments below about equivalent g_atomic_pointer_compare_and_exchange() ++ * shenanigans for type-safety when compiling in C++ mode. */ ++#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ ++ (G_GNUC_EXTENSION ({ \ ++ glib_typeof (*(atomic)) gaicae_oldval = (oldval); \ ++ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ ++ (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ ++ __atomic_compare_exchange_n ((atomic), &gaicae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ ++ })) ++#else /* if !(defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L) */ + #define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ + (G_GNUC_EXTENSION ({ \ + gint gaicae_oldval = (oldval); \ +@@ -159,6 +170,7 @@ G_END_DECLS + (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ + __atomic_compare_exchange_n ((atomic), (void *) (&(gaicae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ + })) ++#endif /* defined(glib_typeof) */ + #define g_atomic_int_add(atomic, val) \ + (G_GNUC_EXTENSION ({ \ + G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ +-- +2.35.1 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb index 8b7016ec0f..62479e3c3f 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb @@ -16,6 +16,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ + file://0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch \ + file://0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 73fdd5c791..703e721a2b 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "0d518533e2794586234e69c80b65ca453b1b33b9" +SRCREV ?= "0b4231b597618e18668b8340f4209cd364b2b2d0" SRC_URI = "git://git.yoctoproject.org/poky;branch=master \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/poky/meta/recipes-core/os-release/os-release.bb b/poky/meta/recipes-core/os-release/os-release.bb index 637d059e8b..caa2ed25aa 100644 --- a/poky/meta/recipes-core/os-release/os-release.bb +++ b/poky/meta/recipes-core/os-release/os-release.bb @@ -50,6 +50,11 @@ do_install () { install -d ${D}${nonarch_libdir} ${D}${sysconfdir} install -m 0644 os-release ${D}${nonarch_libdir}/ ln -rs ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release + ln -rs ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/initrd-release } -FILES:${PN} += "${nonarch_libdir}/os-release" +FILES:${PN} = "${sysconfdir}/os-release ${nonarch_libdir}/os-release" + +PACKAGES += "${PN}-initrd" +FILES:${PN}-initrd = "${sysconfdir}/initrd-release" +RDEPENDS:${PN}-initrd += "${PN}" diff --git a/poky/meta/recipes-devtools/gcc/gcc-11.2.inc b/poky/meta/recipes-devtools/gcc/gcc-11.2.inc index 2394c86e29..68e0d203fc 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-11.2.inc @@ -68,6 +68,7 @@ SRC_URI = "\ file://0003-CVE-2021-42574.patch \ file://0004-CVE-2021-42574.patch \ file://0001-CVE-2021-46195.patch \ + file://0042-Fix-thread-stack-size-init.patch \ " SRC_URI[sha256sum] = "d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b" diff --git a/poky/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch b/poky/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch new file mode 100644 index 0000000000..3fb9ee98de --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc/0042-Fix-thread-stack-size-init.patch @@ -0,0 +1,23 @@ +The patch is needed in order to support recent glibc (2.34). + +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=91f8a7a34cf29ae7c465603a801326767f1cc7e9] + +Signed-off-by: Richard Purdie + +--- +--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp 2022-03-15 07:59:54.515325204 -0700 ++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp 2022-03-15 08:01:45.919405931 -0700 +@@ -166,9 +166,10 @@ + #if !SANITIZER_GO + // TODO(glider): different tools may require different altstack size. + static uptr GetAltStackSize() { +- // SIGSTKSZ is not enough. +- static const uptr kAltStackSize = SIGSTKSZ * 4; +- return kAltStackSize; ++ // Note: since GLIBC_2.31, SIGSTKSZ may be a function call, so this may be ++ // more costly that you think. However GetAltStackSize is only call 2-3 times ++ // per thread so don't cache the evaluation. ++ return SIGSTKSZ * 4; + } + + void SetAlternateSignalStack() { diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index d20136aef9..e7ef6a730c 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -13,7 +13,7 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "df1d1321fb093283485c387e3c933d2d264e509c" +SRCREV = "2b4b88eb513335b0ece55fe51854693d9b20de35" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/python/python3-jinja2_3.1.1.bb b/poky/meta/recipes-devtools/python/python3-jinja2_3.1.1.bb index 0a2bcd71f5..c38686a5c2 100644 --- a/poky/meta/recipes-devtools/python/python3-jinja2_3.1.1.bb +++ b/poky/meta/recipes-devtools/python/python3-jinja2_3.1.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python." -HOMEPAGE = "https://pypi.org/project/Jinja/" +HOMEPAGE = "https://pypi.org/project/Jinja2/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc index 43d14d7f12..cdd1a2ac3c 100644 --- a/poky/meta/recipes-extended/timezone/timezone.inc +++ b/poky/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2021e" +PV = "2022a" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -14,6 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775" -SRC_URI[tzdata.sha256sum] = "07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1" +SRC_URI[tzcode.sha256sum] = "f8575e7e33be9ee265df2081092526b81c80abac3f4a04399ae9d4d91cdadac7" +SRC_URI[tzdata.sha256sum] = "ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664" diff --git a/poky/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch b/poky/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch new file mode 100644 index 0000000000..6ba2b879a3 --- /dev/null +++ b/poky/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch @@ -0,0 +1,67 @@ +From 731d698377dbd1f5b1b90efeb8094602ed59fc40 Mon Sep 17 00:00:00 2001 +From: Nils Bars +Date: Mon, 17 Jan 2022 16:53:16 +0000 +Subject: [PATCH] Fix null pointer dereference and use of uninitialized data + +This fixes a bug that causes use of uninitialized heap data if `readbuf` fails +to read as many bytes as indicated by the extra field length attribute. +Furthermore, this fixes a null pointer dereference if an archive contains an +`EF_UNIPATH` extra field but does not have a filename set. +--- + fileio.c | 5 ++++- + process.c | 6 +++++- + 2 files changed, 9 insertions(+), 2 deletions(-) +--- + +Patch from: +https://bugs.launchpad.net/ubuntu/+source/unzip/+bug/1957077 +https://launchpadlibrarian.net/580782282/0001-Fix-null-pointer-dereference-and-use-of-uninitialized-data.patch +Regenerated to apply without offsets. + +CVE: CVE-2021-4217 + +Upstream-Status: Pending [infozip upstream inactive] + +Signed-off-by: Joe Slater + + +diff --git a/fileio.c b/fileio.c +index 14460f3..1dc319e 100644 +--- a/fileio.c ++++ b/fileio.c +@@ -2301,8 +2301,11 @@ int do_string(__G__ length, option) /* return PK-type error code */ + seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes + + (G.inptr-G.inbuf) + length); + } else { +- if (readbuf(__G__ (char *)G.extra_field, length) == 0) ++ unsigned bytes_read = readbuf(__G__ (char *)G.extra_field, length); ++ if (bytes_read == 0) + return PK_EOF; ++ if (bytes_read != length) ++ return PK_ERR; + /* Looks like here is where extra fields are read */ + if (getZip64Data(__G__ G.extra_field, length) != PK_COOL) + { +diff --git a/process.c b/process.c +index 5f8f6c6..de843a5 100644 +--- a/process.c ++++ b/process.c +@@ -2058,10 +2058,14 @@ int getUnicodeData(__G__ ef_buf, ef_len) + G.unipath_checksum = makelong(offset + ef_buf); + offset += 4; + ++ if (!G.filename_full) { ++ /* Check if we have a unicode extra section but no filename set */ ++ return PK_ERR; ++ } ++ + /* + * Compute 32-bit crc + */ +- + chksum = crc32(chksum, (uch *)(G.filename_full), + strlen(G.filename_full)); + +-- +2.32.0 + diff --git a/poky/meta/recipes-extended/unzip/unzip_6.0.bb b/poky/meta/recipes-extended/unzip/unzip_6.0.bb index af94a39195..c222a684b4 100644 --- a/poky/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/poky/meta/recipes-extended/unzip/unzip_6.0.bb @@ -28,6 +28,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://CVE-2019-13232_p3.patch \ file://unzip_optimization.patch \ file://0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch \ + file://CVE-2021-4217.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch b/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch new file mode 100644 index 0000000000..214664f621 --- /dev/null +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch @@ -0,0 +1,38 @@ +From 50c691e83f81b235bb96ef996dd4568ffaae256f Mon Sep 17 00:00:00 2001 +From: Carlos Rafael Giani +Date: Fri, 18 Mar 2022 12:06:23 +0100 +Subject: [PATCH] Disable libunwind in native OE builds by not looking for + libunwind + +This is a workaround for this build error: + +| -- Checking for one of the modules 'libunwind' +| CMake Error at [...]/build/tmp/work/x86_64-linux/libsdl2-native/2.0.20-r0/recipe-sysroot-native/usr/share/cmake-3.22/Modules/FindPkgConfig.cmake:890 (message): +| None of the required 'libunwind' found +| Call Stack (most recent call first): +| CMakeLists.txt:1367 (pkg_search_module) + +By not looking for the libunwind header, the rest of the libunwind +specific bits in the CMake build script are disabled. + +Upstream-Status: Inappropriate [OE specific] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 64f9fbf..12a4d8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -862,7 +862,7 @@ if(SDL_LIBC) + check_include_file(sys/types.h HAVE_SYS_TYPES_H) + foreach(_HEADER + stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h limits.h float.h +- strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h libunwind.h) ++ strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h) + string(TOUPPER "HAVE_${_HEADER}" _UPPER) + string(REPLACE "." "_" _HAVE_H ${_UPPER}) + check_include_file("${_HEADER}" ${_HAVE_H}) +-- +2.32.0 + diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb index 58bc94cc86..4ba22c1fe6 100644 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://optional-libunwind-generic.patch \ file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \ " +SRC_URI:append:class-native = " file://0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch" S = "${WORKDIR}/SDL2-${PV}" diff --git a/poky/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/poky/meta/recipes-graphics/waffle/waffle_1.7.0.bb index b931515700..f1fd9e7630 100644 --- a/poky/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/poky/meta/recipes-graphics/waffle/waffle_1.7.0.bb @@ -23,7 +23,8 @@ DEPENDS:append = " python3 cmake-native" # stack. PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ - surfaceless-egl gbm" + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gbm surfaceless-egl', '', d)} \ +" # virtual/libgl requires opengl in DISTRO_FEATURES. REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" diff --git a/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb index 04fc14a6d2..303026ad78 100644 --- a/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +++ b/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb @@ -30,11 +30,16 @@ if [ -r "${PKGDATA_DIR}/kernel-depmod/kernel-abiversion" ]; then kernelabi=\$(cat "${PKGDATA_DIR}/kernel-depmod/kernel-abiversion") fi +if [ ! -e "\$3${nonarch_base_libdir}/depmod.d/exclude.conf" ]; then + mkdir -p "\$3${nonarch_base_libdir}/depmod.d" + echo "exclude .debug" > "\$3${nonarch_base_libdir}/depmod.d/exclude.conf" +fi + if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ] || [ "\$kernelabi" != "\$4" ]; then echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2 - exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" "\$4" + exec env depmod -C "\$3${nonarch_base_libdir}/depmod.d" "\$1" "\$2" "\$3" "\$4" else - exec env depmod -C "\$3${sysconfdir}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" + exec env depmod -C "\$3${nonarch_base_libdir}/depmod.d" "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" fi EOF chmod +x ${D}${bindir_crossscripts}/depmodwrapper diff --git a/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch b/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch new file mode 100644 index 0000000000..ea0570af2b --- /dev/null +++ b/poky/meta/recipes-kernel/kmod/kmod/0001-depmod-Add-support-for-excluding-a-directory.patch @@ -0,0 +1,172 @@ +From f50e2d67575ac5f256fb853ca9d29aeac92d9a57 Mon Sep 17 00:00:00 2001 +From: Saul Wold +Date: Thu, 31 Mar 2022 14:56:28 -0700 +Subject: [PATCH] depmod: Add support for excluding a directory + +This adds support to depmod to enable a new exclude directive in +the depmod.d/*.conf configuration file. Currently depmod +already excludes directories named source or build. This change +will allow additional directories like .debug to be excluded also +via a new exclude directive. + +depmod.d/exclude.conf example: +exclude .debug + +Upstream-Status: Accepted + +Signed-off-by: Saul Wold +[ Fix warnings and make should_exclude_dir() return bool ] +Signed-off-by: Lucas De Marchi +--- + man/depmod.d.xml | 14 ++++++++++ + tools/depmod.c | 66 +++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 76 insertions(+), 4 deletions(-) + +diff --git a/man/depmod.d.xml b/man/depmod.d.xml +index b315e93..76548e9 100644 +--- a/man/depmod.d.xml ++++ b/man/depmod.d.xml +@@ -131,6 +131,20 @@ + + + ++ ++ exclude excludedir ++ ++ ++ ++ This specifies the trailing directories that will be excluded ++ during the search for kernel modules. ++ ++ ++ The excludedir is the trailing directory ++ to exclude ++ ++ ++ + + + +diff --git a/tools/depmod.c b/tools/depmod.c +index 07a35ba..4117dd1 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -458,6 +458,11 @@ struct cfg_external { + char path[]; + }; + ++struct cfg_exclude { ++ struct cfg_exclude *next; ++ char exclude_dir[]; ++}; ++ + struct cfg { + const char *kversion; + char dirname[PATH_MAX]; +@@ -469,6 +474,7 @@ struct cfg { + struct cfg_override *overrides; + struct cfg_search *searches; + struct cfg_external *externals; ++ struct cfg_exclude *excludes; + }; + + static enum search_type cfg_define_search_type(const char *path) +@@ -580,6 +586,30 @@ static void cfg_external_free(struct cfg_external *ext) + free(ext); + } + ++static int cfg_exclude_add(struct cfg *cfg, const char *path) ++{ ++ struct cfg_exclude *exc; ++ size_t len = strlen(path); ++ ++ exc = malloc(sizeof(struct cfg_exclude) + len + 1); ++ if (exc == NULL) { ++ ERR("exclude add: out of memory\n"); ++ return -ENOMEM; ++ } ++ memcpy(exc->exclude_dir, path, len + 1); ++ ++ DBG("exclude add: %s\n", path); ++ ++ exc->next = cfg->excludes; ++ cfg->excludes = exc; ++ return 0; ++} ++ ++static void cfg_exclude_free(struct cfg_exclude *exc) ++{ ++ free(exc); ++} ++ + static int cfg_kernel_matches(const struct cfg *cfg, const char *pattern) + { + regex_t re; +@@ -657,6 +687,11 @@ static int cfg_file_parse(struct cfg *cfg, const char *filename) + } + + cfg_external_add(cfg, dir); ++ } else if (streq(cmd, "exclude")) { ++ const char *sp; ++ while ((sp = strtok_r(NULL, "\t ", &saveptr)) != NULL) { ++ cfg_exclude_add(cfg, sp); ++ } + } else if (streq(cmd, "include") + || streq(cmd, "make_map_files")) { + INF("%s:%u: command %s not implemented yet\n", +@@ -857,6 +892,12 @@ static void cfg_free(struct cfg *cfg) + cfg->externals = cfg->externals->next; + cfg_external_free(tmp); + } ++ ++ while (cfg->excludes) { ++ struct cfg_exclude *tmp = cfg->excludes; ++ cfg->excludes = cfg->excludes->next; ++ cfg_exclude_free(tmp); ++ } + } + + +@@ -1229,6 +1270,25 @@ add: + return 0; + } + ++static bool should_exclude_dir(const struct cfg *cfg, const char *name) ++{ ++ struct cfg_exclude *exc; ++ ++ if (name[0] == '.' && (name[1] == '\0' || ++ (name[1] == '.' && name[2] == '\0'))) ++ return true; ++ ++ if (streq(name, "build") || streq(name, "source")) ++ return true; ++ ++ for (exc = cfg->excludes; exc != NULL; exc = exc->next) { ++ if (streq(name, exc->exclude_dir)) ++ return true; ++ } ++ ++ return false; ++} ++ + static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t baselen, struct scratchbuf *s_path) + { + struct dirent *de; +@@ -1240,11 +1300,9 @@ static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t basel + size_t namelen; + uint8_t is_dir; + +- if (name[0] == '.' && (name[1] == '\0' || +- (name[1] == '.' && name[2] == '\0'))) +- continue; +- if (streq(name, "build") || streq(name, "source")) ++ if (should_exclude_dir(depmod->cfg, name)) + continue; ++ + namelen = strlen(name); + if (scratchbuf_alloc(s_path, baselen + namelen + 2) < 0) { + err = -ENOMEM; +-- +2.31.1 + diff --git a/poky/meta/recipes-kernel/kmod/kmod_29.bb b/poky/meta/recipes-kernel/kmod/kmod_29.bb index 91951edde1..9b66349066 100644 --- a/poky/meta/recipes-kernel/kmod/kmod_29.bb +++ b/poky/meta/recipes-kernel/kmod/kmod_29.bb @@ -20,6 +20,7 @@ SRCREV = "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \ file://depmod-search.conf \ file://avoid_parallel_tests.patch \ + file://0001-depmod-Add-support-for-excluding-a-directory.patch \ " S = "${WORKDIR}/git" @@ -64,6 +65,9 @@ do_install:append () { # install depmod.d file for search/ dir install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" + + # Add .debug to the exclude path for depmod + echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf } ALTERNATIVE_PRIORITY = "70" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index a8b6aa203d..3ff54b9ebb 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7f96d3fd60eea0ab38afdf07b3fc7c8c9f501802" -SRCREV_meta ?= "24ab54209a8822aad92afe2c51ea5b95f5175394" +SRCREV_machine ?= "40a6731993d406d6c9fed43cb20c6a4f178ff2cc" +SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.107" +LINUX_VERSION ?= "5.10.109" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 8edafbcc4e..87ccfc1f45 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "593f500eff5997a184c8d3836e1e26b199af994f" -SRCREV_meta ?= "fee71fc34f2e551ebfd7bf0996d82f3447787e7a" +SRCREV_machine ?= "29d051cc421a76432897019edc33edae35b16e39" +SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.30" +LINUX_VERSION ?= "5.15.32" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 758260c3d8..bbaa0ebc00 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.107" +LINUX_VERSION ?= "5.10.109" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine:qemuarm ?= "d47f1b40f2f77d0c810defd853c69eb39cb84bf5" -SRCREV_machine ?= "1ae0844c6a36151066744e43fd30db3a946bc21d" -SRCREV_meta ?= "24ab54209a8822aad92afe2c51ea5b95f5175394" +SRCREV_machine:qemuarm ?= "9524d0ca0feeeb4cb698e3c984f4391ccb4b8e19" +SRCREV_machine ?= "bccf3a5f14511fb8ce6a9dd990216508d2c2ec6e" +SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 01c59a1ffc..d8ce5dc518 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.30" +LINUX_VERSION ?= "5.15.32" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine:qemuarm ?= "0c05aecb4a6a902d8b44b69f887dd991e091b234" -SRCREV_machine ?= "94c4403d43f8d4a4fa330d9342350b02426696d4" -SRCREV_meta ?= "fee71fc34f2e551ebfd7bf0996d82f3447787e7a" +SRCREV_machine:qemuarm ?= "cc9e92e826af229b841fcaf8c645e638a86eba43" +SRCREV_machine ?= "c3d54a67cbf3fb8e6df2d88c80e9d2c74f69aba4" +SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 9c1bd26b36..0cf14b748f 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" KBRANCH:qemux86-64 ?= "v5.10/standard/base" KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "2ef8231651bb6a4c79b307f59a794b92238546ec" -SRCREV_machine:qemuarm64 ?= "00684b441f15d202c5849eed164a9b3b94a5c1e8" -SRCREV_machine:qemumips ?= "661a4f517906253e074fe301d68ff1e6b6968e9f" -SRCREV_machine:qemuppc ?= "bff933cb7a11019c64e6034c48ab79453f75b99e" -SRCREV_machine:qemuriscv64 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" -SRCREV_machine:qemuriscv32 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" -SRCREV_machine:qemux86 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" -SRCREV_machine:qemux86-64 ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" -SRCREV_machine:qemumips64 ?= "7a89b456542ff1fa0ab71fa4a2ae6f04281f3a2d" -SRCREV_machine ?= "763c0dbc0458ebcb1d06afe2f324925f0f61bd27" -SRCREV_meta ?= "24ab54209a8822aad92afe2c51ea5b95f5175394" +SRCREV_machine:qemuarm ?= "dfeff112cafaf3a04da6cd60301d297406e1b77f" +SRCREV_machine:qemuarm64 ?= "3641e4234255c71c33cb2d9422f54c17b70c8941" +SRCREV_machine:qemumips ?= "7eead19134a43cf9ccc0fa9d75c45be2a7743f13" +SRCREV_machine:qemuppc ?= "6e1d66b2a871be0450722a50fc087ff8ccbcddd7" +SRCREV_machine:qemuriscv64 ?= "d2f7a595bf0b752275d503046494b668549cb151" +SRCREV_machine:qemuriscv32 ?= "d2f7a595bf0b752275d503046494b668549cb151" +SRCREV_machine:qemux86 ?= "d2f7a595bf0b752275d503046494b668549cb151" +SRCREV_machine:qemux86-64 ?= "d2f7a595bf0b752275d503046494b668549cb151" +SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab" +SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151" +SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE:qemuarm ?= "qemuarma15" @@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.107" +LINUX_VERSION ?= "5.10.109" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb index de71d1fe13..54157fd245 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "4632211e5b019b6337536305bfce0a5ffd3b570b" -SRCREV_machine:qemuarm64 ?= "c88fcdb0b3ca81f0149309ed7025cb28f709ed3d" -SRCREV_machine:qemumips ?= "ad268b2a1d6d1d6f1c9e9103cf4b1519477feb39" -SRCREV_machine:qemuppc ?= "688bb26b6f83a60ec39a0f20f31ec2bc37b49c6f" -SRCREV_machine:qemuriscv64 ?= "70cf8dde55448a804da825139fa12daf5a855047" -SRCREV_machine:qemuriscv32 ?= "70cf8dde55448a804da825139fa12daf5a855047" -SRCREV_machine:qemux86 ?= "70cf8dde55448a804da825139fa12daf5a855047" -SRCREV_machine:qemux86-64 ?= "70cf8dde55448a804da825139fa12daf5a855047" -SRCREV_machine:qemumips64 ?= "5e7bcff3dccd4749783b87d69ffd405ba71c9fda" -SRCREV_machine ?= "70cf8dde55448a804da825139fa12daf5a855047" -SRCREV_meta ?= "fee71fc34f2e551ebfd7bf0996d82f3447787e7a" +SRCREV_machine:qemuarm ?= "b6fd1a7dd80a336567fa30c1d674f0d5df9af836" +SRCREV_machine:qemuarm64 ?= "387a676543764b59e38cf6b13d6474846fb07d78" +SRCREV_machine:qemumips ?= "7c084cf3a700f7a2c68c8909501f4d35b3215e40" +SRCREV_machine:qemuppc ?= "239f7c8f37bf9ade16325101df3c06a485ccc74e" +SRCREV_machine:qemuriscv64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" +SRCREV_machine:qemuriscv32 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" +SRCREV_machine:qemux86 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" +SRCREV_machine:qemux86-64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" +SRCREV_machine:qemumips64 ?= "a4805fe749c9c56d18a60b5378674760ef0e85ed" +SRCREV_machine ?= "c9f3902d8069e32a8928153a38d8f6115194d128" +SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "0464ab17184b8fdec6676fabe76059b90e54e74f" +SRCREV_machine:class-devupstream ?= "e29be6724adbc9c3126d2a9550ec21f927f22f6d" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -41,7 +41,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.30" +LINUX_VERSION ?= "5.15.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch b/poky/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch new file mode 100644 index 0000000000..020949cc34 --- /dev/null +++ b/poky/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch @@ -0,0 +1,68 @@ +From 330b77081c3a4c7ae76cb08602db385b40fa7ff7 Mon Sep 17 00:00:00 2001 +From: Simone Weiss +Date: Mon, 13 Dec 2021 09:29:53 +0000 +Subject: [PATCH] popt test output format for ptest + +patch test output format to match simple-test as it is used in ptests. + +Upstream-Status: Pending + +Signed-off-by: Simone Weiss +Signed-off-by: David Niederpruem +--- + tests/testit.sh | 20 ++++++++------------ + 1 file changed, 8 insertions(+), 12 deletions(-) + +diff --git a/tests/testit.sh b/tests/testit.sh +index 2a7b4aa..50b42e2 100755 +--- a/tests/testit.sh ++++ b/tests/testit.sh +@@ -5,12 +5,11 @@ run() { + name=$1; shift + answer=$1; shift + +- echo Running test $name. +- + result=`HOME=$builddir $builddir/$prog $*` + if [ "$answer" != "$result" ]; then +- echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" " +- exit 2 ++ echo "FAIL: $name" ++ else ++ echo "PASS: $name" + fi + } + +@@ -23,17 +22,17 @@ run_diff() { + out=$builddir/tmp.out + diff_file=$builddir/tmp.diff + +- echo Running test $name. +- + $builddir/$prog $in_file > $out + ret=$? + diff $out $answer_file > $diff_file + diff_ret=$? + + if [ "$diff_ret" != "0" ]; then +- echo "Test \"$name\" failed output is in $out, diff is:" +- cat $diff_file +- exit 2 ++ echo "FAIL: $name" ++ echo "diff is:" ++ cat $diff_file ++ else ++ echo "PASS: $name" + fi + rm $out $diff_file + } +@@ -174,6 +173,3 @@ Help options: + #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer + #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer + #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer +- +-echo "" +-echo "Passed." +-- +2.17.1 + diff --git a/poky/meta/recipes-support/popt/popt/run-ptest b/poky/meta/recipes-support/popt/popt/run-ptest new file mode 100644 index 0000000000..85754035d0 --- /dev/null +++ b/poky/meta/recipes-support/popt/popt/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +./testit.sh diff --git a/poky/meta/recipes-support/popt/popt_1.18.bb b/poky/meta/recipes-support/popt/popt_1.18.bb index 057c44f223..af8add4ad6 100644 --- a/poky/meta/recipes-support/popt/popt_1.18.bb +++ b/poky/meta/recipes-support/popt/popt_1.18.bb @@ -8,9 +8,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" DEPENDS = "virtual/libiconv" -SRC_URI = "http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz" +SRC_URI = "\ + http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz \ + file://0001-popt-test-output-format-for-ptest.patch \ + file://run-ptest \ +" SRC_URI[sha256sum] = "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1" -inherit autotools gettext +inherit autotools gettext ptest + +RDEPENDS_${PN}-ptest += "bash" + +do_compile_ptest() { + sed 's#lt-test1#test1#g' ${S}/tests/testit.sh > ${B}/tests/testit.sh +} + +do_install_ptest() { + install ${B}/tests/.libs/test* ${D}/${PTEST_PATH} + install ${B}/tests/.libs/tdict ${D}/${PTEST_PATH} + install ${B}/tests/testit.sh ${D}/${PTEST_PATH} + install ${B}/tests/test-poptrc ${D}/${PTEST_PATH} +} BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/vim/vim.inc b/poky/meta/recipes-support/vim/vim.inc index 905ba3f9c6..21ff036cf4 100644 --- a/poky/meta/recipes-support/vim/vim.inc +++ b/poky/meta/recipes-support/vim/vim.inc @@ -11,7 +11,7 @@ RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=a3f193c20c6faff93c69185d5d070535" + file://runtime/doc/uganda.txt;md5=daf48235bb824c77fe8ae88d5f575f74" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4524" -SRCREV = "d8f8629b1bf566e1dada7515e9b146c69e5d9757" +PV .= ".4681" +SRCREV = "15f74fab653a784548d5d966644926b47ba2cfa7" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" diff --git a/poky/oe-init-build-env b/poky/oe-init-build-env index 8c1bd54e57..38333ab858 100755 --- a/poky/oe-init-build-env +++ b/poky/oe-init-build-env @@ -42,8 +42,8 @@ fi unset THIS_SCRIPT export OEROOT -. $OEROOT/scripts/oe-buildenv-internal && - TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || { +. "$OEROOT"/scripts/oe-buildenv-internal && + TEMPLATECONF="$TEMPLATECONF" "$OEROOT"/scripts/oe-setup-builddir || { unset OEROOT return 1 } diff --git a/poky/scripts/oe-setup-builddir b/poky/scripts/oe-setup-builddir index d4ac074ad9..54048e62ec 100755 --- a/poky/scripts/oe-setup-builddir +++ b/poky/scripts/oe-setup-builddir @@ -42,7 +42,7 @@ if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") fi -. $OEROOT/.templateconf +. "$OEROOT"/.templateconf if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" @@ -79,7 +79,7 @@ example, select a different MACHINE (target hardware). See conf/local.conf for more information as common configuration options are commented. EOM - cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" + cp -f "$OECORELOCALCONF" "$BUILDDIR/conf/local.conf" SHOWYPDOC=yes fi @@ -100,7 +100,7 @@ EOM # to replace it for compatibility. sed -e "s|##OEROOT##|$OEROOT|g" \ -e "s|##COREBASE##|$OEROOT|g" \ - $OECORELAYERCONF > "$BUILDDIR/conf/bblayers.conf" + "$OECORELAYERCONF" > "$BUILDDIR/conf/bblayers.conf" SHOWYPDOC=yes fi @@ -125,5 +125,5 @@ fi if [ -z "$OECORENOTESCONF" ]; then OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" fi -[ ! -r "$OECORENOTESCONF" ] || cat $OECORENOTESCONF +[ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" unset OECORENOTESCONF diff --git a/poky/scripts/relocate_sdk.py b/poky/scripts/relocate_sdk.py index 8c0fdb986a..4ed8bfc0d1 100755 --- a/poky/scripts/relocate_sdk.py +++ b/poky/scripts/relocate_sdk.py @@ -30,9 +30,16 @@ else: old_prefix = re.compile(b("##DEFAULT_INSTALL_DIR##")) def get_arch(): + global endian_prefix f.seek(0) e_ident =f.read(16) - ei_mag0,ei_mag1_3,ei_class = struct.unpack("