From 35a774200999ac2fca48693c1c169bf99d2f63ea Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 26 May 2020 13:25:03 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: ed3bdd7fbc(dunfell) meta-raspberrypi: 8066fac91d(dunfell) meta-security: d83f7cb0c9(dunfell) meta-openembedded: e413c1ef62(dunfell) Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232 Signed-off-by: Brad Bishop --- meta-openembedded/README | 2 +- meta-openembedded/meta-filesystems/README | 10 +- meta-openembedded/meta-gnome/README | 10 +- .../appstream-glib/appstream-glib_0.7.16.bb | 37 - .../appstream-glib/appstream-glib_0.7.17.bb | 37 + meta-openembedded/meta-initramfs/README | 8 +- meta-openembedded/meta-multimedia/README | 10 +- meta-openembedded/meta-networking/MAINTAINERS | 32 +- meta-openembedded/meta-networking/README | 6 +- .../recipes-connectivity/samba/samba_4.10.13.bb | 335 --- .../recipes-connectivity/samba/samba_4.10.15.bb | 335 +++ .../recipes-support/libldb/libldb_1.5.6.bb | 71 - .../recipes-support/libldb/libldb_1.5.7.bb | 71 + .../recipes-support/tcpdump/tcpdump_4.9.3.bb | 2 +- meta-openembedded/meta-oe/README | 8 +- .../modemmanager/modemmanager_1.12.10.bb | 57 + .../modemmanager/modemmanager_1.12.8.bb | 57 - .../0001-opcache-config.m4-enable-opcache.patch | 19 +- .../meta-oe/recipes-devtools/php/php_7.4.4.bb | 10 +- .../recipes-graphics/gtkwave/gtkwave_3.3.104.bb | 2 +- ...c-cursor-fix-xfc-NULL-pointer-dereference.patch | 30 + .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 1 + .../v4l2apps/v4l-utils_1.18.0.bb | 56 - .../v4l2apps/v4l-utils_1.18.1.bb | 56 + .../meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb | 35 + .../meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb | 33 - .../cpprest/cpprest/disable-outside-tests.patch | 20 + .../recipes-support/cpprest/cpprest_2.10.15.bb | 19 - .../recipes-support/cpprest/cpprest_2.10.16.bb | 19 + .../recipes-support/mailcap/mailcap_2.1.48.bb | 26 - .../recipes-support/mailcap/mailcap_2.1.49.bb | 26 + ...0001-fix-bug-of-do_compile-and-do_install.patch | 44 + .../0024-RH-use-rpm-optflags-if-present.patch | 33 +- ...ds-from-kernel-cmdline-mpath.wwids-with-A.patch | 93 +- .../multipath-tools/multipath-tools_0.8.3.bb | 116 - .../multipath-tools/multipath-tools_0.8.4.bb | 117 + meta-openembedded/meta-perl/README | 10 +- meta-openembedded/meta-python/README | 12 +- ...nality-to-add-own-objects-to-internal-obj.patch | 52 - ...ibility-to-import-templates-from-packages.patch | 27 - .../recipes-devtools/python/python-pathlib2.inc | 2 +- .../recipes-devtools/python/python-prettytable.inc | 5 + .../recipes-devtools/python/python-ptyprocess.inc | 3 + .../python/python3-attrs_19.3.0.bb | 6 +- ...nality-to-add-own-objects-to-internal-obj.patch | 52 + ...ibility-to-import-templates-from-packages.patch | 27 + .../python/python3-dbusmock_0.16.7.bb | 25 + .../python/python3-markdown_3.0.1.bb | 2 + .../python/python3-ntplib_0.3.3.bb | 2 +- .../python/python3-parallax_1.0.5.bb | 2 + .../python/python3-parse-type/run-ptest | 2 +- .../recipes-devtools/python/python3-pid_2.2.5.bb | 2 + .../python/python3-pkgconfig_1.4.0.bb | 1 + .../python/python3-pluggy/run-ptest | 3 +- .../python/python3-polyline/run-ptest | 2 +- .../python/python3-precise-runner/run-ptest | 2 +- .../python/python3-prettytable/run-ptest | 2 +- .../python/python3-ptyprocess/run-ptest | 2 +- .../recipes-devtools/python/python3-py_1.8.1.bb | 2 + .../python/python3-pyasn1-modules/run-ptest | 2 +- .../python/python3-pyasn1/run-ptest | 2 +- .../python/python3-pydbus_0.6.0.bb | 4 +- .../python/python3-pyhamcrest_1.9.0.bb | 2 + .../python/python3-pyroute2/run-ptest | 3 +- .../python/python3-pyroute2_0.5.11.bb | 37 - .../python/python3-pyroute2_0.5.12.bb | 37 + .../python/python3-pyrsistent_0.15.7.bb | 1 + .../python/python3-pyserial/run-ptest | 3 +- .../python/python3-pytoml_0.1.21.bb | 5 + .../python/python3-pyudev_0.21.0.bb | 1 + .../recipes-devtools/python/python3-pyyaml_5.3.bb | 1 + .../python/python3-setuptools-scm_3.3.3.bb | 13 +- .../python/python3-werkzeug_1.0.1.bb | 1 + .../recipes-devtools/python/python3-zipp_0.6.0.bb | 4 +- meta-openembedded/meta-webserver/README | 8 +- .../recipes-httpd/apache2/apache2_2.4.43.bb | 8 - .../apache2/files/apache2-volatile.conf | 2 - .../recipes-httpd/apache2/files/apache2.service | 4 + .../recipes-httpd/apache2/files/init | 5 + .../apache2/files/volatiles.04_apache2 | 3 - .../meta-webserver/recipes-httpd/nginx/nginx.inc | 4 +- meta-openembedded/meta-xfce/README | 10 +- .../xfce4-notifyd/xfce4-notifyd_0.6.0.bb | 34 - .../xfce4-notifyd/xfce4-notifyd_0.6.1.bb | 34 + .../meta-xfce/recipes-xfce/xfconf/xfconf_4.14.1.bb | 20 - .../meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb | 20 + .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb | 39 - .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb | 39 + meta-raspberrypi/README.md | 27 +- meta-raspberrypi/classes/sdcard_image-rpi.bbclass | 2 +- meta-raspberrypi/conf/layer.conf | 5 +- meta-raspberrypi/conf/machine/include/rpi-base.inc | 10 +- .../conf/machine/include/rpi-default-providers.inc | 5 + meta-raspberrypi/conf/machine/raspberrypi3-64.conf | 1 + meta-raspberrypi/conf/machine/raspberrypi3.conf | 1 + meta-raspberrypi/docs/extra-build-config.md | 4 + .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 2 +- meta-raspberrypi/kas-poky-rpi.yml | 58 + .../lib/oeqa/runtime/cases/parselogs_rpi.py | 15 + .../recipes-bsp/common/raspberrypi-firmware.inc | 8 +- .../recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb | 2 + .../recipes-bsp/u-boot/u-boot_%.bbappend | 2 +- .../packagegroups/packagegroup-rpi-test.bb | 6 +- .../recipes-core/psplash/psplash_%.bbappend | 3 +- .../recipes-devtools/python/rpio_0.10.0.bb | 6 +- .../files/0001-dri2-query-dma-buf-modifiers.patch | 43 + .../recipes-graphics/mesa/mesa_%.bbappend | 4 + ...-applications-to-set-next-resource-handle.patch | 7 +- ...ayland-Add-support-for-the-Wayland-winsys.patch | 32 +- .../files/0003-wayland-Add-Wayland-example.patch | 7 +- ...-wayland-egl-Add-bcm_host-to-dependencies.patch | 7 +- ...emove-faulty-assert-to-make-weston-happy-.patch | 9 +- ...6-zero-out-wl-buffers-in-egl_surface_free.patch | 7 +- ...007-initialize-front-back-wayland-buffers.patch | 7 +- .../userland/files/0008-Remove-RPC_FLUSH.patch | 7 +- .../files/0009-fix-cmake-dependency-race.patch | 9 +- ...Fix-for-framerate-with-nested-composition.patch | 7 +- .../0011-build-shared-library-for-vchostif.patch | 11 +- ...nt-buffer-wrapping-interface-for-dispmanx.patch | 7 +- ...13-Implement-triple-buffering-for-wayland.patch | 7 +- ...-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch | 7 +- .../0015-EGL-glplatform.h-define-EGL_CAST.patch | 7 +- ...ple-wayland-compositor-state-data-per-pro.patch | 8 +- ...kport-typedef-for-EGL_EXT_image_dma_buf_i.patch | 8 +- ...-EGL_IMG_context_priority-related-defines.patch | 7 +- ...dt-Undefine-__wordsize-if-already-defined.patch | 17 +- .../files/0020-openmaxil-add-pkg-config-file.patch | 40 + ...-Disable-format-overflow-warning-as-error.patch | 32 + .../recipes-graphics/userland/userland_git.bb | 11 +- .../linux-firmware-rpidistro_git.bb | 4 +- ...tests-bpf-Skip-perf-hw-events-test-if-the.patch | 33 + ...ake-perf-able-to-build-with-latest-libbfd.patch | 57 + ...est-bpf-Use-CHECK-macro-instead-of-RET_IF.patch | 40 + ...tests-bpf-Fix-perf_buffer-test-on-systems.patch | 94 + .../recipes-kernel/linux/files/powersave.cfg | 13 + .../recipes-kernel/linux/linux-raspberrypi_4.19.bb | 8 +- .../recipes-kernel/linux/linux-raspberrypi_5.4.bb | 13 + .../recipes-kernel/linux/linux-raspberrypi_5.4.inc | 12 + .../gstreamer/gstreamer1.0-omx_%.bbappend | 13 +- .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 3 +- .../gstreamer/gstreamer1.0-plugins-base_%.bbappend | 4 +- .../recipes-multimedia/omxplayer/omxplayer_git.bb | 2 +- meta-security/README | 7 + meta-security/classes/dm-verity-img.bbclass | 88 + meta-security/conf/layer.conf | 2 +- meta-security/meta-integrity/conf/layer.conf | 2 +- .../meta-security-compliance/conf/layer.conf | 2 +- .../recipes-auditors/lynis/lynis_2.7.5.bb | 2 +- .../openscap-daemon/openscap-daemon_0.1.10.bb | 5 +- ...parsing-of-the-remediation-functions-file.patch | 39 + ...roken-fix-when-greedy-regex-ate-the-whole.patch | 35 + .../scap-security-guide/scap-security-guide.inc | 3 + .../scap-security-guide/scap-security-guide_git.bb | 5 +- meta-security/meta-security-isafw/.gitignore | 2 + meta-security/meta-security-isafw/COPYING.MIT | 17 + meta-security/meta-security-isafw/README.md | 92 + meta-security/meta-security-isafw/conf/layer.conf | 17 + .../meta-security-isafw/lib/isafw/__init__.py | 40 + .../meta-security-isafw/lib/isafw/isafw.py | 158 ++ .../lib/isafw/isaplugins/ISA_cfa_plugin.py | 392 +++ .../lib/isafw/isaplugins/ISA_cve_plugin.py | 217 ++ .../lib/isafw/isaplugins/ISA_fsa_plugin.py | 185 ++ .../lib/isafw/isaplugins/ISA_kca_plugin.py | 323 +++ .../lib/isafw/isaplugins/ISA_la_plugin.py | 273 +++ .../lib/isafw/isaplugins/__init__.py | 42 + .../lib/isafw/isaplugins/configs/__init__.py | 0 .../lib/isafw/isaplugins/configs/kca/__init__.py | 0 .../lib/isafw/isaplugins/configs/kca/arm.py | 24 + .../lib/isafw/isaplugins/configs/kca/common.py | 242 ++ .../lib/isafw/isaplugins/configs/kca/x86.py | 38 + .../isafw/isaplugins/configs/la/approved-non-osi | 43 + .../lib/isafw/isaplugins/configs/la/exceptions | 0 .../lib/isafw/isaplugins/configs/la/licenses | 105 + .../lib/isafw/isaplugins/configs/la/violations | 7 + .../recipes-devtools/checksec/checksec_1.5-1.bb | 25 + .../meta-security-isfafw/classes/isafw.bbclass | 318 +++ meta-security/meta-tpm/conf/layer.conf | 2 +- .../recipes-kernel/linux/linux-yocto_4.%.bbappend | 17 - .../recipes-kernel/linux/linux-yocto_5.%.bbappend | 17 + .../meta-tpm/recipes-tpm/libtpm/libtpm_0.7.0.bb | 2 +- .../meta-tpm/recipes-tpm/swtpm/swtpm_0.2.0.bb | 1 + .../ibmswtpm2/files/remove_optimization.patch | 26 + .../recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb | 24 - .../recipes-tpm2/ibmswtpm2/ibmswtpm2_1563.bb | 27 + .../tpm2-tcti-uefi/files/fix_header_file.patch | 25 + .../tpm2-tcti-uefi/files/tpm2-get-caps-fixed.patch | 23 + ...c-stop-inserting-host-directories-into-co.patch | 13 +- .../tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb | 28 +- .../recipes-tpm2/tpm2-tools/tpm2-tools_4.0.1.bb | 14 - .../recipes-tpm2/tpm2-tools/tpm2-tools_4.1.1.bb | 17 + .../recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb | 81 - .../recipes-tpm2/tpm2-tss/tpm2-tss_2.3.2.bb | 81 + .../images/dm-verity-image-initramfs.bb | 26 + .../initrdscripts/initramfs-dm-verity.bb | 13 + .../initramfs-dm-verity/init-dm-verity.sh | 46 + .../files/fix-build-with-new-version-attr.patch | 73 + .../samhain/files/samhain-server-volatiles.conf | 1 + .../recipes-ids/samhain/samhain-server.bb | 16 +- meta-security/recipes-ids/samhain/samhain.inc | 7 +- .../recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +- .../recipes-kernel/linux/linux-yocto_4.%.bbappend | 2 - .../recipes-kernel/linux/linux-yocto_5.%.bbappend | 2 + .../recipes-mac/AppArmor/apparmor_2.13.3.bb | 198 -- .../recipes-mac/AppArmor/apparmor_2.13.4.bb | 198 ++ .../recipes-scanners/arpwatch/arpwatch_3.0.bb | 79 + .../recipes-scanners/arpwatch/files/arpwatch.conf | 23 + .../arpwatch/files/arpwatch.default | 7 + .../recipes-scanners/arpwatch/files/arpwatch_init | 123 + .../arpwatch/files/host_contam_fix.patch | 21 + .../arpwatch/files/postfix_workaround.patch | 91 + .../buck-security/buck-security_0.7.bb | 45 + .../recipes-scanners/checksec/checksec_2.1.0.bb | 19 + .../checksecurity/checksecurity_2.0.15.bb | 21 + .../check-setuid-use-more-portable-find-args.patch | 23 + .../checksecurity/files/setuid-log-folder.patch | 52 + .../recipes-scanners/clamav/clamav_0.101.5.bb | 169 ++ .../clamav/files/clamav-freshclam.service | 12 + .../clamav/files/clamav-milter.conf.sample | 293 +++ .../recipes-scanners/clamav/files/clamav.service | 17 + .../recipes-scanners/clamav/files/clamd.conf | 595 +++++ .../clamav/files/freshclam-native.conf | 224 ++ .../recipes-scanners/clamav/files/freshclam.conf | 224 ++ .../recipes-scanners/clamav/files/tmpfiles.clamav | 3 + .../clamav/files/volatiles.03_clamav | 3 + .../recipes-scanners/rootkits/chkrootkit_0.53.bb | 48 + .../bastille/files/set_required_questions.py | 4 +- .../buck-security/buck-security_0.7.bb | 63 - .../recipes-security/checksec/checksec_2.1.0.bb | 19 - .../checksecurity/checksecurity_2.0.15.bb | 21 - .../check-setuid-use-more-portable-find-args.patch | 23 - .../checksecurity/files/setuid-log-folder.patch | 52 - .../recipes-security/clamav/clamav_0.101.5.bb | 169 -- .../clamav/files/clamav-freshclam.service | 12 - .../clamav/files/clamav-milter.conf.sample | 293 --- .../recipes-security/clamav/files/clamav.service | 17 - .../recipes-security/clamav/files/clamd.conf | 595 ----- .../clamav/files/freshclam-native.conf | 224 -- .../recipes-security/clamav/files/freshclam.conf | 224 -- .../recipes-security/clamav/files/tmpfiles.clamav | 3 - .../clamav/files/volatiles.03_clamav | 3 - .../ecryptfs-utils/ecryptfs-utils_111.bb | 2 +- .../0001-python3-fail2ban-2-3-conversion.patch | 2527 ++++++++++++++++++++ .../fail2ban/files/fail2ban_setup.py | 1 - .../fail2ban/python3-fail2ban_0.10.4.0.bb | 26 +- .../google-authenticator-libpam_1.07.bb | 20 - .../google-authenticator-libpam_1.08.bb | 23 + .../images/security-client-image.bb | 3 +- .../images/security-server-image.bb | 3 +- ...on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch | 45 - .../libseccomp/libseccomp_2.4.2.bb | 44 - .../libseccomp/libseccomp_2.4.3.bb | 43 + .../sssd/files/fix-ldblibdir.patch | 25 + .../recipes-security/sssd/files/volatiles.99_sssd | 1 + meta-security/recipes-security/sssd/sssd_1.16.4.bb | 78 +- meta-security/wic/beaglebone-yocto-verity.wks.in | 15 + poky/bitbake/bin/bitdoc | 519 ++++ .../bitbake-user-manual-intro.xml | 7 +- poky/bitbake/lib/bs4/testing.py | 6 +- .../toaster/orm/management/commands/lsupdates.py | 2 +- .../toastermain/management/commands/perf.py | 68 +- poky/documentation/ref-manual/migration.xml | 6 +- .../ref-manual/ref-system-requirements.xml | 4 +- poky/documentation/ref-manual/ref-variables.xml | 26 +- .../recipes-test/selftest-chown/selftest-chown.bb | 25 - .../baremetal-examples/baremetal-helloworld_git.bb | 1 - poky/meta/classes/image.bbclass | 5 +- poky/meta/classes/image_types_wic.bbclass | 8 +- poky/meta/classes/meson.bbclass | 3 +- poky/meta/classes/package.bbclass | 100 +- poky/meta/classes/populate_sdk_base.bbclass | 5 - poky/meta/classes/pypi.bbclass | 4 +- poky/meta/classes/qemuboot.bbclass | 6 +- poky/meta/classes/sanity.bbclass | 6 +- poky/meta/classes/sstate.bbclass | 15 +- poky/meta/classes/staging.bbclass | 1 - poky/meta/classes/testimage.bbclass | 17 +- poky/meta/classes/utils.bbclass | 19 + poky/meta/conf/abi_version.conf | 2 +- poky/meta/conf/bitbake.conf | 6 +- poky/meta/conf/distro/include/maintainers.inc | 5 +- poky/meta/conf/documentation.conf | 12 +- poky/meta/lib/oe/packagegroup.py | 8 +- poky/meta/lib/oeqa/core/target/qemu.py | 6 +- poky/meta/lib/oeqa/runtime/cases/ptest.py | 6 +- poky/meta/lib/oeqa/runtime/cases/weston.py | 50 - poky/meta/lib/oeqa/selftest/cases/imagefeatures.py | 32 + poky/meta/lib/oeqa/selftest/cases/package.py | 23 - poky/meta/lib/oeqa/selftest/cases/wic.py | 153 +- poky/meta/lib/oeqa/utils/qemurunner.py | 5 +- poky/meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +- .../recipes-bsp/u-boot/u-boot-tools_2020.01.bb | 2 + .../recipes-bsp/u-boot/u-boot-tools_2020.04.bb | 2 - poky/meta/recipes-bsp/u-boot/u-boot_2020.01.bb | 4 + poky/meta/recipes-bsp/u-boot/u-boot_2020.04.bb | 4 - poky/meta/recipes-connectivity/connman/connman.inc | 4 +- .../0001-gweb-fix-segfault-with-musl-v1.1.21.patch | 34 + ...resolve-musl-does-not-implement-res_ninit.patch | 20 +- .../recipes-connectivity/connman/connman_1.37.bb | 17 + .../recipes-connectivity/connman/connman_1.38.bb | 16 - .../openssh/openssh/sshd.socket | 1 - .../openssh/openssh/sshd@.service | 2 + ...tore-8.31-behavior-on-removed-directories.patch | 99 - .../coreutils/coreutils/fix-selinux-flask.patch | 13 +- .../coreutils/remove-usr-local-lib-from-m4.patch | 23 +- .../coreutils/strtod_fix_clash_with_strtold.patch | 56 + poky/meta/recipes-core/coreutils/coreutils_8.31.bb | 190 ++ poky/meta/recipes-core/coreutils/coreutils_8.32.bb | 190 -- .../0001-Do-not-ignore-return-value-of-write.patch | 6 +- ...Do-not-write-bindir-into-pkg-config-files.patch | 10 +- .../0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 7 +- ...stall-gio-querymodules-as-libexec_PROGRAM.patch | 6 +- ...warning-about-deprecated-paths-in-schemas.patch | 11 +- ...chine-correctly-when-building-with-mingw3.patch | 22 +- ...esources.c-comment-out-a-build-host-only-.patch | 3 +- ...1-meson-Run-atomics-test-on-clang-as-well.patch | 10 +- ...t-hardcode-python-path-into-various-tools.patch | 14 +- ...t-Fix-GSource-iterator-if-iteration-can-m.patch | 43 + ...t-Fix-memory-leaks-and-memory-corruption-.patch | 109 + ...t-Move-mutex-unlocking-in-destructor-righ.patch | 36 + .../Enable-more-tests-while-cross-compiling.patch | 32 +- .../glib-2.0/glib-2.0/relocate-modules.patch | 10 +- poky/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | 53 + poky/meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb | 50 - poky/meta/recipes-core/glib-2.0/glib.inc | 6 +- .../glib-networking/glib-networking_2.62.3.bb | 34 + .../glib-networking/glib-networking_2.64.2.bb | 34 - poky/meta/recipes-core/meta/buildtools-tarball.bb | 4 + poky/meta/recipes-core/meta/wic-tools.bb | 2 +- poky/meta/recipes-core/newlib/libgloss_3.2.0.bb | 33 + poky/meta/recipes-core/newlib/libgloss_3.3.0.bb | 33 - poky/meta/recipes-core/newlib/newlib.inc | 3 +- poky/meta/recipes-core/newlib/newlib_3.2.0.bb | 20 + poky/meta/recipes-core/newlib/newlib_3.3.0.bb | 20 - .../recipes-core/systemd/systemd-boot_244.3.bb | 70 + .../recipes-core/systemd/systemd-boot_245.5.bb | 70 - .../recipes-core/systemd/systemd-conf_244.3.bb | 38 + .../recipes-core/systemd/systemd-conf_245.5.bb | 38 - poky/meta/recipes-core/systemd/systemd.inc | 4 +- .../systemd/0001-Handle-missing-gshadow.patch | 171 -- ...t-install-dependency-links-at-install-tim.patch | 14 +- ...01-do-not-disable-buffer-in-writing-files.patch | 46 +- .../0002-don-t-use-glibc-specific-qsort_r.patch | 12 +- ...llback-parse_printf_format-implementation.patch | 10 +- ...-cpu-set-util.h-add-__cpu_mask-definition.patch | 8 +- ...asic-missing.h-check-for-missing-strndupa.patch | 93 +- .../systemd/0006-Include-netinet-if_ether.h.patch | 41 +- ...-of-__register_atfork-for-non-glibc-build.patch | 6 +- .../0011-Use-uintmax_t-for-handling-rlim_t.patch | 10 +- ....c-Disable-tests-for-missing-typedefs-in-.patch | 8 +- ...ble-buffering-when-writing-to-oom_score_a.patch | 8 +- poky/meta/recipes-core/systemd/systemd_244.3.bb | 708 ++++++ poky/meta/recipes-core/systemd/systemd_245.5.bb | 715 ------ poky/meta/recipes-devtools/bison/bison_3.5.3.bb | 44 + poky/meta/recipes-devtools/bison/bison_3.5.4.bb | 44 - .../cdrtools/cdrtools-native_3.01.bb | 1 - .../dnf/0001-dnf-write-the-log-lock-to-root.patch | 29 - .../dnf/dnf/Fix-SyntaxWarning.patch | 34 + poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb | 90 + poky/meta/recipes-devtools/dnf/dnf_4.2.21.bb | 90 - .../dpkg/0001-Add-support-for-riscv32-CPU.patch | 39 - poky/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb | 1 - .../recipes-devtools/elfutils/elfutils_0.178.bb | 157 ++ .../recipes-devtools/elfutils/elfutils_0.179.bb | 157 -- ...0001-gptcurses-correctly-include-curses.h.patch | 27 - poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb | 33 + poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb | 35 - poky/meta/recipes-devtools/file/file_5.38.bb | 10 +- poky/meta/recipes-devtools/jquery/jquery_3.4.1.bb | 31 + poky/meta/recipes-devtools/jquery/jquery_3.5.0.bb | 31 - .../libdnf/libdnf/0001-Add-WITH_TESTS-option.patch | 12 +- ...inx-only-if-documentation-is-actually-ena.patch | 42 - ...quotes-around-string-literals-used-in-SQL.patch | 36 - .../0001-include-stdexcept-for-runtime_error.patch | 65 + .../libdnf/libdnf/fix-deprecation-warning.patch | 71 + poky/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 32 + poky/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb | 34 - ...01-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 + .../libmodulemd/libmodulemd-v1_git.bb | 25 + ...nerate-the-manpage-only-if-the-feature-is.patch | 28 - ...n.build-do-not-install-python-gi-bindings.patch | 23 - .../libmodulemd/libmodulemd_git.bb | 25 - poky/meta/recipes-devtools/meson/meson.inc | 1 + .../0001-Make-CPU-family-warnings-fatal.patch | 10 +- ...02-Support-building-allarch-recipes-again.patch | 4 +- .../meson/meson/0003-native_bindir.patch | 30 +- .../recipes-devtools/opkg/opkg-keyrings_1.0.bb | 5 +- ...t-to-correctly-exclude-unbuilt-extensions.patch | 27 + .../recipes-devtools/perl/files/determinism.patch | 13 + .../meta/recipes-devtools/perl/files/racefix.patch | 24 + poky/meta/recipes-devtools/perl/perl_5.30.1.bb | 391 +++ poky/meta/recipes-devtools/perl/perl_5.30.2.bb | 387 --- .../files/0001-pseudo_ipc.h-Fix-enum-typedef.patch | 31 + poky/meta/recipes-devtools/pseudo/pseudo_git.bb | 1 + ...01-convert-shebang-from-python-to-python3.patch | 176 +- ...m-setup.py-remove-the-detection-of-x86-ta.patch | 32 + .../recipes-devtools/python-numpy/python-numpy.inc | 7 +- .../python-numpy/python3-numpy_1.17.4.bb | 3 + .../python-numpy/python3-numpy_1.18.3.bb | 3 - .../meta/recipes-devtools/python/python-cython.inc | 41 - poky/meta/recipes-devtools/python/python-gitdb.inc | 5 +- poky/meta/recipes-devtools/python/python-pbr.inc | 2 - .../recipes-devtools/python/python-pyparsing.inc | 22 - .../recipes-devtools/python/python-setuptools.inc | 3 +- .../python/python3-cython_0.29.16.bb | 18 - .../python/python3-dbusmock_0.19.bb | 16 - .../recipes-devtools/python/python3-gitdb_2.0.6.bb | 3 + .../recipes-devtools/python/python3-gitdb_4.0.4.bb | 3 - .../0001-change-shebang-to-python3.patch | 42 - .../0001-change-shebang-to-python3.patch | 60 - .../recipes-devtools/python/python3-pip_20.0.2.bb | 2 - .../python/python3-pyparsing_2.4.7.bb | 3 - .../0001-change-shebang-to-python3.patch | 36 - ...an-unsatisfiable-dependency-when-building.patch | 28 +- ...code-lib-rpm-as-the-installation-path-for.patch | 14 +- ...y-package-building-into-a-separate-functi.patch | 84 + ...rovides-requires-do-not-use-monodis-from-.patch | 58 + ...o-not-run-file-classification-in-parallel.patch | 65 - ...-binary-package-creation-via-thread-pools.patch | 127 + ...c-make-operations-over-string-pools-threa.patch | 207 ++ ...c-remove-static-local-variables-from-buil.patch | 336 +++ poky/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 155 ++ poky/meta/recipes-devtools/rpm/rpm_4.15.1.bb | 149 -- poky/meta/recipes-extended/cups/cups.inc | 12 +- .../recipes-extended/cups/cups/cups-volatiles.conf | 1 - .../recipes-extended/cups/cups/volatiles.99_cups | 2 - poky/meta/recipes-extended/ed/ed_1.15.bb | 38 + poky/meta/recipes-extended/ed/ed_1.16.bb | 38 - .../files/do-not-check-local-libpng-source.patch | 37 +- .../ghostscript/CVE-2019-14869-0001.patch | 70 + .../ghostscript/ghostscript/aarch64/objarch.h | 40 + .../ghostscript/ghostscript/arm/objarch.h | 40 + .../ghostscript/ghostscript/armeb/objarch.h | 40 + .../ghostscript/ghostscript-9.02-genarch.patch | 38 + .../ghostscript/ghostscript/i586/objarch.h | 41 + .../ghostscript/ghostscript/microblaze/objarch.h | 40 + .../ghostscript/ghostscript/microblazeel/objarch.h | 40 + .../ghostscript/mipsarchn32eb/objarch.h | 40 + .../ghostscript/mipsarchn32el/objarch.h | 40 + .../ghostscript/mipsarchn64eb/objarch.h | 40 + .../ghostscript/mipsarchn64el/objarch.h | 40 + .../ghostscript/mipsarcho32eb/objarch.h | 40 + .../ghostscript/mipsarcho32el/objarch.h | 40 + .../ghostscript/ghostscript/nios2/objarch.h | 40 + .../ghostscript/ghostscript/powerpc/objarch.h | 40 + .../ghostscript/ghostscript/powerpc64/objarch.h | 40 + .../ghostscript/ghostscript/powerpc64le/objarch.h | 40 + .../ghostscript/ghostscript/x86-64/objarch.h | 40 + .../ghostscript/ghostscript_9.50.bb | 129 + .../ghostscript/ghostscript_9.52.bb | 122 - ...01-xdr_float-do-not-include-bits-endian.h.patch | 34 + .../recipes-extended/libtirpc/libtirpc_1.2.5.bb | 30 + .../recipes-extended/libtirpc/libtirpc_1.2.6.bb | 28 - .../logrotate/0001-Update-the-manual.patch | 39 - .../logrotate/act-as-mv-when-rotate.patch | 25 +- .../disable-check-different-filesystems.patch | 14 +- .../logrotate/logrotate/update-the-manual.patch | 38 + .../recipes-extended/logrotate/logrotate_3.15.1.bb | 99 + .../recipes-extended/logrotate/logrotate_3.16.0.bb | 99 - poky/meta/recipes-extended/man-db/man-db_2.9.0.bb | 59 + poky/meta/recipes-extended/man-db/man-db_2.9.1.bb | 59 - ...0001-Add-option-to-control-configure-args.patch | 99 + ...et-3629-configure.ac-drop-bundled-gettext.patch | 110 + ...-misc-Makefile.am-install-mc.lib-only-onc.patch | 59 - poky/meta/recipes-extended/mc/mc_4.8.23.bb | 56 + poky/meta/recipes-extended/mc/mc_4.8.24.bb | 55 - poky/meta/recipes-extended/msmtp/msmtp_1.8.7.bb | 28 + poky/meta/recipes-extended/msmtp/msmtp_1.8.8.bb | 28 - ...2-don-t-ignore-CFLAGS-when-building-snack.patch | 29 + .../recipes-extended/newt/files/pie-flags.patch | 41 - poky/meta/recipes-extended/newt/libnewt_0.52.21.bb | 4 +- ...-rarely-reproduced-parallel-build-problem.patch | 16 +- .../wget/wget/0002-improve-reproducibility.patch | 9 +- poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb | 35 + poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb | 31 - .../0001-Fix-build-reproducibility.patch | 50 + ...1-Port-cross-compilation-support-to-meson.patch | 163 ++ ...he-repository-directory-for-native-builds.patch | 8 +- ...01-giscanner-add-a-lib-dirs-envvar-option.patch | 70 + ....build-disable-tests-when-cross-compiling.patch | 26 + ...3-giscanner-add-use-binary-wrapper-option.patch | 49 + ...04-giscanner-add-a-use-ldd-wrapper-option.patch | 45 + ...config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch | 39 + .../gobject-introspection_1.62.0.bb | 209 ++ .../gobject-introspection_1.64.1.bb | 202 -- .../recipes-gnome/libnotify/libnotify_0.7.8.bb | 22 + .../recipes-gnome/libnotify/libnotify_0.7.9.bb | 28 - .../recipes-gnome/libsecret/libsecret_0.20.1.bb | 27 + .../recipes-gnome/libsecret/libsecret_0.20.3.bb | 30 - poky/meta/recipes-graphics/clutter/clutter-1.0.inc | 2 +- .../run-installed-tests-with-tap-output.patch | 16 +- .../recipes-graphics/clutter/clutter-1.0_1.26.2.bb | 10 + .../recipes-graphics/clutter/clutter-1.0_1.26.4.bb | 10 - .../recipes-graphics/drm/libdrm/musl-ioctl.patch | 35 + poky/meta/recipes-graphics/drm/libdrm_2.4.100.bb | 60 + poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb | 59 - ...-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch | 117 + poky/meta/recipes-graphics/kmscube/kmscube_git.bb | 5 +- poky/meta/recipes-graphics/libva/libva_2.6.1.bb | 14 +- .../0001-Sync-i915_pciids-upto-8717c6b7414f.patch | 505 ---- .../xorg-driver/xf86-video-intel_git.bb | 4 +- .../xorg-lib/libxcb/xcbincludedir.patch | 28 + .../recipes-graphics/xorg-lib/libxcb_1.13.1.bb | 37 + poky/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb | 35 - .../0001-fix-python3-support.patch | 34 - .../xorg-lib/xkeyboard-config_2.28.bb | 31 + .../xorg-lib/xkeyboard-config_2.29.bb | 33 - .../recipes-graphics/xorg-proto/xcb-proto_1.13.bb | 29 + .../recipes-graphics/xorg-proto/xcb-proto_1.14.bb | 28 - .../xorg-proto/xorgproto/legacy.patch | 97 + .../xorg-proto/xorgproto_2019.2.bb | 28 + .../xorg-proto/xorgproto_2020.1.bb | 27 - .../xorg-xserver/xserver-xorg_1.20.7.bb | 34 + .../xorg-xserver/xserver-xorg_1.20.8.bb | 34 - poky/meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- poky/meta/recipes-kernel/perf/perf.bb | 2 +- poky/meta/recipes-rt/rt-tests/rt-tests.inc | 4 +- poky/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 17 + poky/meta/recipes-sato/webkit/libwpe_1.6.0.bb | 18 - .../recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 17 + .../recipes-sato/webkit/wpebackend-fdo_1.6.0.bb | 18 - ...est_util.h-add-missing-sys-time.h-include.patch | 61 + .../meta/recipes-support/atk/at-spi2-atk_2.34.1.bb | 24 + .../meta/recipes-support/atk/at-spi2-atk_2.34.2.bb | 21 - .../0001-Fix-source-reproducibility.patch | 32 + .../recipes-support/atk/at-spi2-core_2.34.0.bb | 37 + .../recipes-support/atk/at-spi2-core_2.36.0.bb | 36 - poky/meta/recipes-support/atk/atk_2.34.1.bb | 21 + poky/meta/recipes-support/atk/atk_2.36.0.bb | 21 - poky/meta/recipes-support/curl/curl_7.69.1.bb | 80 + poky/meta/recipes-support/curl/curl_7.70.0.bb | 81 - .../recipes-support/diffoscope/diffoscope_136.bb | 18 + .../recipes-support/diffoscope/diffoscope_143.bb | 18 - .../libevdev/libevdev/determinism.patch | 53 +- .../recipes-support/libevdev/libevdev_1.8.0.bb | 16 + .../recipes-support/libevdev/libevdev_1.9.0.bb | 16 - .../meta/recipes-support/liburcu/liburcu_0.11.1.bb | 22 + .../meta/recipes-support/liburcu/liburcu_0.12.0.bb | 22 - .../recipes-support/libusb/libusb1/no-dll.patch | 19 + poky/meta/recipes-support/libusb/libusb1_1.0.22.bb | 45 + poky/meta/recipes-support/libusb/libusb1_1.0.23.bb | 44 - .../ptest-runner/ptest-runner_2.3.2.bb | 28 + .../ptest-runner/ptest-runner_2.4.0.bb | 28 - poky/meta/recipes-support/re2c/re2c_1.0.1.bb | 3 +- .../rng-tools/rng-tools/rngd.service | 21 +- .../recipes-support/rng-tools/rng-tools_6.9.bb | 7 - poky/meta/recipes-support/vte/vte_0.58.3.bb | 56 + poky/meta/recipes-support/vte/vte_0.60.2.bb | 57 - poky/scripts/buildall-qemu | 120 - poky/scripts/lib/wic/engine.py | 5 +- poky/scripts/lib/wic/help.py | 26 +- poky/scripts/lib/wic/ksparser.py | 3 +- poky/scripts/lib/wic/misc.py | 14 +- poky/scripts/lib/wic/partition.py | 20 +- poky/scripts/lib/wic/plugins/source/rootfs.py | 133 +- poky/scripts/runqemu | 11 +- poky/scripts/tiny/ksize.py | 6 +- 556 files changed, 18110 insertions(+), 9775 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb create mode 100644 meta-raspberrypi/kas-poky-rpi.yml create mode 100644 meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py create mode 100644 meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch create mode 100644 meta-raspberrypi/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch create mode 100644 meta-raspberrypi/recipes-graphics/userland/files/0021-cmake-Disable-format-overflow-warning-as-error.patch create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch create mode 100644 meta-raspberrypi/recipes-kernel/linux/files/powersave.cfg create mode 100644 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb create mode 100644 meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.inc create mode 100644 meta-security/classes/dm-verity-img.bbclass create mode 100644 meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch create mode 100644 meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch create mode 100644 meta-security/meta-security-isafw/.gitignore create mode 100644 meta-security/meta-security-isafw/COPYING.MIT create mode 100644 meta-security/meta-security-isafw/README.md create mode 100644 meta-security/meta-security-isafw/conf/layer.conf create mode 100644 meta-security/meta-security-isafw/lib/isafw/__init__.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isafw.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/ISA_cfa_plugin.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/ISA_cve_plugin.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/ISA_fsa_plugin.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/ISA_kca_plugin.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/ISA_la_plugin.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/__init__.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/__init__.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/kca/__init__.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/kca/arm.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/kca/common.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/kca/x86.py create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/la/approved-non-osi create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/la/exceptions create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/la/licenses create mode 100644 meta-security/meta-security-isafw/lib/isafw/isaplugins/configs/la/violations create mode 100644 meta-security/meta-security-isafw/recipes-devtools/checksec/checksec_1.5-1.bb create mode 100644 meta-security/meta-security-isfafw/classes/isafw.bbclass delete mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_5.%.bbappend create mode 100644 meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/files/remove_optimization.patch delete mode 100644 meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1332.bb create mode 100644 meta-security/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1563.bb create mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/fix_header_file.patch create mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-tcti-uefi/files/tpm2-get-caps-fixed.patch delete mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_4.0.1.bb create mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_4.1.1.bb delete mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb create mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.2.bb create mode 100644 meta-security/recipes-core/images/dm-verity-image-initramfs.bb create mode 100644 meta-security/recipes-core/initrdscripts/initramfs-dm-verity.bb create mode 100644 meta-security/recipes-core/initrdscripts/initramfs-dm-verity/init-dm-verity.sh create mode 100644 meta-security/recipes-ids/samhain/files/fix-build-with-new-version-attr.patch create mode 100644 meta-security/recipes-ids/samhain/files/samhain-server-volatiles.conf delete mode 100644 meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend create mode 100644 meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend delete mode 100644 meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb create mode 100644 meta-security/recipes-mac/AppArmor/apparmor_2.13.4.bb create mode 100644 meta-security/recipes-scanners/arpwatch/arpwatch_3.0.bb create mode 100644 meta-security/recipes-scanners/arpwatch/files/arpwatch.conf create mode 100644 meta-security/recipes-scanners/arpwatch/files/arpwatch.default create mode 100644 meta-security/recipes-scanners/arpwatch/files/arpwatch_init create mode 100644 meta-security/recipes-scanners/arpwatch/files/host_contam_fix.patch create mode 100644 meta-security/recipes-scanners/arpwatch/files/postfix_workaround.patch create mode 100644 meta-security/recipes-scanners/buck-security/buck-security_0.7.bb create mode 100644 meta-security/recipes-scanners/checksec/checksec_2.1.0.bb create mode 100644 meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb create mode 100644 meta-security/recipes-scanners/checksecurity/files/check-setuid-use-more-portable-find-args.patch create mode 100644 meta-security/recipes-scanners/checksecurity/files/setuid-log-folder.patch create mode 100644 meta-security/recipes-scanners/clamav/clamav_0.101.5.bb create mode 100644 meta-security/recipes-scanners/clamav/files/clamav-freshclam.service create mode 100644 meta-security/recipes-scanners/clamav/files/clamav-milter.conf.sample create mode 100644 meta-security/recipes-scanners/clamav/files/clamav.service create mode 100644 meta-security/recipes-scanners/clamav/files/clamd.conf create mode 100644 meta-security/recipes-scanners/clamav/files/freshclam-native.conf create mode 100644 meta-security/recipes-scanners/clamav/files/freshclam.conf create mode 100644 meta-security/recipes-scanners/clamav/files/tmpfiles.clamav create mode 100644 meta-security/recipes-scanners/clamav/files/volatiles.03_clamav create mode 100644 meta-security/recipes-scanners/rootkits/chkrootkit_0.53.bb delete mode 100644 meta-security/recipes-security/buck-security/buck-security_0.7.bb delete mode 100644 meta-security/recipes-security/checksec/checksec_2.1.0.bb delete mode 100644 meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb delete mode 100644 meta-security/recipes-security/checksecurity/files/check-setuid-use-more-portable-find-args.patch delete mode 100644 meta-security/recipes-security/checksecurity/files/setuid-log-folder.patch delete mode 100644 meta-security/recipes-security/clamav/clamav_0.101.5.bb delete mode 100644 meta-security/recipes-security/clamav/files/clamav-freshclam.service delete mode 100644 meta-security/recipes-security/clamav/files/clamav-milter.conf.sample delete mode 100644 meta-security/recipes-security/clamav/files/clamav.service delete mode 100644 meta-security/recipes-security/clamav/files/clamd.conf delete mode 100644 meta-security/recipes-security/clamav/files/freshclam-native.conf delete mode 100644 meta-security/recipes-security/clamav/files/freshclam.conf delete mode 100644 meta-security/recipes-security/clamav/files/tmpfiles.clamav delete mode 100644 meta-security/recipes-security/clamav/files/volatiles.03_clamav create mode 100644 meta-security/recipes-security/fail2ban/files/0001-python3-fail2ban-2-3-conversion.patch delete mode 100644 meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.07.bb create mode 100644 meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.08.bb delete mode 100644 meta-security/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch delete mode 100644 meta-security/recipes-security/libseccomp/libseccomp_2.4.2.bb create mode 100644 meta-security/recipes-security/libseccomp/libseccomp_2.4.3.bb create mode 100644 meta-security/recipes-security/sssd/files/fix-ldblibdir.patch create mode 100644 meta-security/recipes-security/sssd/files/volatiles.99_sssd create mode 100644 meta-security/wic/beaglebone-yocto-verity.wks.in create mode 100755 poky/bitbake/bin/bitdoc delete mode 100644 poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb create mode 100644 poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb delete mode 100644 poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.04.bb create mode 100644 poky/meta/recipes-bsp/u-boot/u-boot_2020.01.bb delete mode 100644 poky/meta/recipes-bsp/u-boot/u-boot_2020.04.bb create mode 100644 poky/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch create mode 100644 poky/meta/recipes-connectivity/connman/connman_1.37.bb delete mode 100644 poky/meta/recipes-connectivity/connman/connman_1.38.bb delete mode 100644 poky/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch create mode 100644 poky/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch create mode 100644 poky/meta/recipes-core/coreutils/coreutils_8.31.bb delete mode 100644 poky/meta/recipes-core/coreutils/coreutils_8.32.bb create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch create mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb delete mode 100644 poky/meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb create mode 100644 poky/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb delete mode 100644 poky/meta/recipes-core/glib-networking/glib-networking_2.64.2.bb create mode 100644 poky/meta/recipes-core/newlib/libgloss_3.2.0.bb delete mode 100644 poky/meta/recipes-core/newlib/libgloss_3.3.0.bb create mode 100644 poky/meta/recipes-core/newlib/newlib_3.2.0.bb delete mode 100644 poky/meta/recipes-core/newlib/newlib_3.3.0.bb create mode 100644 poky/meta/recipes-core/systemd/systemd-boot_244.3.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd-boot_245.5.bb create mode 100644 poky/meta/recipes-core/systemd/systemd-conf_244.3.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd-conf_245.5.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch create mode 100644 poky/meta/recipes-core/systemd/systemd_244.3.bb delete mode 100644 poky/meta/recipes-core/systemd/systemd_245.5.bb create mode 100644 poky/meta/recipes-devtools/bison/bison_3.5.3.bb delete mode 100644 poky/meta/recipes-devtools/bison/bison_3.5.4.bb delete mode 100644 poky/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch create mode 100644 poky/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch create mode 100644 poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb delete mode 100644 poky/meta/recipes-devtools/dnf/dnf_4.2.21.bb delete mode 100644 poky/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch create mode 100644 poky/meta/recipes-devtools/elfutils/elfutils_0.178.bb delete mode 100644 poky/meta/recipes-devtools/elfutils/elfutils_0.179.bb delete mode 100644 poky/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch create mode 100644 poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb delete mode 100644 poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb create mode 100644 poky/meta/recipes-devtools/jquery/jquery_3.4.1.bb delete mode 100644 poky/meta/recipes-devtools/jquery/jquery_3.5.0.bb delete mode 100644 poky/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch delete mode 100644 poky/meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch create mode 100644 poky/meta/recipes-devtools/libdnf/libdnf/0001-include-stdexcept-for-runtime_error.patch create mode 100644 poky/meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch create mode 100644 poky/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb delete mode 100644 poky/meta/recipes-devtools/libdnf/libdnf_0.47.0.bb create mode 100644 poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch create mode 100644 poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb delete mode 100644 poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch delete mode 100644 poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch delete mode 100644 poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb create mode 100644 poky/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch create mode 100644 poky/meta/recipes-devtools/perl/files/racefix.patch create mode 100644 poky/meta/recipes-devtools/perl/perl_5.30.1.bb delete mode 100644 poky/meta/recipes-devtools/perl/perl_5.30.2.bb create mode 100644 poky/meta/recipes-devtools/pseudo/files/0001-pseudo_ipc.h-Fix-enum-typedef.patch create mode 100644 poky/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch create mode 100644 poky/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb delete mode 100644 poky/meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb delete mode 100644 poky/meta/recipes-devtools/python/python-cython.inc delete mode 100644 poky/meta/recipes-devtools/python/python-pyparsing.inc delete mode 100644 poky/meta/recipes-devtools/python/python3-cython_0.29.16.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-dbusmock_0.19.bb create mode 100644 poky/meta/recipes-devtools/python/python3-gitdb_2.0.6.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-gitdb_4.0.4.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch delete mode 100644 poky/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch delete mode 100644 poky/meta/recipes-devtools/python/python3-pyparsing_2.4.7.bb delete mode 100644 poky/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch create mode 100644 poky/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch create mode 100644 poky/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch delete mode 100644 poky/meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch create mode 100644 poky/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch create mode 100644 poky/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch create mode 100644 poky/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch create mode 100644 poky/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb delete mode 100644 poky/meta/recipes-devtools/rpm/rpm_4.15.1.bb delete mode 100644 poky/meta/recipes-extended/cups/cups/cups-volatiles.conf delete mode 100644 poky/meta/recipes-extended/cups/cups/volatiles.99_cups create mode 100644 poky/meta/recipes-extended/ed/ed_1.15.bb delete mode 100644 poky/meta/recipes-extended/ed/ed_1.16.bb create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h create mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript_9.50.bb delete mode 100644 poky/meta/recipes-extended/ghostscript/ghostscript_9.52.bb create mode 100644 poky/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch create mode 100644 poky/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb delete mode 100644 poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb delete mode 100644 poky/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch create mode 100644 poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch create mode 100644 poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb delete mode 100644 poky/meta/recipes-extended/logrotate/logrotate_3.16.0.bb create mode 100644 poky/meta/recipes-extended/man-db/man-db_2.9.0.bb delete mode 100644 poky/meta/recipes-extended/man-db/man-db_2.9.1.bb create mode 100644 poky/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch create mode 100644 poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch delete mode 100644 poky/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch create mode 100644 poky/meta/recipes-extended/mc/mc_4.8.23.bb delete mode 100644 poky/meta/recipes-extended/mc/mc_4.8.24.bb create mode 100644 poky/meta/recipes-extended/msmtp/msmtp_1.8.7.bb delete mode 100644 poky/meta/recipes-extended/msmtp/msmtp_1.8.8.bb create mode 100644 poky/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch delete mode 100644 poky/meta/recipes-extended/newt/files/pie-flags.patch create mode 100644 poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb delete mode 100644 poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch create mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb delete mode 100644 poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb create mode 100644 poky/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb delete mode 100644 poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb create mode 100644 poky/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb delete mode 100644 poky/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb create mode 100644 poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb delete mode 100644 poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb create mode 100644 poky/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch create mode 100644 poky/meta/recipes-graphics/drm/libdrm_2.4.100.bb delete mode 100644 poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb create mode 100644 poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch delete mode 100644 poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch create mode 100644 poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch create mode 100644 poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb delete mode 100644 poky/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb delete mode 100644 poky/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch create mode 100644 poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb delete mode 100644 poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb create mode 100644 poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb create mode 100644 poky/meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch create mode 100644 poky/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb delete mode 100644 poky/meta/recipes-graphics/xorg-proto/xorgproto_2020.1.bb create mode 100644 poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb delete mode 100644 poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.8.bb create mode 100644 poky/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb delete mode 100644 poky/meta/recipes-sato/webkit/libwpe_1.6.0.bb create mode 100644 poky/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb delete mode 100644 poky/meta/recipes-sato/webkit/wpebackend-fdo_1.6.0.bb create mode 100644 poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch create mode 100644 poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb delete mode 100644 poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb create mode 100644 poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch create mode 100644 poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb delete mode 100644 poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb create mode 100644 poky/meta/recipes-support/atk/atk_2.34.1.bb delete mode 100644 poky/meta/recipes-support/atk/atk_2.36.0.bb create mode 100644 poky/meta/recipes-support/curl/curl_7.69.1.bb delete mode 100644 poky/meta/recipes-support/curl/curl_7.70.0.bb create mode 100644 poky/meta/recipes-support/diffoscope/diffoscope_136.bb delete mode 100644 poky/meta/recipes-support/diffoscope/diffoscope_143.bb create mode 100644 poky/meta/recipes-support/libevdev/libevdev_1.8.0.bb delete mode 100644 poky/meta/recipes-support/libevdev/libevdev_1.9.0.bb create mode 100644 poky/meta/recipes-support/liburcu/liburcu_0.11.1.bb delete mode 100644 poky/meta/recipes-support/liburcu/liburcu_0.12.0.bb create mode 100644 poky/meta/recipes-support/libusb/libusb1/no-dll.patch create mode 100644 poky/meta/recipes-support/libusb/libusb1_1.0.22.bb delete mode 100644 poky/meta/recipes-support/libusb/libusb1_1.0.23.bb create mode 100644 poky/meta/recipes-support/ptest-runner/ptest-runner_2.3.2.bb delete mode 100644 poky/meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb create mode 100644 poky/meta/recipes-support/vte/vte_0.58.3.bb delete mode 100644 poky/meta/recipes-support/vte/vte_0.60.2.bb delete mode 100755 poky/scripts/buildall-qemu diff --git a/meta-openembedded/README b/meta-openembedded/README index 7318f09cdb..e8b30de36d 100644 --- a/meta-openembedded/README +++ b/meta-openembedded/README @@ -1,6 +1,6 @@ Collection of layers for the OE-core universe -Main layer maintainer: Khem Raj +dunfell maintainer: Armin Kuster This repository is a collection of layers to suppliment OE-Core with additional packages, Each layer have designated maintainer diff --git a/meta-openembedded/meta-filesystems/README b/meta-openembedded/meta-filesystems/README index edcf8bfeef..4731d216fe 100644 --- a/meta-openembedded/meta-filesystems/README +++ b/meta-openembedded/meta-filesystems/README @@ -11,26 +11,26 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: dunfell URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: dunfell Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems]' in the subject. +with '[meta-filesystems][dunfell]' in the subject. -Layer maintainer: Khem Raj +dunfell maintainer: Armin Kuster When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-filesystems][PATCH + --subject-prefix=meta-filesystems][dunfell][PATCH Table of Contents diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index a11815fb15..6fdc5cf715 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -3,16 +3,16 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: dunfell revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: master +branch: dunfell revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][dunfell]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][dunfell][PATCH' -Layer maintainer: Andreas Müller +maintainer: Armin Kuster diff --git a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb deleted file mode 100644 index ec3e4a3d39..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" -HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - gperf-native \ - glib-2.0 \ - gtk+3 \ - libyaml \ - libarchive \ - libsoup-2.4 \ - json-glib \ - gdk-pixbuf \ - freetype \ - fontconfig \ - libstemmer \ -" - -inherit meson gobject-introspection gettext bash-completion - -SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" -SRC_URI[md5sum] = "78306049412396a72746186452abdf66" -SRC_URI[sha256sum] = "04f290d73bc865071112076b8a3345df2730783a16af976fe3becfd2f50d5992" - -EXTRA_OEMESON = " \ - -Drpm=false \ -" - -FILES_${PN} += "${libdir}/asb-plugins-5" - -FILES_${PN}-dev += " \ - ${datadir}/installed-tests \ - ${datadir}/gettext \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb new file mode 100644 index 0000000000..eb60bd9680 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb @@ -0,0 +1,37 @@ +SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" +HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + gperf-native \ + glib-2.0 \ + gtk+3 \ + libyaml \ + libarchive \ + libsoup-2.4 \ + json-glib \ + gdk-pixbuf \ + freetype \ + fontconfig \ + libstemmer \ +" + +inherit meson gobject-introspection gettext bash-completion + +SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" +SRC_URI[md5sum] = "67d441fb0fb3e14551b47db656565fc4" +SRC_URI[sha256sum] = "7ca7e91d4accefa1c0d2c6e310cb3fe2686c017810e23b3f82d9f5724345e549" + +EXTRA_OEMESON = " \ + -Drpm=false \ +" + +FILES_${PN} += "${libdir}/asb-plugins-5" + +FILES_${PN}-dev += " \ + ${datadir}/installed-tests \ + ${datadir}/gettext \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-initramfs/README b/meta-openembedded/meta-initramfs/README index 79244d43f0..6d927fffa1 100644 --- a/meta-openembedded/meta-initramfs/README +++ b/meta-openembedded/meta-initramfs/README @@ -12,7 +12,7 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: dunfell revision: HEAD @@ -20,12 +20,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-initramfs]' in the subject. +with '[meta-initramfs][dunfell]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][dunfell][PATCH' -Interm layer maintainer: Khem Raj +dunfell maintainer: Armin Kuster License diff --git a/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README index 3c4b1af7f4..1c08f9d9ff 100644 --- a/meta-openembedded/meta-multimedia/README +++ b/meta-openembedded/meta-multimedia/README @@ -1,19 +1,19 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: dunfell revision: HEAD URI: git://github.com/openembedded/meta-oe.git layers: meta-oe -branch: master +branch: dunfell revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][dunfell]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][PATCH +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][dunfell][PATCH You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Layer maintainer: Andreas Müller +dunfell maintainer: Armin Kuster diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index 5c4c4ce052..3e151b821b 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -2,38 +2,12 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking]' in the subject. +'[meta-networking][dunfell]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-networking][PATCH + --subject-prefix=meta-networking][dunfell][PATCH -You may also contact the maintainers directly. - -Descriptions of section entries: - - M: Mail patches to: FullName - F: Files and directories with wildcard patterns. - A trailing slash includes all files and subdirectory files. - F: recipes-devtools/ all files in and below recipes-devtools - F: recipes-selinux/* all files in recipes-selinux, but not below - One pattern per line. Multiple F: lines acceptable. - -Please keep this list in alphabetical order. - -Maintainers List (try to look for most precise areas first) - -COMMON -M: Khem Raj -M: "Joe MacDonald (backup)" -L: openembedded-devel@lists.openembedded.org -Q: https://patchwork.openembedded.org/project/oe/ -S: Maintained -F: conf -F: recipes-* - -NETKIT -M: Armin Kuster -F: recipes-netkit +dunfell Maintainer: Armin Kuster diff --git a/meta-openembedded/meta-networking/README b/meta-openembedded/meta-networking/README index e1ba27d83b..52e7c79601 100644 --- a/meta-openembedded/meta-networking/README +++ b/meta-openembedded/meta-networking/README @@ -18,19 +18,19 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: dunfell revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-openembedded.git subdirectory: meta-oe -branch: master +branch: dunfell revision: HEAD URI: git://github.com/openembedded/meta-openembedded.git subdirectory: meta-python -branch: master +branch: dunfell revision: HEAD Maintenance diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb deleted file mode 100644 index 5f227c892d..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb +++ /dev/null @@ -1,335 +0,0 @@ -HOMEPAGE = "https://www.samba.org/" -SECTION = "console/network" - -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " - -SAMBA_MIRROR = "http://samba.org/samba/ftp" -MIRRORS += "\ -${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ -${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ -" - -SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ - file://smb.conf \ - file://16-do-not-check-xsltproc-manpages.patch \ - file://20-do-not-import-target-module-while-cross-compile.patch \ - file://21-add-config-option-without-valgrind.patch \ - file://netdb_defines.patch \ - file://glibc_only.patch \ - file://iconv-4.7.0.patch \ - file://dnsserver-4.7.0.patch \ - file://smb_conf-4.7.0.patch \ - file://volatiles.03_samba \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ - file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ - file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ - " -SRC_URI_append_libc-musl = " \ - file://samba-pam.patch \ - file://samba-4.3.9-remove-getpwent_r.patch \ - file://cmocka-uintptr_t.patch \ - file://0001-samba-fix-musl-lib-without-innetgr.patch \ - " - -SRC_URI[md5sum] = "e7906580bf06dae087e99ef8254f327d" -SRC_URI[sha256sum] = "49eb6426e97cbf538e416e51ed8535930382512ad2d13d5ffd7f4336aa7faf63" - -UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" - -inherit systemd waf-samba cpan-base perlnative update-rc.d -# remove default added RDEPENDS on perl -RDEPENDS_${PN}_remove = "perl" - -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -INITSCRIPT_NAME = "samba" -INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." - -SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" -SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" -SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" -SYSTEMD_SERVICE_winbind = "winbind.service" - -# There are prerequisite settings to enable ad-dc, so disable the service by default. -# Reference: -# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller -SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -# Use krb5. Build active domain controller. -# -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc gnutls ldap mitkrb5 \ -" - -RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" - -PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[sasl] = ",,cyrus-sasl" -PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" -PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" -PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," -PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" -PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libunwind] = ", , libunwind" -PACKAGECONFIG[gpgme] = ",--without-gpgme,," -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," -PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" - -# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, -# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: -# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html -# So the working combination is: -# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable -# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable -# -# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where -# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. -# -PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," -PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," - -SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" -SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" -SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" -SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" - -# These libraries are supposed to replace others supplied by packages, but decorate the names of -# .so files so there will not be a conflict. This is not done consistantly, so be very careful -# when adding to this list. -# -SAMBA4_LIBS="heimdal,cmocka,NONE" - -EXTRA_OECONF += "--enable-fhs \ - --with-piddir=/run \ - --with-sockets-dir=/run/samba \ - --with-modulesdir=${libdir}/samba \ - --with-lockdir=${localstatedir}/lib/samba \ - --with-cachedir=${localstatedir}/lib/samba \ - --disable-rpath-install \ - --with-shared-modules=${SAMBA4_MODULES} \ - --bundled-libraries=${SAMBA4_LIBS} \ - ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ - --with-profiling-data \ - --with-libiconv=${STAGING_DIR_HOST}${prefix} \ - --with-pam --with-pammodulesdir=${base_libdir}/security \ - " - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -do_install_append() { - for section in 1 5 7; do - install -d ${D}${mandir}/man$section - install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section - done - for section in 1 5 7 8; do - install -d ${D}${mandir}/man$section - install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section - done - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ - sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ - -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ - -i ${D}${systemd_system_unitdir}/*.service - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then - rm -f ${D}${systemd_system_unitdir}/samba.service - fi - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba - sed -e 's,/opt/samba/bin,${sbindir},g' \ - -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ - -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ - -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba - - install -d ${D}${sysconfdir}/samba - echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts - install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba - - install -d ${D}${sysconfdir}/default - install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba - - # the items are from ctdb/tests/run_tests.sh - for d in onnode takeover tool eventscripts cunit simple complex; do - testdir=${D}${datadir}/ctdb-tests/$d - install -d $testdir - cp ${S}/ctdb/tests/$d/*.sh $testdir - cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true - done - - # fix file-rdeps qa warning - if [ -f ${D}${bindir}/onnode ]; then - sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode - fi - - chmod 0750 ${D}${sysconfdir}/sudoers.d || true - rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - - for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do - if [ -f "${D}${sbindir}/$f" ]; then - sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f - fi - done - if [ -f "${D}${bindir}/samba-tool" ]; then - sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool - fi - -} - -PACKAGES =+ "${PN}-python3 ${PN}-pidl \ - ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ - winbind \ - ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ - smbclient ${PN}-client ${PN}-server ${PN}-test" - -python samba_populate_packages() { - def module_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN') - d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) - - mlprefix = d.getVar('MLPREFIX') or '' - pam_libdir = d.expand('${base_libdir}/security') - pam_pkgname = mlprefix + 'pam-plugin%s' - do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) - - libdir = d.getVar('libdir') - do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) - pkglibdir = '%s/samba' % libdir - do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) - moduledir = '%s/samba/auth' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) - moduledir = '%s/samba/pdb' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) -} - -PACKAGESPLITFUNCS_prepend = "samba_populate_packages " -PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" - -RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" - -FILES_${PN}-base = "${sbindir}/nmbd \ - ${sbindir}/smbd \ - ${sysconfdir}/init.d \ - ${systemd_system_unitdir}/nmb.service \ - ${systemd_system_unitdir}/smb.service" - -FILES_${PN}-ad-dc = "${sbindir}/samba \ - ${systemd_system_unitdir}/samba.service \ - ${libdir}/krb5/plugins/kdb/samba.so \ -" -RDEPENDS_${PN}-ad-dc = "krb5-kdc" - -FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ - ${bindir}/ctdb_run_cluster_tests \ - ${sysconfdir}/ctdb/nodes \ - ${datadir}/ctdb-tests \ - ${datadir}/ctdb/tests \ - ${localstatedir}/lib/ctdb \ - " - -FILES_${BPN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba \ - ${sysconfdir}/tmpfiles.d \ - ${localstatedir}/lib/samba \ - ${localstatedir}/spool/samba \ -" - -FILES_${PN} += "${libdir}/vfs/*.so \ - ${libdir}/charset/*.so \ - ${libdir}/*.dat \ - ${libdir}/auth/*.so \ - ${datadir}/ctdb/events/* \ -" - -FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" - -FILES_${PN}-testsuite = "${bindir}/gentest \ - ${bindir}/locktest \ - ${bindir}/masktest \ - ${bindir}/ndrdump \ - ${bindir}/smbtorture" - -FILES_registry-tools = "${bindir}/regdiff \ - ${bindir}/regpatch \ - ${bindir}/regshell \ - ${bindir}/regtree" - -FILES_winbind = "${sbindir}/winbindd \ - ${bindir}/wbinfo \ - ${bindir}/ntlm_auth \ - ${libdir}/samba/idmap \ - ${libdir}/samba/nss_info \ - ${libdir}/winbind_krb5_locator.so \ - ${libdir}/winbind-krb5-localauth.so \ - ${sysconfdir}/init.d/winbind \ - ${systemd_system_unitdir}/winbind.service" - -FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" - -FILES_smbclient = "${bindir}/cifsdd \ - ${bindir}/rpcclient \ - ${bindir}/smbcacls \ - ${bindir}/smbclient \ - ${bindir}/smbcquotas \ - ${bindir}/smbget \ - ${bindir}/smbspool \ - ${bindir}/smbtar \ - ${bindir}/smbtree \ - ${libdir}/samba/smbspool_krb5_wrapper" - -RDEPENDS_${PN}-pidl_append = " perl" -FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" - -RDEPENDS_${PN}-client = "\ - smbclient \ - winbind \ - registry-tools \ - ${PN}-pidl \ - " - -ALLOW_EMPTY_${PN}-client = "1" - -RDEPENDS_${PN}-server = "\ - ${PN} \ - winbind \ - registry-tools \ - " - -ALLOW_EMPTY_${PN}-server = "1" - -RDEPENDS_${PN}-test = "\ - ${PN}-ctdb-tests \ - ${PN}-testsuite \ - " - -ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb new file mode 100644 index 0000000000..2c74c27fb8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb @@ -0,0 +1,335 @@ +HOMEPAGE = "https://www.samba.org/" +SECTION = "console/network" + +LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " + +SAMBA_MIRROR = "http://samba.org/samba/ftp" +MIRRORS += "\ +${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ +${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ +" + +SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ + file://smb.conf \ + file://16-do-not-check-xsltproc-manpages.patch \ + file://20-do-not-import-target-module-while-cross-compile.patch \ + file://21-add-config-option-without-valgrind.patch \ + file://netdb_defines.patch \ + file://glibc_only.patch \ + file://iconv-4.7.0.patch \ + file://dnsserver-4.7.0.patch \ + file://smb_conf-4.7.0.patch \ + file://volatiles.03_samba \ + file://0001-waf-add-support-of-cross_compile.patch \ + file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ + file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ + file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ + " +SRC_URI_append_libc-musl = " \ + file://samba-pam.patch \ + file://samba-4.3.9-remove-getpwent_r.patch \ + file://cmocka-uintptr_t.patch \ + file://0001-samba-fix-musl-lib-without-innetgr.patch \ + " + +SRC_URI[md5sum] = "67e9f6b8c5140475641bf5121c93b3d4" +SRC_URI[sha256sum] = "0b8b62558b62fbb121015f28f40fae0f07522710b6bef77c508b51bb6914ced9" + +UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" + +inherit systemd waf-samba cpan-base perlnative update-rc.d +# remove default added RDEPENDS on perl +RDEPENDS_${PN}_remove = "perl" + +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + +INITSCRIPT_NAME = "samba" +INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." + +SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" +SYSTEMD_SERVICE_winbind = "winbind.service" + +# There are prerequisite settings to enable ad-dc, so disable the service by default. +# Reference: +# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller +SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +# Use krb5. Build active domain controller. +# +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ + acl cups ad-dc gnutls ldap mitkrb5 \ +" + +RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" + +PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" +PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[sasl] = ",,cyrus-sasl" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" +PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," +PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" +PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libunwind] = ", , libunwind" +PACKAGECONFIG[gpgme] = ",--without-gpgme,," +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," +PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" + +# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, +# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: +# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html +# So the working combination is: +# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable +# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable +# +# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where +# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. +# +PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," + +SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" +SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" +SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" +SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" + +# These libraries are supposed to replace others supplied by packages, but decorate the names of +# .so files so there will not be a conflict. This is not done consistantly, so be very careful +# when adding to this list. +# +SAMBA4_LIBS="heimdal,cmocka,NONE" + +EXTRA_OECONF += "--enable-fhs \ + --with-piddir=/run \ + --with-sockets-dir=/run/samba \ + --with-modulesdir=${libdir}/samba \ + --with-lockdir=${localstatedir}/lib/samba \ + --with-cachedir=${localstatedir}/lib/samba \ + --disable-rpath-install \ + --with-shared-modules=${SAMBA4_MODULES} \ + --bundled-libraries=${SAMBA4_LIBS} \ + ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ + --with-cluster-support \ + --with-profiling-data \ + --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ + " + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +do_install_append() { + for section in 1 5 7; do + install -d ${D}${mandir}/man$section + install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section + done + for section in 1 5 7 8; do + install -d ${D}${mandir}/man$section + install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section + done + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ + sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ + -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ + -i ${D}${systemd_system_unitdir}/*.service + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then + rm -f ${D}${systemd_system_unitdir}/samba.service + fi + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + install -d ${D}${sysconfdir}/init.d + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba + sed -e 's,/opt/samba/bin,${sbindir},g' \ + -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ + -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ + -e 's,/usr/bin,${base_bindir},g' \ + -i ${D}${sysconfdir}/init.d/samba + + install -d ${D}${sysconfdir}/samba + echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts + install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba + + install -d ${D}${sysconfdir}/default + install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba + + # the items are from ctdb/tests/run_tests.sh + for d in onnode takeover tool eventscripts cunit simple complex; do + testdir=${D}${datadir}/ctdb-tests/$d + install -d $testdir + cp ${S}/ctdb/tests/$d/*.sh $testdir + cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true + done + + # fix file-rdeps qa warning + if [ -f ${D}${bindir}/onnode ]; then + sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + fi + + chmod 0750 ${D}${sysconfdir}/sudoers.d || true + rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log + + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do + if [ -f "${D}${sbindir}/$f" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f + fi + done + if [ -f "${D}${bindir}/samba-tool" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool + fi + +} + +PACKAGES =+ "${PN}-python3 ${PN}-pidl \ + ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ + winbind \ + ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ + smbclient ${PN}-client ${PN}-server ${PN}-test" + +python samba_populate_packages() { + def module_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) + + mlprefix = d.getVar('MLPREFIX') or '' + pam_libdir = d.expand('${base_libdir}/security') + pam_pkgname = mlprefix + 'pam-plugin%s' + do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + + libdir = d.getVar('libdir') + do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + pkglibdir = '%s/samba' % libdir + do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + moduledir = '%s/samba/auth' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + moduledir = '%s/samba/pdb' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) +} + +PACKAGESPLITFUNCS_prepend = "samba_populate_packages " +PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" + +RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" +RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" + +FILES_${PN}-base = "${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${sysconfdir}/init.d \ + ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/smb.service" + +FILES_${PN}-ad-dc = "${sbindir}/samba \ + ${systemd_system_unitdir}/samba.service \ + ${libdir}/krb5/plugins/kdb/samba.so \ +" +RDEPENDS_${PN}-ad-dc = "krb5-kdc" + +FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ + ${bindir}/ctdb_run_cluster_tests \ + ${sysconfdir}/ctdb/nodes \ + ${datadir}/ctdb-tests \ + ${datadir}/ctdb/tests \ + ${localstatedir}/lib/ctdb \ + " + +FILES_${BPN}-common = "${sysconfdir}/default \ + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ + ${localstatedir}/lib/samba \ + ${localstatedir}/spool/samba \ +" + +FILES_${PN} += "${libdir}/vfs/*.so \ + ${libdir}/charset/*.so \ + ${libdir}/*.dat \ + ${libdir}/auth/*.so \ + ${datadir}/ctdb/events/* \ +" + +FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" + +FILES_${PN}-testsuite = "${bindir}/gentest \ + ${bindir}/locktest \ + ${bindir}/masktest \ + ${bindir}/ndrdump \ + ${bindir}/smbtorture" + +FILES_registry-tools = "${bindir}/regdiff \ + ${bindir}/regpatch \ + ${bindir}/regshell \ + ${bindir}/regtree" + +FILES_winbind = "${sbindir}/winbindd \ + ${bindir}/wbinfo \ + ${bindir}/ntlm_auth \ + ${libdir}/samba/idmap \ + ${libdir}/samba/nss_info \ + ${libdir}/winbind_krb5_locator.so \ + ${libdir}/winbind-krb5-localauth.so \ + ${sysconfdir}/init.d/winbind \ + ${systemd_system_unitdir}/winbind.service" + +FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +FILES_smbclient = "${bindir}/cifsdd \ + ${bindir}/rpcclient \ + ${bindir}/smbcacls \ + ${bindir}/smbclient \ + ${bindir}/smbcquotas \ + ${bindir}/smbget \ + ${bindir}/smbspool \ + ${bindir}/smbtar \ + ${bindir}/smbtree \ + ${libdir}/samba/smbspool_krb5_wrapper" + +RDEPENDS_${PN}-pidl_append = " perl" +FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" + +RDEPENDS_${PN}-client = "\ + smbclient \ + winbind \ + registry-tools \ + ${PN}-pidl \ + " + +ALLOW_EMPTY_${PN}-client = "1" + +RDEPENDS_${PN}-server = "\ + ${PN} \ + winbind \ + registry-tools \ + " + +ALLOW_EMPTY_${PN}-server = "1" + +RDEPENDS_${PN}-test = "\ + ${PN}-ctdb-tests \ + ${PN}-testsuite \ + " + +ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb deleted file mode 100644 index cc24863c60..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://ldb.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" - -DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python3" - -SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ - file://do-not-import-target-module-while-cross-compile.patch \ - file://libldb-fix-musl-libc-unkown-type-error.patch \ - file://libldb-fix-musl-libc-conflict-type-error.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://options-1.5.4.patch \ - " - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[ldap] = ",,openldap" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" - -LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ - file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ - file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" - -SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977" -SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b" - -inherit waf-samba - -S = "${WORKDIR}/ldb-${PV}" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=cmocka \ - --builtin-libraries=replace \ - --with-modulesdir=${libdir}/ldb/modules \ - --with-privatelibdir=${libdir}/ldb \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" - -NOAUTOPACKAGEDEBUG = "1" - -FILES_${PN} += "${libdir}/ldb/*" -FILES_${PN}-dbg += "${bindir}/.debug/* \ - ${libdir}/.debug/* \ - ${libdir}/ldb/.debug/* \ - ${libdir}/ldb/modules/ldb/.debug/*" - -FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpyldb-util.*.so.* \ - " -FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ - ${libdir}/.debug/libpyldb-util.*.so.*" -FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb new file mode 100644 index 0000000000..da77a23898 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb @@ -0,0 +1,71 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://ldb.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" + +DEPENDS += "libtdb libtalloc libtevent popt" +RDEPENDS_pyldb += "python3" + +SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ + file://do-not-import-target-module-while-cross-compile.patch \ + file://libldb-fix-musl-libc-unkown-type-error.patch \ + file://libldb-fix-musl-libc-conflict-type-error.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ + file://options-1.5.4.patch \ + " + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[ldap] = ",,openldap" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" + +LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ + file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ + file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" + +SRC_URI[md5sum] = "4d72bbfe7c7fcdf592482a98c853d222" +SRC_URI[sha256sum] = "b9eeb77ecb94f3b53caeff7cbc1850b6294fa937be4364c53a92a62c6548c001" + +inherit waf-samba + +S = "${WORKDIR}/ldb-${PV}" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=cmocka \ + --builtin-libraries=replace \ + --with-modulesdir=${libdir}/ldb/modules \ + --with-privatelibdir=${libdir}/ldb \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" + +NOAUTOPACKAGEDEBUG = "1" + +FILES_${PN} += "${libdir}/ldb/*" +FILES_${PN}-dbg += "${bindir}/.debug/* \ + ${libdir}/.debug/* \ + ${libdir}/ldb/.debug/* \ + ${libdir}/ldb/modules/ldb/.debug/*" + +FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpyldb-util.*.so.* \ + " +FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ + ${libdir}/.debug/libpyldb-util.*.so.*" +FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb index 05fc99bdc7..94543dd1da 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb @@ -27,7 +27,7 @@ inherit autotools-brokensep ptest PACKAGECONFIG ?= "openssl" PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" -PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" +PACKAGECONFIG[openssl] = "--with-crypto,--without-crypto,openssl" PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" # Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 347816b0d1..10583aef27 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -4,7 +4,7 @@ meta-oe This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: dunfell revision: HEAD luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit @@ -14,10 +14,10 @@ e.g. on archlinux based distributions install prerequisites like below pacman -S lib32-gcc-libs lib32-glibc -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][dunfell]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][dunfell][PATCH' You are encouraged to fork the mirror on GitHub https://github.com/openembedded/openembedded-core to share your patches, this is preferred for patch sets consisting of more than one patch. @@ -26,4 +26,4 @@ Other services like gitorious, repo.or.cz or self-hosted setups are of course ac 'git fetch ' works the same on all of them. We recommend GitHub because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -layer maintainer: Khem Raj +dunfell maintainer: Armin Kuster diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb new file mode 100644 index 0000000000..deab6f0466 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb @@ -0,0 +1,57 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd vala gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" + +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + " + +SRC_URI[sha256sum] = "b2b3058bbb72adf98b24707fdbebe58e590644a38145e30d574f685f154bf8aa" + +S = "${WORKDIR}/ModemManager-${PV}" + +PACKAGECONFIG ??= "mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ +" + +PACKAGECONFIG[at] = "--with-at-command-via-dbus" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," +PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" + +EXTRA_OECONF = " \ + --with-udev-base-dir=${nonarch_base_libdir}/udev \ +" +EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/ModemManager \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${libdir}/ModemManager/*.la \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/ModemManager/*.a \ +" + +FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" + +SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb deleted file mode 100644 index 47a86b9194..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ - " - -SRC_URI[sha256sum] = "68b53d0615ba0d3e2bbf386ed029dfe644a6a30a79ab8d85523527bb4e713aff" - -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ -" - -PACKAGECONFIG[at] = "--with-at-command-via-dbus" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -EXTRA_OECONF = " \ - --with-udev-base-dir=${nonarch_base_libdir}/udev \ -" -EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${datadir}/ModemManager \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch index ee0d5edcdb..1f3e683a0f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch @@ -1,4 +1,7 @@ -opcache/config.m4: enable opcache +From a74b42098aededd296ec6a3cd4cf5a17e59d6f29 Mon Sep 17 00:00:00 2001 +From: Claude Bing +Date: Fri, 8 May 2020 10:15:32 -0400 +Subject: [PATCH] opcache/config.m4: enable opcache We can't use AC_TRY_RUN to run programs in a cross compile environment. Set @@ -12,15 +15,18 @@ Signed-off-by: Anuj Mittal update patch to version 7.4.4 Signed-off-by: Changqing Li + +fix issue linking with librt +Signed-off-by: Claude Bing --- - ext/opcache/config.m4 | 194 +------------------------------------------------- - 1 file changed, 3 insertions(+), 191 deletions(-) + ext/opcache/config.m4 | 195 +----------------------------------------- + 1 file changed, 4 insertions(+), 191 deletions(-) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 6c40caf..84ddf1e 100644 +index 6c40cafc1c..6569aa9e1c 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -23,201 +23,13 @@ if test "$PHP_OPCACHE" != "no"; then +@@ -23,201 +23,14 @@ if test "$PHP_OPCACHE" != "no"; then AC_CHECK_FUNCS([mprotect]) AC_MSG_CHECKING(for sysvipc shared memory support) @@ -222,9 +228,10 @@ index 6c40caf..84ddf1e 100644 - AC_MSG_RESULT([no]) - ]) + AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) ++ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) PHP_NEW_EXTENSION(opcache, ZendAccelerator.c \ -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.4.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.4.bb index ff4c28e133..1d93902e72 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.4.bb @@ -81,7 +81,7 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ " PACKAGECONFIG_class-native = "" -PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" +PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip" PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ @@ -93,7 +93,7 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ ,--without-sqlite3 --without-pdo-sqlite \ ,sqlite3" PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" -PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" +PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2" PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" PACKAGECONFIG[pam] = ",,libpam" PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ @@ -110,6 +110,12 @@ export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" +# Adding these flags enables dynamic library support, which is disabled by +# default when cross compiling +# See https://bugs.php.net/bug.php?id=60109 +CFLAGS += " -DHAVE_LIBDL " +LDFLAGS += " -ldl " + EXTRA_OEMAKE = "INSTALL_ROOT=${D}" acpaths = "" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb index 6c06c30aaf..6c22f0e044 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb @@ -18,6 +18,6 @@ RDEPENDS_${PN} += "tk-lib" inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc" +EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update" FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch new file mode 100644 index 0000000000..a571ba2838 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch @@ -0,0 +1,30 @@ +From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Mon, 16 Mar 2020 20:04:06 +1100 +Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference + +xfc->width and xfc->height for the XFixes cursor image returned from +XFixesGetCursorImage(dpy) are accessed without first checking that xfc +is not NULL. This can result in the server sometimes crashing when +moving a Google Chrome window. + +Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)") +Upstream-Status: Accepted +Signed-off-by: Jonathan Liu +--- + src/cursor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cursor.c b/src/cursor.c +index 39e73a6..74a08c6 100644 +--- a/src/cursor.c ++++ b/src/cursor.c +@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) { + + /* retrieve the cursor info + pixels from server: */ + xfc = XFixesGetCursorImage(dpy); +- { ++ if (xfc) { + /* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems. + * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but + * the protocol spec says it's 32 bit per pixel diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 0d84c420a1..e3a1914fef 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -12,6 +12,7 @@ SRC_URI = "git://github.com/LibVNC/x11vnc \ file://starting-fix.patch \ file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + file://src-cursor-fix-xfc-NULL-pointer-dereference.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb deleted file mode 100644 index 9cc2a8e5b4..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "v4l2 and IR applications" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ - file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" -PROVIDES = "libv4l media-ctl" - -DEPENDS = "jpeg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" -DEPENDS_append_libc-musl = " argp-standalone" -DEPENDS_append_class-target = " udev" -LDFLAGS_append = " -pthread" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG ??= "media-ctl" -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," - -SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ - file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ - file://mediactl-pkgconfig.patch \ - file://export-mediactl-headers.patch \ - file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ - file://0005-Define-error_t-and-include-sys-types.h.patch \ - file://0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ - file://0007-Do-not-use-getsubopt.patch \ - " -SRC_URI[md5sum] = "18996bd5e9d83d47055c05de376708cd" -SRC_URI[sha256sum] = "6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d" - -EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" - -VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" - -PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev" - -RPROVIDES_${PN}-dbg += "libv4l-dbg" - -FILES_media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" - -FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" -RDEPENDS_ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" - -FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" - -FILES_${PN} = "${bindir} ${sbindir}" - -FILES_libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ - ${libdir}/libdvbv5*${SOLIBS} \ - ${libdir}/libv4l/*-decomp" - -FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \ - ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" - -PARALLEL_MAKE_class-native = "" -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb new file mode 100644 index 0000000000..193335deaa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb @@ -0,0 +1,56 @@ +SUMMARY = "v4l2 and IR applications" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ + file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" +PROVIDES = "libv4l media-ctl" + +DEPENDS = "jpeg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" +DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS_append_class-target = " udev" +LDFLAGS_append = " -pthread" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG ??= "media-ctl" +PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," + +SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ + file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ + file://mediactl-pkgconfig.patch \ + file://export-mediactl-headers.patch \ + file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ + file://0005-Define-error_t-and-include-sys-types.h.patch \ + file://0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + file://0007-Do-not-use-getsubopt.patch \ + " +SRC_URI[md5sum] = "ff2dd75970683be9a301ed949b3372b3" +SRC_URI[sha256sum] = "25fc42253722401f8742f04dc50a444dfa9b75378e7d09b55035bcbb44c5f342" + +EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" + +VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" + +PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev" + +RPROVIDES_${PN}-dbg += "libv4l-dbg" + +FILES_media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" + +FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" +RDEPENDS_ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" + +FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" + +FILES_${PN} = "${bindir} ${sbindir}" + +FILES_libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ + ${libdir}/libdvbv5*${SOLIBS} \ + ${libdir}/libv4l/*-decomp" + +FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \ + ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" + +PARALLEL_MAKE_class-native = "" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb new file mode 100644 index 0000000000..3883a8dcf0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "PDF transformation/inspection software" +HOMEPAGE = "http://qpdf.sourceforge.net" +LICENSE = "Artistic-2.0" +SECTION = "libs" +DEPENDS = "libpcre zlib libjpeg-turbo" + +SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" + +LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" +SRC_URI[md5sum] = "eb7fb7c6cd5d3036bf4f7a5e3f44d995" +SRC_URI[sha256sum] = "5d2277c738188b7f4e3f01a6db7f2937ed6df54671f1fba834cd3d7ff865827b" + +inherit autotools-brokensep gettext + +# disable random file detection for cross-compile +EXTRA_OECONF = "--without-random \ + --disable-static \ + --disable-check-autofiles \ + " + +EXTRA_OEMAKE_class-target = "LIBTOOL=${HOST_SYS}-libtool" + +LDFLAGS_append_mipsarch = " -latomic" + +S="${WORKDIR}/${BPN}-${PV}" + +# avoid Makefile returning error on 'make clean' before configure was run +CLEANBROKEN = "1" + +DEBIAN_NOAUTONAME_libqpdf = "1" + +PACKAGES =+ "libqpdf" +FILES_libqpdf = "${libdir}/libqpdf.so.*" + +RDEPEND_${PN} = "libqpdf" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb deleted file mode 100644 index 44a5fea841..0000000000 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_9.1.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "PDF transformation/inspection software" -HOMEPAGE = "http://qpdf.sourceforge.net" -LICENSE = "Artistic-2.0" -SECTION = "libs" -DEPENDS = "libpcre zlib libjpeg-turbo" - -SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" - -LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" -SRC_URI[md5sum] = "090d03ab179c281233f8240ade179d54" -SRC_URI[sha256sum] = "3abbbb7907f2e750336b9c97e67b6e806aca91ab537402ec080656d63940ed79" - -inherit autotools-brokensep gettext - -# disable random file detection for cross-compile -EXTRA_OECONF = "--without-random \ - --disable-static \ - --disable-check-autofiles \ - " - -EXTRA_OEMAKE_class-target = "LIBTOOL=${HOST_SYS}-libtool" - -S="${WORKDIR}/${BPN}-${PV}" - -# avoid Makefile returning error on 'make clean' before configure was run -CLEANBROKEN = "1" - -DEBIAN_NOAUTONAME_libqpdf = "1" - -PACKAGES =+ "libqpdf" -FILES_libqpdf = "${libdir}/libqpdf.so.*" - -RDEPEND_${PN} = "libqpdf" diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index e108e0279d..5f1f8a9f9c 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -105,3 +105,23 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp } // SUITE(connections_and_errors) +--- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp ++++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp +@@ -159,7 +159,7 @@ SUITE(redirect_tests) + VERIFY_NO_THROWS(reply.get()); + } + } +- ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,7 +182,7 @@ SUITE(redirect_tests) + ); + }); + } +- ++*/ + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { + #if USING_WINHTTP diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb deleted file mode 100644 index dee5ae2564..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." -SECTION = "libs/network" -HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" -DEPENDS = "openssl websocketpp zlib boost brotli" - -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" - -SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ - file://disable-float-tests.patch \ - file://disable-outside-tests.patch " - -# tag 2.10.15 -SRCREV= "b94bc32ff84e815ba44c567f6fe4af5f5f6b3048" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb new file mode 100644 index 0000000000..5d7dbd8bda --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb @@ -0,0 +1,19 @@ +SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" +DEPENDS = "openssl websocketpp zlib boost brotli" + +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" + +SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ + file://disable-float-tests.patch \ + file://disable-outside-tests.patch " + +# tag 2.10.16 +SRCREV= "18212a2a7967e12d740bfb957e500892b3463c88" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb deleted file mode 100644 index 114ce4607c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Helper application and MIME type associations for file types" -HOMEPAGE = "https://pagure.io/mailcap" -DESCRIPTION = "The mailcap file is used by the metamail program. Metamail reads the \ -mailcap file to determine how it should display non-text or multimedia \ -material. Basically, mailcap associates a particular type of file \ -with a particular program that a mail agent or other program can call \ -in order to handle the file. Mailcap should be installed to allow \ -certain programs to be able to handle non-text files. \ -\ -Also included in this package is the mime.types file which contains a \ -list of MIME types and their filename extension associations, used \ -by several applications e.g. to determine MIME types for filenames." - -SECTION = "System Environment/Base" - -LICENSE = "PD & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=100fcfb84512ccc03ffc7d89ac391305" - -SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" - -SRC_URI[md5sum] = "2c26e18e912a5cf00318fcf7f8f2d747" -SRC_URI[sha256sum] = "d7b023b237d6053bf05ff6786e0663c55c614efcc99cdf856120be13b5c29157" - -do_install() { - oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} -} diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb new file mode 100644 index 0000000000..ff3047f325 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb @@ -0,0 +1,26 @@ +SUMMARY = "Helper application and MIME type associations for file types" +HOMEPAGE = "https://pagure.io/mailcap" +DESCRIPTION = "The mailcap file is used by the metamail program. Metamail reads the \ +mailcap file to determine how it should display non-text or multimedia \ +material. Basically, mailcap associates a particular type of file \ +with a particular program that a mail agent or other program can call \ +in order to handle the file. Mailcap should be installed to allow \ +certain programs to be able to handle non-text files. \ +\ +Also included in this package is the mime.types file which contains a \ +list of MIME types and their filename extension associations, used \ +by several applications e.g. to determine MIME types for filenames." + +SECTION = "System Environment/Base" + +LICENSE = "PD & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" + +SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" + +SRC_URI[md5sum] = "d5701a1a541383c0eda328f4a6518751" +SRC_URI[sha256sum] = "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5" + +do_install() { + oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} +} diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch new file mode 100644 index 0000000000..ac87337694 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch @@ -0,0 +1,44 @@ +From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sun, 10 May 2020 21:22:53 +0800 +Subject: [PATCH] fix bug of do_compile and do_install + +when multiple processes make run in parallel, +because of dependency error will occur. + +Signed-off-by: Wang Mingyu +--- + Makefile | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1dee3680..bea0a0b2 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,9 +28,22 @@ all: $(BUILDDIRS) + $(BUILDDIRS): + $(MAKE) -C $@ + +-multipath multipathd mpathpersist: libmultipath ++multipath multipathd mpathpersist libmpathpersist : libmultipath + mpathpersist: libmpathpersist + ++DEPS_ON_MULTIPATH := \ ++ multipath \ ++ libmultipath/prioritizers \ ++ libmultipath/checkers \ ++ libmultipath/foreign \ ++ multipathd \ ++ mpathpersist \ ++ libmpathpersist ++ ++$(DEPS_ON_MULTIPATH:=.install): libmultipath.install ++mpathpersist.install: libmpathpersist.install ++libdmmp.install libmultipath/foreign.install: mpathpersist.install ++ + $(BUILDDIRS.clean): + $(MAKE) -C ${@:.clean=} clean + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch index 77dd96fee6..17542fd4fd 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch @@ -1,9 +1,12 @@ From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 26 Nov 2018 09:19:17 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski Date: Wed, 19 - Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if present +Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep +17 + 00:00:00 2001 From: Benjamin Marzinski Date: Wed, +19 + Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if +present Use the passed in optflags when compiling as an RPM, and keep the default flags as close as possible to the current fedora flags, while @@ -17,26 +20,20 @@ update this patch to new version Signed-off-by: Changqing Li --- - Makefile.inc | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) + Makefile.inc | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile.inc b/Makefile.inc -index b86cba6..295afb9 100644 +index 42dbb5bf..55a06c60 100644 --- a/Makefile.inc +++ b/Makefile.inc -@@ -85,15 +85,22 @@ TEST_CC_OPTION = $(shell \ +@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \ echo "$(2)"; \ fi) -STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) -ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) -- --OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \ -- -Werror=implicit-function-declaration -Werror=format-security \ -- -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \ -- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ -- --param=ssp-buffer-size=4 +-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,) +ifndef RPM_OPT_FLAGS + STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) + OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ @@ -54,8 +51,14 @@ index b86cba6..295afb9 100644 + -Wno-unused-parameter -Werror=cast-qual \ + -Werror=discarded-qualifiers +-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \ +- -Werror=implicit-function-declaration -Werror=format-security \ +- $(WNOCLOBBERED) \ +- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ +- $(STACKPROT) --param=ssp-buffer-size=4 + CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ -MMD -MP $(CFLAGS) -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 724bef813a..5fd6d668e2 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -1,9 +1,12 @@ From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 26 Sep 2019 16:29:48 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski Date: Fri, 17 - Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline +Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep +17 + 00:00:00 2001 From: Benjamin Marzinski Date: Fri, +17 + Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel +cmdline mpath.wwids with -A This patch adds another option to multipath, "-A", which reads @@ -23,18 +26,15 @@ Update this patch to new version 0.8.2 Signed-off-by: Changqing Li --- - libmultipath/wwids.c | 44 +++++++++++++++++++++++++++++++++++++++++++ - libmultipath/wwids.h | 1 + - multipath/main.c | 9 ++++++++- - multipath/multipath.8 | 3 +++ - multipathd/multipathd.service | 1 + - 5 files changed, 57 insertions(+), 1 deletion(-) + libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + libmultipath/wwids.h | 1 + + 2 files changed, 45 insertions(+) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index ef74812..19c4d68 100644 +index 28a2150d..a0bfa851 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c -@@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \ +@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \ declare_failed_wwid_op(is_failed, false) declare_failed_wwid_op(mark_failed, true) declare_failed_wwid_op(unmark_failed, true) @@ -83,7 +83,7 @@ index ef74812..19c4d68 100644 + return ret; +} diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h -index 0c6ee54..e32a0b0 100644 +index 0c6ee54d..e32a0b0e 100644 --- a/libmultipath/wwids.h +++ b/libmultipath/wwids.h @@ -17,6 +17,7 @@ int remember_wwid(char *wwid); @@ -94,73 +94,6 @@ index 0c6ee54..e32a0b0 100644 enum { WWID_IS_NOT_FAILED = 0, -diff --git a/multipath/main.c b/multipath/main.c -index 96a1146..5fc65ef 100644 ---- a/multipath/main.c -+++ b/multipath/main.c -@@ -139,6 +139,7 @@ usage (char * progname) - fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname); - fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname); - fprintf (stderr, " %s [-v level] -W\n", progname); -+ fprintf (stderr, " %s [-v level] -A\n", progname); - fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname); - fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname); - fprintf (stderr, " %s [-h|-t|-T]\n", progname); -@@ -151,6 +152,8 @@ usage (char * progname) - " -f flush a multipath device map\n" - " -F flush all multipath device maps\n" - " -a add a device wwid to the wwids file\n" -+ " -A add devices from kernel command line mpath.wwids\n" -+ " parameters to wwids file\n" - " -c check if a device should be a path in a multipath device\n" - " -C check if a multipath device has usable paths\n" - " -q allow queue_if_no_path when multipathd is not running\n" -@@ -905,7 +908,7 @@ main (int argc, char *argv[]) - exit(RTVL_FAIL); - multipath_conf = conf; - conf->retrigger_tries = 0; -- while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { -+ while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { - switch(arg) { - case 1: printf("optarg : %s\n",optarg); - break; -@@ -998,6 +1001,10 @@ main (int argc, char *argv[]) - case 'R': - retries = atoi(optarg); - break; -+ case 'A': -+ if (remember_cmdline_wwid() != 0) -+ exit(1); -+ exit(0); - case ':': - fprintf(stderr, "Missing option argument\n"); - usage(argv[0]); -diff --git a/multipath/multipath.8 b/multipath/multipath.8 -index 9cdd05a..1e120f3 100644 ---- a/multipath/multipath.8 -+++ b/multipath/multipath.8 -@@ -167,6 +167,9 @@ itself doesn't attempt to do I/O on the device. - Check if the device specified in the program environment should be - a path in a multipath device. - . -+.B \-A -+add wwids from any kernel command line mpath.wwid parameters to the wwids file -+. - .TP - .B \-U - Check if the device specified in the program environment is a multipath device -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index 17434ce..0fbcc46 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -15,6 +15,7 @@ Type=notify - NotifyAccess=main - LimitCORE=infinity - ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath -+ExecStartPre=-/sbin/multipath -A - ExecStart=/sbin/multipathd -d -s - ExecReload=/sbin/multipathd reconfigure - TasksMax=infinity -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb deleted file mode 100644 index 9e2d86b9a6..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY = "The upstream project used to drive the Device Mapper multipathing driver" - -DESCRIPTION = "It provides tools to manage multipath devices \ -by instructing the device-mapper kernel module what to do. These \ -tools include: \ -1. multipath - Scan the system for multipath devices and assemble them.\ -2. multipathd - Detects when paths fail and execs multipath to update \ -things.\ -3. mpathpersist - Persistent reservation management feature allows \ -cluster management software to manage persistent reservation through \ -mpath device. It processes management requests from callers and hides \ -the management task details. It also handles persistent reservation \ -management of data path life cycle and state changes.\ -4. kpartx - This tool, derived from util-linux's partx, reads partition \ -tables on specified device and create device maps over partitions \ -segments detected. It is called from hotplug upon device maps creation \ -and deletion" - -HOMEPAGE = "http://christophe.varoqui.free.fr/" - -DEPENDS = "libdevmapper \ - lvm2 \ - libaio \ - liburcu \ - readline \ - udev \ - json-c \ - " - -LICENSE = "GPLv2" - -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ - file://multipathd.oe \ - file://multipath.conf.example \ - file://0021-RH-fixup-udev-rules-for-redhat.patch \ - file://0022-RH-Remove-the-property-blacklist-exception-builtin.patch \ - file://0023-RH-don-t-start-without-a-config-file.patch \ - file://0024-RH-use-rpm-optflags-if-present.patch \ - file://0025-RH-add-mpathconf.patch \ - file://0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ - file://0027-RH-warn-on-invalid-regex-instead-of-failing.patch \ - file://0028-RH-reset-default-find_mutipaths-value-to-off.patch \ - file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ - file://0030-Always-use-devmapper.patch \ - file://0031-Always-use-devmapper-for-kpartx.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -SRCREV = "6c3bd369b23e959700527e0e2e6d5b2a1bd36294" - -S = "${WORKDIR}/git" - -inherit systemd pkgconfig - -SYSTEMD_SERVICE_${PN} = "multipathd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -TARGET_CC_ARCH += "${LDFLAGS}" - -# multipath-tools includes a copy of the valgrind.h header -# file and uses the macros to suppress some false positives. However, -# that only works on ARM when thumb is disabled. Otherwise one gets: -# Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' -# ../Makefile.inc:66: recipe for target 'debug.o' failed -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -# The exact version of SYSTEMD does not matter but should be greater than 209. -# -EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ - OPTFLAGS="${CFLAGS}" \ - bindir=${base_sbindir} \ - LIB=${base_libdir} libdir=${base_libdir}/multipath \ - unitdir=${systemd_system_unitdir} \ - libudevdir=${nonarch_base_libdir}/udev \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ - ' - -do_install() { - oe_runmake install - - # We copy an initscript, but do not start multipathd at init time. - # - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then - install -d ${D}${sysconfdir}/init.d - cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd - fi - - sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ - ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules - - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/multipath.conf.example \ - ${D}${sysconfdir}/multipath.conf.example -} - -FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" - -PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${base_libdir}/lib*.so.* \ - ${base_libdir}/multipath/lib*.so*" -RDEPENDS_${PN} += "${PN}-libs bash" - -PROVIDES += "device-mapper-multipath" -RPROVIDES_${PN} += "device-mapper-multipath" -RPROVIDES_${PN}-libs += "device-mapper-multipath-libs" - -FILES_${PN}-dev += "${base_libdir}/pkgconfig" - -PACKAGES =+ "kpartx" -FILES_kpartx = "${base_sbindir}/kpartx \ - ${nonarch_base_libdir}/udev/kpartx_id \ - " - -RDEPENDS_${PN} += "kpartx" 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 new file mode 100644 index 0000000000..2795a8d091 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -0,0 +1,117 @@ +SUMMARY = "The upstream project used to drive the Device Mapper multipathing driver" + +DESCRIPTION = "It provides tools to manage multipath devices \ +by instructing the device-mapper kernel module what to do. These \ +tools include: \ +1. multipath - Scan the system for multipath devices and assemble them.\ +2. multipathd - Detects when paths fail and execs multipath to update \ +things.\ +3. mpathpersist - Persistent reservation management feature allows \ +cluster management software to manage persistent reservation through \ +mpath device. It processes management requests from callers and hides \ +the management task details. It also handles persistent reservation \ +management of data path life cycle and state changes.\ +4. kpartx - This tool, derived from util-linux's partx, reads partition \ +tables on specified device and create device maps over partitions \ +segments detected. It is called from hotplug upon device maps creation \ +and deletion" + +HOMEPAGE = "http://christophe.varoqui.free.fr/" + +DEPENDS = "libdevmapper \ + lvm2 \ + libaio \ + liburcu \ + readline \ + udev \ + json-c \ + " + +LICENSE = "GPLv2" + +SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ + file://multipathd.oe \ + file://multipath.conf.example \ + file://0021-RH-fixup-udev-rules-for-redhat.patch \ + file://0022-RH-Remove-the-property-blacklist-exception-builtin.patch \ + file://0023-RH-don-t-start-without-a-config-file.patch \ + file://0024-RH-use-rpm-optflags-if-present.patch \ + file://0025-RH-add-mpathconf.patch \ + file://0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ + file://0027-RH-warn-on-invalid-regex-instead-of-failing.patch \ + file://0028-RH-reset-default-find_mutipaths-value-to-off.patch \ + file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ + file://0030-Always-use-devmapper.patch \ + file://0031-Always-use-devmapper-for-kpartx.patch \ + file://0001-fix-bug-of-do_compile-and-do_install.patch \ + " + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +SRCREV = "d4915917655b3d205aa0e339ca13080ed8182d0d" + +S = "${WORKDIR}/git" + +inherit systemd pkgconfig + +SYSTEMD_SERVICE_${PN} = "multipathd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +TARGET_CC_ARCH += "${LDFLAGS}" + +# multipath-tools includes a copy of the valgrind.h header +# file and uses the macros to suppress some false positives. However, +# that only works on ARM when thumb is disabled. Otherwise one gets: +# Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' +# ../Makefile.inc:66: recipe for target 'debug.o' failed +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +# The exact version of SYSTEMD does not matter but should be greater than 209. +# +EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ + OPTFLAGS="${CFLAGS}" \ + bindir=${base_sbindir} \ + LIB=${base_libdir} libdir=${base_libdir}/multipath \ + unitdir=${systemd_system_unitdir} \ + libudevdir=${nonarch_base_libdir}/udev \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ + ' + +do_install() { + oe_runmake install + + # We copy an initscript, but do not start multipathd at init time. + # + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then + install -d ${D}${sysconfdir}/init.d + cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd + fi + + sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ + ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules + + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/multipath.conf.example \ + ${D}${sysconfdir}/multipath.conf.example +} + +FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" + +PACKAGES =+ "${PN}-libs" +FILES_${PN}-libs = "${base_libdir}/lib*.so.* \ + ${base_libdir}/multipath/lib*.so*" +RDEPENDS_${PN} += "${PN}-libs bash" + +PROVIDES += "device-mapper-multipath" +RPROVIDES_${PN} += "device-mapper-multipath" +RPROVIDES_${PN}-libs += "device-mapper-multipath-libs" + +FILES_${PN}-dev += "${base_libdir}/pkgconfig" + +PACKAGES =+ "kpartx" +FILES_kpartx = "${base_sbindir}/kpartx \ + ${nonarch_base_libdir}/udev/kpartx_id \ + " + +RDEPENDS_${PN} += "kpartx" diff --git a/meta-openembedded/meta-perl/README b/meta-openembedded/meta-perl/README index 67f291079f..fed2da3451 100644 --- a/meta-openembedded/meta-perl/README +++ b/meta-openembedded/meta-perl/README @@ -52,7 +52,7 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core - branch: master + branch: dunfell revision: HEAD prio: default @@ -75,14 +75,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org with -'[meta-perl]' in the subject. +'[meta-perl][dunfell]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-perl][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-perl][dunfell][PATCH' -Layer maintainers: - Hongxu Jia - Tim "moto-timo" Orling +dunfell maintainers: Armin kuster License ------- diff --git a/meta-openembedded/meta-python/README b/meta-openembedded/meta-python/README index 705b035d9e..237dff3021 100644 --- a/meta-openembedded/meta-python/README +++ b/meta-openembedded/meta-python/README @@ -13,12 +13,12 @@ The meta-python layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: dunfell revision: HEAD URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: dunfell revision: HEAD Please follow the recommended setup procedures of your OE distribution. @@ -35,15 +35,13 @@ comments and patch review. It is subscriber only, so please register before posting. Send pull requests to openembedded-devel@lists.openembedded.org with -'[meta-python]' in the subject. +'[meta-python][dunfell]' in the subject. When sending single patches, please use something like: -'git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix=meta-python][PATCH' +'git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix=meta-python][dunfell][PATCH' Maintenance ------------------------- -Layer Maintainers: - Tim "moto-timo" Orling - Derek Straka +dunfell Maintainers: Armin Kuster diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch deleted file mode 100644 index c4d817849f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Wed, 9 Apr 2014 13:18:33 +0200 -Subject: [PATCH] Add functionality to add own objects to internal object - - list - -In some case the tests might want to create dynamically dbus objects which extended -functionality from own class definitions within templates. In such cases we need to -register those objects with the internal object manager of dbusmock. - -Signed-off-by: Simon Busch - ---- - dbusmock/__init__.py | 4 ++-- - dbusmock/mockobject.py | 8 ++++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py -index 8a482ab..3d5d71a 100644 ---- a/dbusmock/__init__.py -+++ b/dbusmock/__init__.py -@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+' - __version__ = '0.16.7' - - from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE, -- OBJECT_MANAGER_IFACE, get_object, get_objects) -+ OBJECT_MANAGER_IFACE, get_object, get_objects, add_object) - from dbusmock.testcase import DBusTestCase - - __all__ = ['DBusMockObject', 'MOCK_IFACE', 'OBJECT_MANAGER_IFACE', -- 'DBusTestCase', 'get_object', 'get_objects'] -+ 'DBusTestCase', 'get_object', 'get_objects', 'add_object'] -diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py -index 586dbad..e4f130f 100644 ---- a/dbusmock/mockobject.py -+++ b/dbusmock/mockobject.py -@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup - # Helper API for templates - # - -+def add_object(path, obj): -+ if path in objects: -+ raise dbus.exceptions.DBusException( -+ 'org.freedesktop.DBus.Mock.NameError', -+ 'object %s already exists' % path) -+ -+ objects[path] = obj -+ - - def get_objects(): - '''Return all existing object paths''' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch deleted file mode 100644 index 06ab1f05e2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Wed, 9 Apr 2014 13:20:33 +0200 -Subject: [PATCH] Add possibility to import templates from packages - -Does not have any unit tests yet. - -Signed-off-by: Simon Busch - ---- - dbusmock/mockobject.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py -index e4f130f..389df70 100644 ---- a/dbusmock/mockobject.py -+++ b/dbusmock/mockobject.py -@@ -46,6 +46,9 @@ def load_module(name): - exec(f.read(), mod.__dict__, mod.__dict__) - return mod - -+ if '.' in name: -+ return importlib.import_module(name) -+ - return importlib.import_module('dbusmock.templates.' + name) - - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc index 3199b56a03..d69d5273ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a" SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb" SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" -RDEPENDS_${PN} += "${PYTHON_PN}-six" +RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-ctypes" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc index 09384dae17..c77a49191e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable.inc @@ -29,6 +29,11 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-html \ +" + RDEPENDS_${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc index 0cc9114754..a6dc21cf11 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc @@ -15,6 +15,9 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" RDEPENDS_${PN} = "\ ${PYTHON_PN}-core \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-resource \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb index b3739fda8c..7ff8049e52 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.3.0.bb @@ -12,5 +12,9 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-crypt \ ${PYTHON_PN}-ctypes \ " +RDEPENDS_${PN}_class-nativesdk += " \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-ctypes \ +" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch new file mode 100644 index 0000000000..c4d817849f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch @@ -0,0 +1,52 @@ +From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Wed, 9 Apr 2014 13:18:33 +0200 +Subject: [PATCH] Add functionality to add own objects to internal object + + list + +In some case the tests might want to create dynamically dbus objects which extended +functionality from own class definitions within templates. In such cases we need to +register those objects with the internal object manager of dbusmock. + +Signed-off-by: Simon Busch + +--- + dbusmock/__init__.py | 4 ++-- + dbusmock/mockobject.py | 8 ++++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py +index 8a482ab..3d5d71a 100644 +--- a/dbusmock/__init__.py ++++ b/dbusmock/__init__.py +@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+' + __version__ = '0.16.7' + + from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE, +- OBJECT_MANAGER_IFACE, get_object, get_objects) ++ OBJECT_MANAGER_IFACE, get_object, get_objects, add_object) + from dbusmock.testcase import DBusTestCase + + __all__ = ['DBusMockObject', 'MOCK_IFACE', 'OBJECT_MANAGER_IFACE', +- 'DBusTestCase', 'get_object', 'get_objects'] ++ 'DBusTestCase', 'get_object', 'get_objects', 'add_object'] +diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py +index 586dbad..e4f130f 100644 +--- a/dbusmock/mockobject.py ++++ b/dbusmock/mockobject.py +@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup + # Helper API for templates + # + ++def add_object(path, obj): ++ if path in objects: ++ raise dbus.exceptions.DBusException( ++ 'org.freedesktop.DBus.Mock.NameError', ++ 'object %s already exists' % path) ++ ++ objects[path] = obj ++ + + def get_objects(): + '''Return all existing object paths''' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch new file mode 100644 index 0000000000..06ab1f05e2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch @@ -0,0 +1,27 @@ +From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Wed, 9 Apr 2014 13:20:33 +0200 +Subject: [PATCH] Add possibility to import templates from packages + +Does not have any unit tests yet. + +Signed-off-by: Simon Busch + +--- + dbusmock/mockobject.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py +index e4f130f..389df70 100644 +--- a/dbusmock/mockobject.py ++++ b/dbusmock/mockobject.py +@@ -46,6 +46,9 @@ def load_module(name): + exec(f.read(), mod.__dict__, mod.__dict__) + return mod + ++ if '.' in name: ++ return importlib.import_module(name) ++ + return importlib.import_module('dbusmock.templates.' + name) + + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb new file mode 100644 index 0000000000..cd760ab893 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbusmock_0.16.7.bb @@ -0,0 +1,25 @@ +# Copyright (c) 2014 LG Electronics, Inc. + +SUMMARY = "With this program/Python library you can easily create mock objects on D-Bus" +AUTHOR = "Martin Pitt " + +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI[md5sum] = "80f8caa838fad96483a8751e11d384f9" +SRC_URI[sha256sum] = "2d2ea892fa4633c3ec6ac1e912120ec493047a5c6522849b7d1c95ad755bce75" + +SRC_URI += " \ + file://0001-Add-functionality-to-add-own-objects-to-internal-obj.patch \ + file://0002-Add-possibility-to-import-templates-from-packages.patch \ +" + +PYPI_PACKAGE = "python-dbusmock" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-dbus \ + ${PYTHON_PN}-pygobject \ + ${PYTHON_PN}-xml \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb index 68cd723acc..cdfe5496ad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.0.1.bb @@ -10,3 +10,5 @@ SRC_URI[md5sum] = "72219f46ca440b657bf227500731bdf1" SRC_URI[sha256sum] = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c" BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb index 93df83ad3c..ce2618b817 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools3 python3native pypi -RDEPENDS_${PN} += "${PYTHON_PN}-datetime" +RDEPENDS_${PN} += "${PYTHON_PN}-datetime ${PYTHON_PN}-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.5.bb index d658bd621e..60631d43a0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.5.bb @@ -8,4 +8,6 @@ SRC_URI[sha256sum] = "e9e4dc500f1306a638df0f19d4ef976a623b260fc614c55cb1fd0d8410 inherit pypi setuptools3 +RDEPENDS_${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-threading ${PYTHON_PN}-unixadmin" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest index 5cec711696..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.5.bb index b8dd0d7474..ef19478885 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.5.bb @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "ad352ee1dc28b9746a15451c0c53e9d7" SRC_URI[sha256sum] = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef" inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-logging ${PYTHON_PN}-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.4.0.bb index 92eb8bfb55..fc7a47a43d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.4.0.bb @@ -8,6 +8,7 @@ SRC_URI = "git://github.com/matze/pkgconfig.git" SRCREV ?= "8af0102346847e8873af8e76ab3f34ba9da806e2" RDEPENDS_${PN} = "pkgconfig \ + ${PYTHON_PN}-shell \ " inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest index 40c284799d..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest @@ -1,2 +1,3 @@ #!/bin/sh -pytest + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest index 5cec711696..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest index 5cec711696..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest index 5cec711696..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest index 27c9e59c82..15c3f6282d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.8.1.bb index 73aaf9e46a..ff66aeaa2b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.8.1.bb @@ -11,3 +11,5 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native" inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += "${PYTHON_PN}-netclient" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest index 5cec711696..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1/run-ptest index 5cec711696..b63c4de0d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb index 931bc6f7cb..807e7b2de5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb @@ -14,4 +14,6 @@ inherit pypi setuptools3 S = "${WORKDIR}/pydbus-${PV}" -RDEPENDS_${PN} = "${PYTHON_PN}-pygobject" +RDEPENDS_${PN} = "${PYTHON_PN}-pygobject \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb index 04aa9b47f0..ee96a079a7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_1.9.0.bb @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "8b833a3fa30197455df79424f30c8c3f" SRC_URI[sha256sum] = "8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd" inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest index 5cec711696..ea429ba21e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest @@ -1,3 +1,4 @@ #!/bin/sh -pytest +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.11.bb deleted file mode 100644 index a4b8aa3988..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.11.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "A pure Python netlink and Linux network configuration library" -LICENSE = "GPLv2 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" - -SRC_URI[md5sum] = "7005db01604663fc2ecc089925980e05" -SRC_URI[sha256sum] = "05e959f1a89d715158b91fe83b67946a4441e5e098cc225f4df78a3765ac4af2" - -inherit setuptools3 pypi ptest - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-unixadmin \ -" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb new file mode 100644 index 0000000000..440f8993c9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb @@ -0,0 +1,37 @@ +SUMMARY = "A pure Python netlink and Linux network configuration library" +LICENSE = "GPLv2 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" + +SRC_URI[md5sum] = "4370e9a5875486a1223705ea9b001eff" +SRC_URI[sha256sum] = "0157801c5496177856c3296b590065e691b041a3adde6fb8ffad2a8d05013ed3" + +inherit setuptools3 pypi ptest + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-unixadmin \ +" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-fcntl \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.7.bb index 5ef7140283..53251aa55c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.7.bb @@ -9,6 +9,7 @@ SRC_URI[sha256sum] = "cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade inherit pypi setuptools3 RDEPENDS_${PN} += " \ + ${PYTHON_PN}-numbers \ ${PYTHON_PN}-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest index 5cec711696..e301963f96 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest @@ -1,3 +1,4 @@ #!/bin/sh -pytest + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb index b09005ec9e..1533a895f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb @@ -15,6 +15,11 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-stringold \ + " + RDEPENDS_${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb index f39847ffa7..49a3628f41 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb @@ -17,5 +17,6 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-misc \ ${PYTHON_PN}-six \ ${PYTHON_PN}-threading \ + ${PYTHON_PN}-fcntl \ libudev \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb index b5425b8c95..17868a25dd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.3.bb @@ -13,6 +13,7 @@ SRC_URI[sha256sum] = "e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e RDEPENDS_${PN} += "\ ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-netclient \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb index f8d28b33af..a1fc3831fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.3.3.bb @@ -8,7 +8,14 @@ SRC_URI[sha256sum] = "bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217a PYPI_PACKAGE = "setuptools_scm" inherit pypi setuptools3 -RDEPENDS_${PN}_class-target = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-debugger ${PYTHON_PN}-json" -RDEPENDS_${PN}_class-native = "${PYTHON_PN}-setuptools-native" +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-setuptools \ +" +RDEPENDS_${PN}_class-native = "\ + ${PYTHON_PN}-setuptools-native \ +" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_1.0.1.bb index b54399e1c8..58735c1c02 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_1.0.1.bb @@ -26,6 +26,7 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-html \ ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ ${PYTHON_PN}-netclient \ ${PYTHON_PN}-netserver \ ${PYTHON_PN}-numbers \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb index 1019081f38..40db3c071a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb @@ -10,6 +10,8 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native" inherit pypi setuptools3 -RDEPENDS_${PN} += "${PYTHON_PN}-more-itertools" +RDEPENDS_${PN} += "${PYTHON_PN}-compression \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-more-itertools" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README index 7b60630700..7adeff833a 100644 --- a/meta-openembedded/meta-webserver/README +++ b/meta-openembedded/meta-webserver/README @@ -13,14 +13,14 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git subdirectory: meta -branch: master +branch: dunfell revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-oe.git subdirectory: meta-oe -branch: master +branch: dunfell revision: HEAD @@ -52,9 +52,9 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver]' in the subject. +with '[meta-webserver][dunfell]' in the subject. -Layer maintainer: Derek Straka +dunfell Maintainer: Armin Kuster License diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb index 5200111520..9b80bbff67 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb @@ -20,9 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ SRC_URI_append_class-target = " \ file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ file://init \ - file://apache2-volatile.conf \ file://apache2.service \ - file://volatiles.04_apache2 \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" @@ -128,16 +126,10 @@ do_install_append_class-target() { -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service - elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf deleted file mode 100644 index ff2c587046..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/apache2 0755 root root - -d /var/log/apache2 0755 root root - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service index 9b5548c761..25d43acf8e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service @@ -5,6 +5,10 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=simple Environment=LANG=C +ExecStartPre=mkdir -p /var/log/apache2 +ExecStartPre=mkdir -p /var/run/apache2 +ExecStartPre=chmod -R 0755 /var/log/apache2 +ExecStartPre=chmod -R 0755 /var/run/apache2 ExecStart=@SBINDIR@/httpd -DFOREGROUND -D SSL -D PHP5 -k start ExecStop=@BASE_BINDIR@/kill -WINCH ${MAINPID} KillSignal=SIGCONT diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init index 758d133b9e..80a7ebfcb2 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init @@ -97,6 +97,11 @@ do_start() return 1 fi + mkdir -p /var/log/apache2 + chmod -R 0755 /var/log/apache2 + mkdir -p /var/run/apache2 + chmod -R 0755 /var/run/apache2 + if apache_conftest ; then $APACHECTL start apache_wait_start $? diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 deleted file mode 100644 index 922075b1bd..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 +++ /dev/null @@ -1,3 +0,0 @@ -# -d root root 0755 /var/run/apache2 none -d root root 0755 /var/log/apache2 none diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 2824c66529..de080a2b01 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -90,7 +90,7 @@ do_install () { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/${BPN} - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - echo "d /${localstatedir}/log/${BPN} 0755 root root -" \ + echo "d ${localstatedir}/log/${BPN} 0755 root root -" \ >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi install -d ${D}${sysconfdir}/${BPN} @@ -139,6 +139,8 @@ do_install () { -e 's,@BASE_BINDIR@,${base_bindir},g' \ ${D}${systemd_unitdir}/system/nginx.service fi + + rm -rf ${D}${localstatedir}/log/ } pkg_postinst_${PN} () { diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index 70ad47a2d1..eaa17175d6 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -1,11 +1,11 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: dunfell revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: master +branch: dunfell revision: HEAD meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -14,9 +14,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][dunfell]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][dunfell][PATCH' -Layer maintainer: Kai Kang +dunfell Maintainer: Armin Kuster diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.0.bb deleted file mode 100644 index 5e0f44e296..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = " \ - dbus \ - dbus-glib \ - libnotify \ - libxfce4util \ - libxfce4ui \ - xfconf \ - xfce4-panel \ -" - -inherit xfce-app - -SRC_URI[md5sum] = "1724fcb635bbab44c9f62c69734e446d" -SRC_URI[sha256sum] = "c1d126a81604ff967e4655f06427763bf559c338ba629c95cb9aa7f5d6dc8ba6" - -# 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.1.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb new file mode 100644 index 0000000000..aed5ce4dce --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "Easily themable notification daemon with transparency effects" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + dbus \ + dbus-glib \ + libnotify \ + libxfce4util \ + libxfce4ui \ + xfconf \ + xfce4-panel \ +" + +inherit xfce-app + +SRC_URI[md5sum] = "58e70621d6b9e0e66399ed41ab402a47" +SRC_URI[sha256sum] = "9b5274999c89bf296a7de03b375e8233eef37940b7444502130b92dfb6a089b4" + +# 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-xfce/xfconf/xfconf_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.1.bb deleted file mode 100644 index 8da96a4205..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Xfce configuration daemon and utilities" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" - -inherit xfce gtk-doc gobject-introspection - -EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" - -SRC_URI[md5sum] = "cb51a59e2a89d05232f825ad8c74a7c0" -SRC_URI[sha256sum] = "b893e0a329aee00902fec2f0509f56916c9dcc7844e1b1f9e3c7399458290d59" - -FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ - ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ - ${datadir}/dbus-1/services/org.xfce.Xfconf.service" - -FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" - -PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb new file mode 100644 index 0000000000..893a32f420 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "Xfce configuration daemon and utilities" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" + +inherit xfce gtk-doc gobject-introspection + +EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" + +SRC_URI[md5sum] = "769b74d354aa65e0013edc6823b78e48" +SRC_URI[sha256sum] = "1e7086cc5a63219e375c95a1dfd10ad7098c2586f55ac209e66aef61b969f255" + +FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ + ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ + ${datadir}/dbus-1/services/org.xfce.Xfconf.service" + +FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" + +PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb deleted file mode 100644 index 617e14f8e1..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" - -inherit xfce update-alternatives features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" -SRC_URI[md5sum] = "b20bd22bdbe1b17f76a139fd74e072a9" -SRC_URI[sha256sum] = "100781a18070762e8f34c1d450e767586576753d567f76a8c32818284f511428" - -PACKAGECONFIG ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ - xpresent \ - startup-notification \ -" - -PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" -PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -python populate_packages_prepend () { - themedir = d.expand('${datadir}/themes') - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES_DYNAMIC += "^xfwm4-theme-.*" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" -ALTERNATIVE_PRIORITY[x-window-manager] = "30" - -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb new file mode 100644 index 0000000000..b6066a5266 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" + +inherit xfce update-alternatives features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" +SRC_URI[md5sum] = "6d61d07b6ea88a429c43e1b9c3293eb8" +SRC_URI[sha256sum] = "b15b40342596a3b6ab5167a58371262adf5484e165cb25a31fef42f0aa8ffd92" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ + xpresent \ + startup-notification \ +" + +PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" +PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-theme-.*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ +" diff --git a/meta-raspberrypi/README.md b/meta-raspberrypi/README.md index 2125767933..898426d8f2 100644 --- a/meta-raspberrypi/README.md +++ b/meta-raspberrypi/README.md @@ -5,6 +5,7 @@ Yocto BSP layer for the Raspberry Pi boards - . [![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi1/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi1) [![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi2/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi2) [![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi3/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi3) +[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi4/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi4) [![Documentation Status](https://readthedocs.org/projects/meta-raspberrypi/badge/?version=latest)](https://meta-raspberrypi.readthedocs.io/en/latest/?badge=latest) [![Matrix](https://img.shields.io/matrix/meta-raspberrypi:cub.icu.svg?server_fqdn=matrix.cub.icu)](https://matrix.to/#/#meta-raspberrypi:cub.icu) @@ -49,8 +50,30 @@ This layer depends on: 2. Add this layer to bblayers.conf and the dependencies above 3. Set MACHINE in local.conf to one of the supported boards 4. bitbake core-image-base -5. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used) -6. Boot your RPI. +5. Use bmaptool to copy the generated .wic.bz2 file to the SD card +6. Boot your RPI + +## Quick Start with kas + +1. Install kas build tool from PyPi (sudo pip3 install kas) +2. kas build meta-raspberrypi/kas-poky-rpi.yml +3. Use bmaptool to copy the generated .wic.bz2 file to the SD card +4. Boot your RPI + +To adjust the build configuration with specific options (I2C, SPI, ...), simply add +a section as follows: + +``` +local_conf_header: + rpi-specific: | + ENABLE_I2C = "1" + RPI_EXTRA_CONFIG = "dtoverlay=pi3-disable-bt" +``` + +To configure the machine, you have to update the `machine` variable. +And the same for the `distro`. + +For further information, you can read more at ## Maintainers diff --git a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass index 177988e615..43426b2755 100644 --- a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass +++ b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass @@ -58,7 +58,7 @@ do_image_rpi_sdimg[depends] = " \ rpi-config:do_deploy \ ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ - ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot-default-script:do_deploy', '',d)} \ " do_image_rpi_sdimg[recrdeps] = "do_build" diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index c958587b2b..4ed79591fc 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior zeus" +LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior zeus dunfell" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" @@ -32,3 +32,6 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ " + +DEFAULT_TEST_SUITES_remove_rpi = "parselogs" +DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 9772fd9d65..7a87bd13a0 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -5,7 +5,7 @@ include conf/machine/include/rpi-default-providers.inc SOC_FAMILY = "rpi" include conf/machine/include/soc-family.inc -IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" +IMAGE_FSTYPES ?= "tar.bz2 ext3 wic.bz2 wic.bmap" WKS_FILE ?= "sdimage-raspberrypi.wks" XSERVER = " \ @@ -16,6 +16,7 @@ XSERVER = " \ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ overlays/dwc2.dtbo \ overlays/gpio-key.dtbo \ overlays/hifiberry-amp.dtbo \ @@ -25,9 +26,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/i2c-rtc.dtbo \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ + overlays/miniuart-bt.dtbo \ overlays/mcp2515-can0.dtbo \ - overlays/pi3-disable-bt.dtbo \ - overlays/pi3-miniuart-bt.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ overlays/pitft28-capacitive.dtbo \ @@ -76,7 +76,9 @@ MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa blue # Raspberry Pi has no hardware clock MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}" + # Set Raspberrypi splash image SPLASH = "psplash-raspberrypi" diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 5231a84e1c..181b9364ba 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -8,3 +8,8 @@ PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "v PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg" + +PREFERRED_PROVIDER_virtual/libomxil ?= "userland" +VIRTUAL-RUNTIME_libomxil = "userland" + +PREFERRED_PROVIDER_u-boot-default-script ??= "rpi-u-boot-scr" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 23b59ed955..65e3302c3d 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -31,4 +31,5 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image" KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" +VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub8.bin" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3.conf b/meta-raspberrypi/conf/machine/raspberrypi3.conf index 581e47c8f5..dafb66e5a0 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -17,4 +17,5 @@ SDIMG_KERNELIMAGE ?= "kernel7.img" UBOOT_MACHINE = "rpi_3_32b_config" SERIAL_CONSOLES ?= "115200;ttyS0" +VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub7.bin" diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md index a2b68d8ce6..843247aaac 100644 --- a/meta-raspberrypi/docs/extra-build-config.md +++ b/meta-raspberrypi/docs/extra-build-config.md @@ -184,6 +184,10 @@ When using device tree kernels, set this variable to enable I2C: ENABLE_I2C = "1" +Furthermore, to auto-load I2C kernel modules set: + + KERNEL_MODULE_AUTOLOAD_rpi += "i2c-dev i2c-bcm2708" + ## Enable PiTFT support Basic support for using PiTFT screens can be enabled by adding below in diff --git a/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index c43da01ae8..8275c6d2ef 100644 --- a/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -15,5 +15,5 @@ do_configure_prepend_rpi() { echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri fi } -RDEPENDS_${PN}_append_rpi = " userland" +RDEPENDS_${PN}_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" diff --git a/meta-raspberrypi/kas-poky-rpi.yml b/meta-raspberrypi/kas-poky-rpi.yml new file mode 100644 index 0000000000..2d80a57ed0 --- /dev/null +++ b/meta-raspberrypi/kas-poky-rpi.yml @@ -0,0 +1,58 @@ +header: + version: 8 + +machine: raspberrypi4 +distro: poky +target: + - core-image-base + +repos: + meta-raspberry: + + poky: + url: https://git.yoctoproject.org/git/poky + refspec: master + layers: + meta: + meta-poky: + meta-yocto-bsp: + + meta-openembedded: + url: http://git.openembedded.org/meta-openembedded + refspec: master + layers: + meta-oe: + meta-python: + meta-networking: + meta-perl: + + meta-qt5: + url: https://github.com/meta-qt5/meta-qt5/ + refspec: master + +bblayers_conf_header: + standard: | + POKY_BBLAYERS_CONF_VERSION = "2" + BBPATH = "${TOPDIR}" + BBFILES ?= "" +local_conf_header: + reduce_diskspace: | + INHERIT += "rm_work_and_downloads" + standard: | + CONF_VERSION = "1" + PACKAGE_CLASSES = "package_rpm" + SDKMACHINE = "x86_64" + USER_CLASSES = "buildstats image-mklibs image-prelink" + PATCHRESOLVE = "noop" + debug-tweaks: | + EXTRA_IMAGE_FEATURES = "debug-tweaks" + diskmon: | + BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" diff --git a/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py b/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py new file mode 100644 index 0000000000..5cf9af17cb --- /dev/null +++ b/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py @@ -0,0 +1,15 @@ +from oeqa.runtime.cases.parselogs import * + +rpi_errors = [ + 'bcmgenet fd580000.genet: failed to get enet-eee clock', + 'bcmgenet fd580000.genet: failed to get enet-wol clock', + 'bcmgenet fd580000.genet: failed to get enet clock', +] + +ignore_errors['raspberrypi4'] = rpi_errors + common_errors +ignore_errors['raspberrypi4-64'] = rpi_errors + common_errors +ignore_errors['raspberrypi3'] = rpi_errors + common_errors +ignore_errors['raspberrypi3-64'] = rpi_errors + common_errors + +class ParseLogsTestRpi(ParseLogsTest): + pass diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 869ea3a5cc..5e4b772684 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,10 +1,10 @@ -RPIFW_DATE ?= "20191210" -SRCREV ?= "9d6be5b07e81bdfb9c4b9a560e90fbc7477fdc6e" +RPIFW_DATE ?= "20200504" +SRCREV ?= "7eff9f6774bb43bfd61e749a0b45ffddc98c2311" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "645e812765c8b4ca05d6cb47a1f67ab0" -SRC_URI[sha256sum] = "484d52caed909fcafbf593cc3e726ea44a9218db7f0aeec843b825797eb9b0fc" +SRC_URI[md5sum] = "05cd161dca5a6f02684794960913e04c" +SRC_URI[sha256sum] = "77ad450dd7cabb58ca04a18fd704844df6e642374346cf006a07edca46615af1" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb b/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb index 593fc903e9..4cb8978e47 100644 --- a/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb +++ b/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb @@ -24,3 +24,5 @@ do_deploy() { } addtask do_deploy after do_compile before do_build + +PROVIDES += "u-boot-default-script" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index 95015f4942..9ce6425636 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1 +1 @@ -DEPENDS_append_rpi = " rpi-u-boot-scr" +DEPENDS_append_rpi = " u-boot-default-script" diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb index 852e3a6043..3dbe96d435 100644 --- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -2,6 +2,8 @@ DESCRIPTION = "RaspberryPi Test Packagegroup" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup COMPATIBLE_MACHINE = "^rpi$" @@ -23,8 +25,6 @@ RDEPENDS_${PN} = "\ " RRECOMMENDS_${PN} = "\ - bigbuckbunny-1080p \ - bigbuckbunny-480p \ - bigbuckbunny-720p \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \ ${MACHINE_EXTRA_RRECOMMENDS} \ " diff --git a/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend index 09e3ec9d05..41622aa506 100644 --- a/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend +++ b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SPLASH_IMAGES_append_rpi = " file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" -ALTERNATIVE_PRIORITY_psplash-raspberrypi[psplash] = "200" +SPLASH_IMAGES_rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" diff --git a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb index c3254bcf94..d5653cb0db 100644 --- a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb +++ b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb @@ -10,13 +10,13 @@ inherit pypi SRC_URI += "file://0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch" -inherit setuptools +inherit setuptools3 COMPATIBLE_MACHINE = "^rpi$" RDEPENDS_${PN} = "\ - python-logging \ - python-threading \ + python3-logging \ + python3-threading \ " SRC_URI[md5sum] = "cefc45422833dcafcd59b78dffc540f4" diff --git a/meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch b/meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch new file mode 100644 index 0000000000..0bda014505 --- /dev/null +++ b/meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch @@ -0,0 +1,43 @@ +mesa: querying dma_buf_modifiers for specific formats + +mesa wl_drm protocol is the backend for wayland server side which requires +the dmabuf modifiers for some DRM formats on specific devices like RPI. +Currently there is no support of giving any dmabuf modifiers on wl_drm protocol. +This dma_buf modifiers allows EGL implementations to add extra attributes +to drm_fourcc format. + +Upstream-Status: Pending + +Signed-off-by: Balaji Velmurugan + +--- a/src/gallium/state_trackers/dri/dri2.c ++++ b/src/gallium/state_trackers/dri/dri2.c +@@ -1366,14 +1366,28 @@ dri2_from_planar(__DRIimage *image, int + return img; + } + ++static boolean ++dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max, ++ uint64_t *modifiers, unsigned int *external_only, ++ int *count); + static __DRIimage * + dri2_from_fds(__DRIscreen *screen, int width, int height, int fourcc, + int *fds, int num_fds, int *strides, int *offsets, + void *loaderPrivate) + { ++ uint64_t modifier= DRM_FORMAT_MOD_INVALID; ++ unsigned int external_only= 0; ++ int count= 0; ++ boolean result; ++ result= dri2_query_dma_buf_modifiers( screen, fourcc, 1, &modifier, &external_only, &count); ++ return dri2_create_image_from_fd(screen, width, height, fourcc, ++ modifier, fds, num_fds, ++ strides, offsets, NULL, loaderPrivate); ++ #if 0 + return dri2_create_image_from_fd(screen, width, height, fourcc, + DRM_FORMAT_MOD_INVALID, fds, num_fds, + strides, offsets, NULL, loaderPrivate); ++ #endif + } + + static boolean diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend index eaa46f27b6..d3435e720d 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend @@ -1,6 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" # DRI3 note: # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set # as default. To state out clearly that Raspi needs dri3 and to avoid surprises # in case oe-core changes this default, we set dri3 explicitly. + +SRC_URI_append_rpi = " file://0001-dri2-query-dma-buf-modifiers.patch " + PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" DRIDRIVERS_class-target_rpi = "" diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch b/meta-raspberrypi/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch index af803a3de1..21b40a3e13 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch @@ -1,7 +1,7 @@ -From ccb7f6f1a2bc491a24c0402616a2d24b85e3933a Mon Sep 17 00:00:00 2001 +From 4ffe3e0bc856ce1d2c52e84be6ea9337a5ce5410 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 9 Jul 2013 09:26:26 -0400 -Subject: [PATCH 01/19] Allow applications to set next resource handle +Subject: [PATCH] Allow applications to set next resource handle This patch adds provisions in userland to let apps callers set the next rendereing dispmanx resource. @@ -203,6 +203,3 @@ index 8a5734c..51b3580 100644 FN(void, eglIntSelectMipmap_impl, (EGL_SURFACE_ID_T s, int level)) FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data)) --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch b/meta-raspberrypi/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch index 8ce9090c19..9b0dd21eb8 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch @@ -1,7 +1,7 @@ -From 7432d49ddca97b34e402d0108221d34ec69bcd66 Mon Sep 17 00:00:00 2001 +From 21dba61f098020d1143289017841ca76995618d4 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 1 Oct 2013 13:19:20 +0200 -Subject: [PATCH 02/19] wayland: Add support for the Wayland winsys +Subject: [PATCH] wayland: Add support for the Wayland winsys * Adds EGL_WL_bind_wayland_display extension * Adds wayland-egl library @@ -23,7 +23,7 @@ Signed-off-by: Khem Raj CMakeLists.txt | 11 + README.md | 4 + buildme | 10 +- - .../linux/apps/raspicam/CMakeLists.txt | 2 +- + .../linux/apps/raspicam/CMakeLists.txt | 3 +- interface/khronos/CMakeLists.txt | 54 +++- interface/khronos/common/khrn_client.c | 15 ++ interface/khronos/common/khrn_client.h | 10 + @@ -49,7 +49,7 @@ Signed-off-by: Khem Raj interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++ interface/wayland/dispmanx.xml | 123 +++++++++ makefiles/cmake/Wayland.cmake | 72 +++++ - 30 files changed, 1257 insertions(+), 99 deletions(-) + 30 files changed, 1258 insertions(+), 99 deletions(-) create mode 100644 interface/khronos/common/linux/khrn_wayland.c copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%) create mode 100644 interface/khronos/ext/egl_wayland.c @@ -69,10 +69,10 @@ index 63570f1..1459436 100644 *.mkv +*~ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cfc8ae5..673a5ad 100644 +index d8ba238..8c5bf5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -24,6 +24,17 @@ include(makefiles/cmake/global_settings.cmake) +@@ -20,6 +20,17 @@ include(makefiles/cmake/global_settings.cmake) include(makefiles/cmake/arm-linux.cmake) include(makefiles/cmake/vmcs.cmake) @@ -103,7 +103,7 @@ index 404e4d4..97a6b8f 100644 + +$ BUILD_WAYLAND=1 ./buildme. diff --git a/buildme b/buildme -index cee90a6..d1d76a7 100755 +index 9e2d405..7b8c0d6 100755 --- a/buildme +++ b/buildme @@ -17,6 +17,10 @@ fi @@ -133,15 +133,16 @@ index cee90a6..d1d76a7 100755 if [ "$1" != "" ]; then diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt -index f7db21e..73997b7 100644 +index 656a9a0..4b0a888 100644 --- a/host_applications/linux/apps/raspicam/CMakeLists.txt +++ b/host_applications/linux/apps/raspicam/CMakeLists.txt -@@ -54,7 +54,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c) +@@ -59,7 +59,8 @@ add_executable(raspivid ${COMMON_SOURCES} RaspiVid.c) + add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c) set (MMAL_LIBS mmal_core mmal_util mmal_vc_client) - --target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host brcmGLESv2 brcmEGL m dl) -+target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host brcmGLESv2 brcmEGL m dl ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES}) +-target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host ${EGL_LIBS} m dl) ++ ++target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host ${EGL_LIBS} m dl ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES}) target_link_libraries(raspiyuv ${MMAL_LIBS} vcos bcm_host) target_link_libraries(raspivid ${MMAL_LIBS} vcos bcm_host) target_link_libraries(raspividyuv ${MMAL_LIBS} vcos bcm_host) @@ -1551,7 +1552,7 @@ index 0000000..8bafc15 +Libs: -L${libdir} -lwayland-egl +Cflags: -I${includedir} diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index a157db1..55b6ace 100755 +index 4a914a7..c202204 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -7,13 +7,24 @@ @@ -1582,8 +1583,8 @@ index a157db1..55b6ace 100755 +add_library(vchostif ${VCHOSTIF_SOURCE}) + #add_library(bufman vc_vchi_bufman.c ) + set(INSTALL_TARGETS vchostif) - # OpenMAX/IL component service diff --git a/interface/vmcs_host/vc_dispmanx.h b/interface/vmcs_host/vc_dispmanx.h index 37fdae1..fe3619a 100755 --- a/interface/vmcs_host/vc_dispmanx.h @@ -1893,6 +1894,3 @@ index 0000000..ad90d30 + list(APPEND ${_sources} "${_server_header}") + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch b/meta-raspberrypi/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch index 3da0f50ded..b995769665 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch @@ -1,7 +1,7 @@ -From 481a9aeba3f84371668fdf8a1380a3cb23bfc502 Mon Sep 17 00:00:00 2001 +From d2fd39ea43f948feba34e895600afd801e03691f Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 1 Oct 2013 13:19:20 +0200 -Subject: [PATCH 03/19] wayland: Add Wayland example +Subject: [PATCH] wayland: Add Wayland example --- .../linux/apps/hello_pi/CMakeLists.txt | 1 + @@ -861,6 +861,3 @@ index 8225dd5..0be6ce7 100755 make -C hello_mmal_encode - +make -C hello_wayland --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch b/meta-raspberrypi/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch index 9ca6b9f874..b081468334 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch @@ -1,7 +1,7 @@ -From 4463e2732a09dbb721d0614e7147cbfaa9059930 Mon Sep 17 00:00:00 2001 +From 53ef88cdb879050fc6f5247e7ca05260af69f2e8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Aug 2015 02:38:27 -0700 -Subject: [PATCH 04/19] wayland-egl: Add bcm_host to dependencies +Subject: [PATCH] wayland-egl: Add bcm_host to dependencies It uses headers like vcos_platform_types.h but does not depend on module which should add the required include paths @@ -23,6 +23,3 @@ index 8bafc15..fd259c9 100644 +Requires: bcm_host Libs: -L${libdir} -lwayland-egl Cflags: -I${includedir} --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch b/meta-raspberrypi/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch index 459fc04a19..27e69a91cf 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch @@ -1,8 +1,8 @@ -From 571c417c055a57cfd42c30a7a8279332397bad83 Mon Sep 17 00:00:00 2001 +From 237b9690154d2840d02aa927c56d80ef43f384b3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 24 Jan 2015 22:07:19 +0100 -Subject: [PATCH 05/19] interface: remove faulty assert() to make weston happy - at runtime +Subject: [PATCH] interface: remove faulty assert() to make weston happy at + runtime This was removed after a discussion on IRC with the weston guys ('daniels' on irc.freenode.net/#wayland). @@ -24,6 +24,3 @@ index eab146e..29e0dee 100755 dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param); } } else { --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch b/meta-raspberrypi/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch index cc59ca6198..872bc7b82c 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch @@ -1,7 +1,7 @@ -From 393e90beb9f5e535b5ce5d9eba4bc74907a96afe Mon Sep 17 00:00:00 2001 +From 5acedbd1d27fe528687f27173d2af9b1786f580d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:10:47 -0800 -Subject: [PATCH 06/19] zero-out wl buffers in egl_surface_free +Subject: [PATCH] zero-out wl buffers in egl_surface_free origins from buildroot @@ -28,6 +28,3 @@ index 42350bf..1f923d9 100644 } #endif } --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch b/meta-raspberrypi/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch index c5ad5195f8..0494e6ed82 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch @@ -1,7 +1,7 @@ -From 3e7e309de25d546a4836c59523060f286aadd87d Mon Sep 17 00:00:00 2001 +From 9159eff795a8ef3be0b3bfd554ef1aa23340884d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:11:41 -0800 -Subject: [PATCH 07/19] initialize front back wayland buffers +Subject: [PATCH] initialize front back wayland buffers origins from metrological wayland support @@ -29,6 +29,3 @@ index 1f923d9..9a9582c 100644 resource = DISPMANX_NO_HANDLE; } #endif --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch b/meta-raspberrypi/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch index 219a25874f..68875eb50f 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch @@ -1,7 +1,7 @@ -From a08887086cf4418fa0999a340c574b66a5ab4412 Mon Sep 17 00:00:00 2001 +From 581742c1edf89d4ed3728a3c6d59484ced4234cc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:09:18 -0800 -Subject: [PATCH 08/19] Remove RPC_FLUSH +Subject: [PATCH] Remove RPC_FLUSH Origins from buildroot @@ -22,6 +22,3 @@ index f9b7287..b04ffef 100644 #if EGL_BRCM_global_image } #endif --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch b/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch index 9e148ee448..fceeb6ebfa 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch @@ -1,7 +1,7 @@ -From e14d2bfff42be64361a873e73674ce1205af3ee5 Mon Sep 17 00:00:00 2001 +From acc4ffbb0f2a64e82b9cceda201a59df969e1d0f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 13:12:47 -0800 -Subject: [PATCH 09/19] fix cmake dependency race +Subject: [PATCH] fix cmake dependency race Fixes errors like @@ -42,7 +42,7 @@ index 1d81ca3..d6cd415 100644 add_library (vcos SHARED ${SOURCES}) target_link_libraries (vcos pthread dl rt) diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index 55b6ace..ae52495 100755 +index c202204..16d3184 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -15,14 +15,6 @@ set(VCHOSTIF_SOURCE @@ -73,6 +73,3 @@ index f0bae30..8c44c58 100644 struct wl_dispmanx_server_buffer { struct wl_resource *resource; struct wl_dispmanx *dispmanx; --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch b/meta-raspberrypi/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch index a075b1efa0..0ddef975c0 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch @@ -1,7 +1,7 @@ -From ea3f7c3822efd33cec96a79eb9a345544b942d9e Mon Sep 17 00:00:00 2001 +From 0af26805c35c6a600a13ed106bbc7cf85a37ce66 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Mar 2016 20:38:30 -0700 -Subject: [PATCH 10/19] Fix for framerate with nested composition +Subject: [PATCH] Fix for framerate with nested composition frame rate appears irregular and lower than expected when using nested composition. @@ -55,6 +55,3 @@ index 03fe67b..13a110c 100644 #ifdef ANDROID CLIENT_UNLOCK(); --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch b/meta-raspberrypi/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch index 1e6075118f..6e2f658d40 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch @@ -1,7 +1,7 @@ -From 407ab0ed315b4c7b49d1a1dd3777d5af8e0b7e66 Mon Sep 17 00:00:00 2001 +From 6172dbb6fd7cf821471d721569abe9a0de0d869d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Apr 2016 10:37:24 -0700 -Subject: [PATCH 11/19] build shared library for vchostif +Subject: [PATCH] build shared library for vchostif Fixes #149 @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index ae52495..369758b 100755 +index 16d3184..e54f046 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -15,7 +15,7 @@ set(VCHOSTIF_SOURCE @@ -22,7 +22,4 @@ index ae52495..369758b 100755 +add_library(vchostif SHARED ${VCHOSTIF_SOURCE}) #add_library(bufman vc_vchi_bufman.c ) - --- -2.22.0 - + set(INSTALL_TARGETS vchostif) diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch b/meta-raspberrypi/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch index c4ec57161c..19939e07e9 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch @@ -1,7 +1,7 @@ -From 48a946e24c3e7172f1044f5815e9cfed96982830 Mon Sep 17 00:00:00 2001 +From efd80d2b278c326cc3dae7eeb1fed6c4dd12a8a6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Apr 2016 10:54:59 -0700 -Subject: [PATCH 12/19] implement buffer wrapping interface for dispmanx +Subject: [PATCH] implement buffer wrapping interface for dispmanx Courtesy: Zan Dobersek @@ -87,6 +87,3 @@ index c18626d..11ed1ef 100644 --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch b/meta-raspberrypi/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch index 85b9a4e460..3df1f6d22d 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch @@ -1,7 +1,7 @@ -From 31e61d1a1d26442be9c90c479e2b14589acedb0e Mon Sep 17 00:00:00 2001 +From 2e1e3c857cdf365c5a13bcd5d09685cf12f8047c Mon Sep 17 00:00:00 2001 From: Jeff Wannamaker Date: Thu, 19 Jan 2017 18:56:07 +0000 -Subject: [PATCH 13/19] Implement triple buffering for wayland +Subject: [PATCH] Implement triple buffering for wayland Change from double to triple buffering for wayland. This enables higher frame rates without tearing artifacts @@ -85,6 +85,3 @@ index e328b77..58a3184 100644 /* back_wl_buffer --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch b/meta-raspberrypi/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch index c491550969..1d5247de0d 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch @@ -1,7 +1,7 @@ -From 961cd03f4db37041ae068cd8535f11cf739e42c0 Mon Sep 17 00:00:00 2001 +From a64be7ff40bd6de2ac099c3f0091f14edfe57fe7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 10 May 2017 06:39:34 +0000 -Subject: [PATCH 14/19] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT +Subject: [PATCH] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT weston code uses these defines Upstream-Status: Pending @@ -30,6 +30,3 @@ index 4eacf7f..b1acc9f 100644 /* GL_EXT_texture_type_2_10_10_10_REV */ #ifndef GL_EXT_texture_type_2_10_10_10_REV #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch b/meta-raspberrypi/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch index 2fc16b1593..a77f6d4808 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch @@ -1,7 +1,7 @@ -From 9568135c3e4c23e9056135a13cee58c37456aaac Mon Sep 17 00:00:00 2001 +From 8f32b772d869481f88d9b7e14feb43c39b3fc33d Mon Sep 17 00:00:00 2001 From: Andrea Galbusera Date: Fri, 14 Jul 2017 09:52:54 +0200 -Subject: [PATCH 15/19] EGL/glplatform.h: define EGL_CAST +Subject: [PATCH] EGL/glplatform.h: define EGL_CAST C++ / C typecast macros for special EGL handle values: used by libepoxy code The definition comes from the updated version of this header in mesa. @@ -27,6 +27,3 @@ index 1f7c930..c39d425 100644 +#endif + #endif /* __eglplatform_h */ --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch b/meta-raspberrypi/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch index 570b72cacd..444595859b 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch @@ -1,8 +1,7 @@ -From 493b013cb702b821fdeaef7021ae25dea88900c6 Mon Sep 17 00:00:00 2001 +From fe9ff55dac403b148f229c865bf2826ea4edf447 Mon Sep 17 00:00:00 2001 From: Jeff Wannamaker Date: Sat, 27 Jan 2018 12:28:31 -0500 -Subject: [PATCH 16/19] Allow multiple wayland compositor state data per - process +Subject: [PATCH] Allow multiple wayland compositor state data per process When eglBindWaylandDisplayWL is called store the wl_global created in a list associated with the wayland display. @@ -140,6 +139,3 @@ index 9ef89cd..abd5ab3 100644 CLIENT_UNLOCK(); --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/meta-raspberrypi/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch index 2f37989fd8..a2f2ded455 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch @@ -1,8 +1,7 @@ -From cc25f8abd4498004a276a4ee40e37681fa42422a Mon Sep 17 00:00:00 2001 +From 8f8c22bc8aad6eb0f7c1b68f9f9a89f99adff996 Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Sun, 13 May 2018 10:49:04 +0100 -Subject: [PATCH 17/19] khronos: backport typedef for - EGL_EXT_image_dma_buf_import +Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos. @@ -33,6 +32,3 @@ index d7e5ba7..dcc90ce 100755 #ifndef EGL_WL_bind_wayland_display #define EGL_WL_bind_wayland_display 1 --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch b/meta-raspberrypi/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch index c44c82165a..defaf3e246 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch @@ -1,7 +1,7 @@ -From e091388b4382d90494b5842e9f591043a45b2b21 Mon Sep 17 00:00:00 2001 +From fe9bf7b9d79133ca5c72f68ed33002a7539e9797 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 15 Jul 2018 00:48:38 -0700 -Subject: [PATCH 18/19] Add EGL_IMG_context_priority related defines +Subject: [PATCH] Add EGL_IMG_context_priority related defines These defines are needed for compiling weston 4.x taken from Khronos headers @@ -30,6 +30,3 @@ index dcc90ce..6842bf9 100755 #ifndef EGL_KHR_vg_parent_image #define EGL_KHR_vg_parent_image 1 #define EGL_VG_PARENT_IMAGE_KHR 0x30BA /* eglCreateImageKHR target */ --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch b/meta-raspberrypi/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch index fc66f535a1..34ca21add1 100644 --- a/meta-raspberrypi/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch +++ b/meta-raspberrypi/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch @@ -1,7 +1,7 @@ -From 5229430874b5275547babdbef1e322922317456d Mon Sep 17 00:00:00 2001 +From 339af0cea0dc29b33773a3d851ea17c42610de7b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 25 Jul 2019 23:30:27 -0700 -Subject: [PATCH 19/19] libfdt: Undefine __wordsize if already defined +Subject: [PATCH] libfdt: Undefine __wordsize if already defined glibc 2.30+ defines __wordsize, which is same so its easier to compile for multiple versions of glibc even ones which does not have this define @@ -12,20 +12,17 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/opensrc/helpers/libfdt/libfdt_env.h b/opensrc/helpers/libfdt/libfdt_env.h -index 1c966b8..fc25ca6 100644 +index f4608be..5e83a27 100644 --- a/opensrc/helpers/libfdt/libfdt_env.h +++ b/opensrc/helpers/libfdt/libfdt_env.h -@@ -56,6 +56,10 @@ - #include +@@ -18,6 +18,10 @@ #include + #include +#ifdef __bitwise +#undef __bitwise +#endif + #ifdef __CHECKER__ - #define __force __attribute__((force)) - #define __bitwise __attribute__((bitwise)) --- -2.22.0 - + #define FDT_FORCE __attribute__((force)) + #define FDT_BITWISE __attribute__((bitwise)) diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch b/meta-raspberrypi/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch new file mode 100644 index 0000000000..3823c12e75 --- /dev/null +++ b/meta-raspberrypi/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch @@ -0,0 +1,40 @@ +From d1a9839c6e4b4d187382baf341d25b3d023242cd Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 13 Jun 2018 18:22:22 +0000 +Subject: [PATCH] openmaxil: add pkg-config file + +--- + CMakeLists.txt | 2 +- + pkgconfig/openmaxil.pc.in | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + create mode 100644 pkgconfig/openmaxil.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c5bf5f..9f4165a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,7 @@ include_directories("${PROJECT_BINARY_DIR}") + include(FindPkgConfig QUIET) + if(PKG_CONFIG_FOUND) + # Produce a pkg-config file +- foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) ++ foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc openmaxil.pc) + configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") +diff --git a/pkgconfig/openmaxil.pc.in b/pkgconfig/openmaxil.pc.in +new file mode 100644 +index 0000000..8793a61 +--- /dev/null ++++ b/pkgconfig/openmaxil.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: openmaxil ++Description: Broadcom openmaxil library ++Version: 1 ++Libs: -L${libdir} -lopenmaxil -lvcos -lvchiq_arm -pthread ++Cflags: -I${includedir} -I${includedir}/IL -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0021-cmake-Disable-format-overflow-warning-as-error.patch b/meta-raspberrypi/recipes-graphics/userland/files/0021-cmake-Disable-format-overflow-warning-as-error.patch new file mode 100644 index 0000000000..703d3006cf --- /dev/null +++ b/meta-raspberrypi/recipes-graphics/userland/files/0021-cmake-Disable-format-overflow-warning-as-error.patch @@ -0,0 +1,32 @@ +From 4886bd9f33727f6a16aeb3b1aa3c25e459f06581 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 31 Mar 2020 11:51:02 -0700 +Subject: [PATCH] cmake: Disable format-overflow warning as error + +gcc10 complains about a check which could potentially be null + +build/inc/interface/vcos/vcos_logging.h:234:88: error: '%s' directive argument is null [-Werror=format-overflow=] + 234 | # define _VCOS_LOG_X(cat, _level, fmt...) do { if (vcos_is_log_enabled(cat,_level)) vcos_log_impl(cat,_level,fmt); } while (0) + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +A potential fix would be to check for fmt not being null but lets leave +that to experts + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + host_applications/linux/libs/bcm_host/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt ++++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt +@@ -3,7 +3,7 @@ if (WIN32) + set(VCOS_PLATFORM win32) + else () + set(VCOS_PLATFORM pthreads) +- add_definitions(-Wall -Werror) ++ add_definitions(-Wall) + endif () + + # set this as we want all the source of vchostif to be available in libbcm_host diff --git a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb index 99a3f23c26..eefc1ecd89 100644 --- a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb +++ b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb @@ -6,17 +6,18 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" +PROVIDES += "virtual/libomxil" RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "17d2fdc1abd370e09ba7074753294c7976dd6b0d" +SRCREV = "6fb59736b1ae80fc62cddfe3309c800f72e1c07e" # Use the date of the above commit as the package version. Update this when # SRCREV is changed. -PV = "20190724" +PV = "20200316" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ @@ -39,6 +40,8 @@ SRC_URI = "\ file://0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch \ file://0018-Add-EGL_IMG_context_priority-related-defines.patch \ file://0019-libfdt-Undefine-__wordsize-if-already-defined.patch \ + file://0020-openmaxil-add-pkg-config-file.patch \ + file://0021-cmake-Disable-format-overflow-warning-as-error.patch \ " S = "${WORKDIR}/git" @@ -73,6 +76,10 @@ do_install_append () { rm -rf ${D}${libdir}/pkgconfig/egl.pc ${D}${libdir}/pkgconfig/glesv2.pc \ ${D}${libdir}/pkgconfig/wayland-egl.pc rm -rf ${D}${includedir}/EGL ${D}${includedir}/GLES* ${D}${includedir}/KHR + else + ln -sf brcmglesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + ln -sf brcmegl.pc ${D}${libdir}/pkgconfig/egl.pc + ln -sf brcmvg.pc ${D}${libdir}/pkgconfig/vg.pc fi } diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index 3d1aaf8984..833f8f68a6 100644 --- a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -35,8 +35,8 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree" -SRCREV = "00daf85ffa373ecce7836df7543c6ebe4cf43639" -PV = "0.0+git${SRCPV}" +SRCREV = "616fc2dd4df421e3974179d9e46d45e7006aeb28" +PV = "20190114-1+rpt6" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch new file mode 100644 index 0000000000..59183dc306 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch @@ -0,0 +1,33 @@ +From a7783676c60dd90a6f4c26bcb9be03dc5703b74e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Apr 2020 11:25:32 -0700 +Subject: [PATCH 1/2] Revert "selftests/bpf: Skip perf hw events test if the + setup disabled it" + +This reverts commit da43712a7262891317883d4b3a909fb18dac4b1d. +--- + .../selftests/bpf/prog_tests/stacktrace_build_id_nmi.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +index 1735faf17536..f62aa0eb959b 100644 +--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c ++++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +@@ -49,12 +49,8 @@ void test_stacktrace_build_id_nmi(void) + pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */, + 0 /* cpu 0 */, -1 /* group id */, + 0 /* flags */); +- if (pmu_fd < 0 && errno == ENOENT) { +- printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__); +- test__skip(); +- goto cleanup; +- } +- if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n", ++ if (CHECK(pmu_fd < 0, "perf_event_open", ++ "err %d errno %d. Does the test host support PERF_COUNT_HW_CPU_CYCLES?\n", + pmu_fd, errno)) + goto close_prog; + +-- +2.26.0 + diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch new file mode 100644 index 0000000000..e0e7b85834 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch @@ -0,0 +1,57 @@ +From e66a0be4fac135d67ab228a6fd1453b9e36a3644 Mon Sep 17 00:00:00 2001 +From: Changbin Du +Date: Tue, 28 Jan 2020 23:29:38 +0800 +Subject: [PATCH] perf: Make perf able to build with latest libbfd + +libbfd has changed the bfd_section_* macros to inline functions +bfd_section_ since 2019-09-18. See below two commits: + o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html + o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html + +This fix make perf able to build with both old and new libbfd. + +Signed-off-by: Changbin Du +Acked-by: Jiri Olsa +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/util/srcline.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c +index af3f9b9f1e8b..b8e77617fdc4 100644 +--- a/tools/perf/util/srcline.c ++++ b/tools/perf/util/srcline.c +@@ -191,16 +191,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) + bfd_vma pc, vma; + bfd_size_type size; + struct a2l_data *a2l = data; ++ flagword flags; + + if (a2l->found) + return; + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++#ifdef bfd_get_section_flags ++ flags = bfd_get_section_flags(abfd, section); ++#else ++ flags = bfd_section_flags(section); ++#endif ++ if ((flags & SEC_ALLOC) == 0) + return; + + pc = a2l->addr; ++#ifdef bfd_get_section_vma + vma = bfd_get_section_vma(abfd, section); ++#else ++ vma = bfd_section_vma(section); ++#endif ++#ifdef bfd_get_section_size + size = bfd_get_section_size(section); ++#else ++ size = bfd_section_size(section); ++#endif + + if (pc < vma || pc >= vma + size) + return; diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch new file mode 100644 index 0000000000..1828934815 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch @@ -0,0 +1,40 @@ +From 4cd12df48b83cef9cc7d6b80b128afbf68746718 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 14 Mar 2020 07:31:34 -0700 +Subject: [PATCH] selftest/bpf: Use CHECK macro instead of RET_IF + +backporting 634efb750435d0a489dc58477d4fcb88b2692942 causes build +failures because RET_IF is defined in 7ee0d4e97b889c0478af9c1a6e5af658b181423f +but that is not backported + +Upstream-Status: Submitted +Signed-off-by: Khem Raj +Cc: Jakub Sitnicki +Cc: Alexei Starovoitov +Signed-off-by: Bruce Ashfield +--- + tools/testing/selftests/bpf/test_select_reuseport.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/testing/selftests/bpf/test_select_reuseport.c b/tools/testing/selftests/bpf/test_select_reuseport.c +index 079d0f5a2909..7e4c91f2238d 100644 +--- a/tools/testing/selftests/bpf/test_select_reuseport.c ++++ b/tools/testing/selftests/bpf/test_select_reuseport.c +@@ -668,12 +668,12 @@ static void cleanup_per_test(void) + + for (i = 0; i < NR_RESULTS; i++) { + err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY); +- RET_IF(err, "reset elem in result_map", ++ CHECK(err, "reset elem in result_map", + "i:%u err:%d errno:%d\n", i, err, errno); + } + + err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY); +- RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n", ++ CHECK(err, "reset line number in linum_map", "err:%d errno:%d\n", + err, errno); + + for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++) +-- +2.26.0 + diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch b/meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch new file mode 100644 index 0000000000..d18b942bc9 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch @@ -0,0 +1,94 @@ +From 366487b86a8c87954fb4ab7bd88ab49a929a32f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Apr 2020 11:25:58 -0700 +Subject: [PATCH 2/2] Revert "selftests/bpf: Fix perf_buffer test on systems w/ + offline CPUs" + +This reverts commit 77bb53cb094828a31cd3c5b402899810f63073c1. +--- + .../selftests/bpf/prog_tests/perf_buffer.c | 29 ++++--------------- + 1 file changed, 5 insertions(+), 24 deletions(-) + +diff --git a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c +index cf6c87936c69..3003fddc0613 100644 +--- a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c ++++ b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include "libbpf_internal.h" + + static void on_sample(void *ctx, int cpu, void *data, __u32 size) + { +@@ -20,7 +19,7 @@ static void on_sample(void *ctx, int cpu, void *data, __u32 size) + + void test_perf_buffer(void) + { +- int err, prog_fd, on_len, nr_on_cpus = 0, nr_cpus, i, duration = 0; ++ int err, prog_fd, nr_cpus, i, duration = 0; + const char *prog_name = "kprobe/sys_nanosleep"; + const char *file = "./test_perf_buffer.o"; + struct perf_buffer_opts pb_opts = {}; +@@ -30,27 +29,15 @@ void test_perf_buffer(void) + struct bpf_object *obj; + struct perf_buffer *pb; + struct bpf_link *link; +- bool *online; + + nr_cpus = libbpf_num_possible_cpus(); + if (CHECK(nr_cpus < 0, "nr_cpus", "err %d\n", nr_cpus)) + return; + +- err = parse_cpu_mask_file("/sys/devices/system/cpu/online", +- &online, &on_len); +- if (CHECK(err, "nr_on_cpus", "err %d\n", err)) +- return; +- +- for (i = 0; i < on_len; i++) +- if (online[i]) +- nr_on_cpus++; +- + /* load program */ + err = bpf_prog_load(file, BPF_PROG_TYPE_KPROBE, &obj, &prog_fd); +- if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) { +- obj = NULL; +- goto out_close; +- } ++ if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) ++ return; + + prog = bpf_object__find_program_by_title(obj, prog_name); + if (CHECK(!prog, "find_probe", "prog '%s' not found\n", prog_name)) +@@ -77,11 +64,6 @@ void test_perf_buffer(void) + /* trigger kprobe on every CPU */ + CPU_ZERO(&cpu_seen); + for (i = 0; i < nr_cpus; i++) { +- if (i >= on_len || !online[i]) { +- printf("skipping offline CPU #%d\n", i); +- continue; +- } +- + CPU_ZERO(&cpu_set); + CPU_SET(i, &cpu_set); + +@@ -99,8 +81,8 @@ void test_perf_buffer(void) + if (CHECK(err < 0, "perf_buffer__poll", "err %d\n", err)) + goto out_free_pb; + +- if (CHECK(CPU_COUNT(&cpu_seen) != nr_on_cpus, "seen_cpu_cnt", +- "expect %d, seen %d\n", nr_on_cpus, CPU_COUNT(&cpu_seen))) ++ if (CHECK(CPU_COUNT(&cpu_seen) != nr_cpus, "seen_cpu_cnt", ++ "expect %d, seen %d\n", nr_cpus, CPU_COUNT(&cpu_seen))) + goto out_free_pb; + + out_free_pb: +@@ -109,5 +91,4 @@ void test_perf_buffer(void) + bpf_link__destroy(link); + out_close: + bpf_object__close(obj); +- free(online); + } +-- +2.26.0 + diff --git a/meta-raspberrypi/recipes-kernel/linux/files/powersave.cfg b/meta-raspberrypi/recipes-kernel/linux/files/powersave.cfg new file mode 100644 index 0000000000..9c48eff19e --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/files/powersave.cfg @@ -0,0 +1,13 @@ +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="/dev/mmcblk0p2" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=y +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_ARCH_HIBERNATION_HEADER=y diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb index ee998dbcea..03053dac35 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb @@ -1,6 +1,10 @@ -LINUX_VERSION ?= "4.19.93" +LINUX_VERSION ?= "4.19.120" LINUX_RPI_BRANCH ?= "rpi-4.19.y" -SRCREV = "3fdcc814c54faaf4715ad0d12371c1eec61bf1dc" +SRCREV = "9da67d7329873623bd5c13fae5835d76d5be8806" require linux-raspberrypi_4.19.inc + +SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ + file://0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch \ + " diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb new file mode 100644 index 0000000000..ec0767ee6f --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb @@ -0,0 +1,13 @@ +LINUX_VERSION ?= "5.4.40" +LINUX_RPI_BRANCH ?= "rpi-5.4.y" + +SRCREV = "97badb4baeb8999263a9bc2fa85c3060ffff344b" + +require linux-raspberrypi_5.4.inc + +SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ + file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ + file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \ + file://0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch \ + file://powersave.cfg \ + " diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.inc new file mode 100644 index 0000000000..232f8a97d8 --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.inc @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" + +SRC_URI = " \ + git://github.com/raspberrypi/linux.git;branch=${LINUX_RPI_BRANCH} \ + " +SRC_URI_remove = "file://rpi-kernel-misc.cfg" + +require linux-raspberrypi.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +KERNEL_EXTRA_ARGS_append_rpi = " DTC_FLAGS='-@ -H epapr'" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index f892c66ece..a7aa8d9c38 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,9 +1,8 @@ -DEPENDS_append_rpi = " userland" GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" -# How to make this RPI specific? -EXTRA_OECONF_append_rpi = " CFLAGS="$CFLAGS -I${STAGING_DIR_TARGET}/usr/include/IL -I${STAGING_DIR_TARGET}/usr/include/interface/vcos/pthreads -I${STAGING_DIR_TARGET}/usr/include/interface/vmcs_host/linux"" -#examples only build with GL but not GLES, so disable it for RPI -EXTRA_OECONF_append_rpi = " --disable-examples" - -RDEPENDS_${PN}_append_rpi = " userland" +EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include" +CFLAGS_append_rpi = " \ + -I${STAGING_DIR_TARGET}/usr/include/IL \ + -I${STAGING_DIR_TARGET}/usr/include/interface/vcos/pthreads \ + -I${STAGING_DIR_TARGET}/usr/include/interface/vmcs_host/linux \ +" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 899a2d4000..8ab1510d8c 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -1 +1,2 @@ -PACKAGECONFIG_append_rpi = " hls libmms faad" +PACKAGECONFIG_append_rpi = " hls libmms \ + ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'faad', '', d)}" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend index 29fcb0e031..bfbce49f1f 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -2,10 +2,8 @@ EXTRA_OECONF_append_rpi = " CPPFLAGS='-I${STAGING_INCDIR}/interface/vcos/pthread -I${STAGING_INCDIR}/interface/vmcs_host/linux'" # if using bcm driver enable dispmanx not when using VC4 driver - PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}" +DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" PACKAGECONFIG_GL_VC4GRAPHICS = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '${PACKAGECONFIG_GL_VC4GRAPHICS}', 'egl gles2', d)}" - -PACKAGECONFIG[dispmanx] = "--enable-dispmanx,--disable-dispmanx,userland" diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb index 3cc03213d8..55e5a1c8c9 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 = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=00a27da7ac0f9bcd17320ec29ef4bbf6" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh libomxil coreutils-native curl-native userland" +DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" PR = "r5" diff --git a/meta-security/README b/meta-security/README index c419d506df..f223feef03 100644 --- a/meta-security/README +++ b/meta-security/README @@ -24,6 +24,11 @@ This layer depends on: revision: HEAD prio: default + URI: git://git.openembedded.org/meta-openembedded/meta-python + branch: master + revision: HEAD + prio: default + URI: git://git.openembedded.org/meta-openembedded/meta-networking branch: master revision: HEAD @@ -64,6 +69,8 @@ $ git config format.subjectPrefix meta-security][PATCH Now you can just do 'git send-email origin/master' to send all local patches. +For pull requests, please use create-pull-request and send-pull-request. + Maintainers: Armin Kuster diff --git a/meta-security/classes/dm-verity-img.bbclass b/meta-security/classes/dm-verity-img.bbclass new file mode 100644 index 0000000000..1c0e29b6e2 --- /dev/null +++ b/meta-security/classes/dm-verity-img.bbclass @@ -0,0 +1,88 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (C) 2020 BayLibre SAS +# Author: Bartosz Golaszewski +# +# This bbclass allows creating of dm-verity protected partition images. It +# generates a device image file with dm-verity hash data appended at the end +# plus the corresponding .env file containing additional information needed +# to mount the image such as the root hash in the form of ell variables. To +# assure data integrity, the root hash must be stored in a trusted location +# or cryptographically signed and verified. +# +# Usage: +# DM_VERITY_IMAGE = "core-image-full-cmdline" # or other image +# DM_VERITY_IMAGE_TYPE = "ext4" # or ext2, ext3 & btrfs +# IMAGE_CLASSES += "dm-verity-img" +# +# The resulting image can then be used to implement the device mapper block +# integrity checking on the target device. + +# Process the output from veritysetup and generate the corresponding .env +# file. The output from veritysetup is not very machine-friendly so we need to +# convert it to some better format. Let's drop the first line (doesn't contain +# any useful info) and feed the rest to a script. +process_verity() { + local ENV="$OUTPUT.env" + + # Each line contains a key and a value string delimited by ':'. Read the + # two parts into separate variables and process them separately. For the + # key part: convert the names to upper case and replace spaces with + # underscores to create correct shell variable names. For the value part: + # just trim all white-spaces. + IFS=":" + while read KEY VAL; do + echo -ne "$KEY" | tr '[:lower:]' '[:upper:]' | sed 's/ /_/g' >> $ENV + echo -ne "=" >> $ENV + echo "$VAL" | tr -d " \t" >> $ENV + done + + # Add partition size + echo "DATA_SIZE=$SIZE" >> $ENV + + ln -sf $ENV ${IMAGE_BASENAME}-${MACHINE}.$TYPE.verity.env +} + +verity_setup() { + local TYPE=$1 + local INPUT=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$TYPE + local SIZE=$(stat --printf="%s" $INPUT) + local OUTPUT=$INPUT.verity + + cp -a $INPUT $OUTPUT + + # Let's drop the first line of output (doesn't contain any useful info) + # and feed the rest to another function. + veritysetup --data-block-size=1024 --hash-offset=$SIZE format $OUTPUT $OUTPUT | tail -n +2 | process_verity +} + +VERITY_TYPES = "ext2.verity ext3.verity ext4.verity btrfs.verity" +IMAGE_TYPES += "${VERITY_TYPES}" +CONVERSIONTYPES += "verity" +CONVERSION_CMD_verity = "verity_setup ${type}" +CONVERSION_DEPENDS_verity = "cryptsetup-native" + +python __anonymous() { + verity_image = d.getVar('DM_VERITY_IMAGE') + verity_type = d.getVar('DM_VERITY_IMAGE_TYPE') + image_fstypes = d.getVar('IMAGE_FSTYPES') + pn = d.getVar('PN') + + if verity_image != pn: + return # This doesn't concern this image + + if not verity_image or not verity_type: + bb.warn('dm-verity-img class inherited but not used') + return + + if len(verity_type.split()) is not 1: + bb.fatal('DM_VERITY_IMAGE_TYPE must contain exactly one type') + + d.appendVar('IMAGE_FSTYPES', ' %s.verity' % verity_type) + + # If we're using wic: we'll have to use partition images and not the rootfs + # source plugin so add the appropriate dependency. + if 'wic' in image_fstypes: + dep = ' %s:do_image_%s' % (pn, verity_type) + d.appendVarFlag('do_image_wic', 'depends', dep) +} diff --git a/meta-security/conf/layer.conf b/meta-security/conf/layer.conf index 3e890e12eb..2c3bd96540 100644 --- a/meta-security/conf/layer.conf +++ b/meta-security/conf/layer.conf @@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "security" BBFILE_PATTERN_security = "^${LAYERDIR}/" BBFILE_PRIORITY_security = "8" -LAYERSERIES_COMPAT_security = "zeus" +LAYERSERIES_COMPAT_security = "dunfell" LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python" diff --git a/meta-security/meta-integrity/conf/layer.conf b/meta-security/meta-integrity/conf/layer.conf index bfc9c6ff16..b4edac383a 100644 --- a/meta-security/meta-integrity/conf/layer.conf +++ b/meta-security/meta-integrity/conf/layer.conf @@ -21,7 +21,7 @@ INTEGRITY_BASE := '${LAYERDIR}' # interactive shell is enough. OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" -LAYERSERIES_COMPAT_integrity = "zeus" +LAYERSERIES_COMPAT_integrity = "dunfell" # ima-evm-utils depends on keyutils from meta-oe LAYERDEPENDS_integrity = "core openembedded-layer" diff --git a/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf index 8572a1fcea..965c837976 100644 --- a/meta-security/meta-security-compliance/conf/layer.conf +++ b/meta-security/meta-security-compliance/conf/layer.conf @@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "scanners-layer" BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_scanners-layer = "10" -LAYERSERIES_COMPAT_scanners-layer = "zeus" +LAYERSERIES_COMPAT_scanners-layer = "dunfell" LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" diff --git a/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.7.5.bb b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.7.5.bb index 21e451794c..245761c37b 100644 --- a/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.7.5.bb +++ b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.7.5.bb @@ -38,4 +38,4 @@ do_install () { FILES_${PN} += "${sysconfdir}/developer.prf ${sysconfdir}/default.prf" FILES_${PN}-doc += "lynis.8 FAQ README CHANGELOG.md CONTRIBUTIONS.md CONTRIBUTORS.md" -RDEPENDS_${PN} += "procps" +RDEPENDS_${PN} += "procps findutils" 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 ca6e03079b..a775021431 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 @@ -17,4 +17,7 @@ inherit setuptools3 S = "${WORKDIR}/git" -RDEPENDS_${PN} = "python" +RDEPENDS_${PN} = "openscap scap-security-guide \ + python3-core python3-dbus \ + python3-pygobject \ + " diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch new file mode 100644 index 0000000000..c0b93e4106 --- /dev/null +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch @@ -0,0 +1,39 @@ +From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= +Date: Thu, 5 Dec 2019 15:02:05 +0100 +Subject: [PATCH] Fix XML "parsing" of the remediation functions file. + +A proper fix is not worth the effort, as we aim to kill shared Bash remediation +with Jinja2 macros. + +Upstream-Status: Backport +[https://github.com/ComplianceAsCode/content/commit/174293162e5840684d967e36840fc1f9f57c90be] + +Signed-off-by: Yi Zhao +--- + ssg/build_remediations.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py +index 7da807bd6..13e90f732 100644 +--- a/ssg/build_remediations.py ++++ b/ssg/build_remediations.py +@@ -56,11 +56,11 @@ def get_available_functions(build_dir): + remediation_functions = [] + with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: + filestring = xmlfile.read() +- # This regex looks implementation dependent but we can rely on +- # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed +- # to be the first attr and ID is guaranteed to be second. ++ # This regex looks implementation dependent but we can rely on the element attributes ++ # being present on one line. ++ # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. + remediation_functions = re.findall( +- r'