subtree updates - pull latest dunfell

meta-raspberrypi: 8066fac91d..9879932097:
  Alex Gonzalez (1):
        linux-raspberrypi: Only deploy cmdline.txt for the main kernel

  Andrei Gherzan (5):
        Revert "Generalize the naming of the bootfiles deploy directory"
        Revert "u-boot: Move fw_env.config to u-boot append"
        Revert "u-boot-rpi: Locate local patches with FILESEXTRAPATHS."
        Revert "u-boot: Fix booting raspberrypi CM3 module"
        sdcard_image-rpi.bbclass: Fix when RPI_SDIMG_EXTRA_DEPENDS not defined

  Andrzej Bednarski (1):
        docs: Correct minor spelling issues

  Christopher Clark (4):
        linux-raspberrypi: bump to 5.4.50 since upstream was force-pushed
        rpi-base: add SERIAL_CONSOLES_CHECK to default to SERIAL_CONSOLES
        sdcard_image-rpi.bbclass: enable extensible inclusion into boot
        docs/extra-build-config.md: document vars to add to boot partition

  Drew Moseley (1):
        u-boot-rpi: Locate local patches with FILESEXTRAPATHS.

  Eino Juhani Oltedal (1):
        linux-raspberrypi: bump to Linux version 5.4.72

  Fabio Berton (2):
        u-boot: Move fw_env.config to u-boot append
        u-boot: Move fw_env.config to u-boot append

  Jakub Luzny (2):
        rpi-config: Add CAN_OSCILLATOR variable to set mcp2515 crystal frequency
        docs/extra-build-config.md: Document CAN_OSCILLATOR variable

  Jeff Ithier (2):
        Generalize the naming of the bootfiles deploy directory
        Generalize the naming of the bootfiles deploy directory

  Jon Magnuson (1):
        packagegroup-rpi-test: resolve `wireless-regdb` conflict

  Khem Raj (16):
        linux-raspberrypi_5.4.bb: Move to 5.4.45
        linux-raspberrypi_5.4.bb: Upgrade to 5.4.47
        userland: Update to 2020-06-24 top commit
        linux-raspberrypi: Update to 5.4.59
        raspberrypi-firmware: Upgrade to 20200819
        xserver-xorg: Depend on userland when vc4graphics is disabled
        libsdl2: Add userland dependency when not using vc4graphics
        linux-raspberrypi_5.4.bb: Build ashmem and binder drivers
        README: Mention Yoe distro in supported distro list
        linux-firmware-rpidistro: Update to 20190114-1+rpt8
        linux-raspberrypi_5.4.bb: Update to 5.4.69
        raspberrypi-firmware: Update to 20201002 snapshot
        raspberrypi-tools: Update to latest snapshot as of 20200803
        oeqa: Add 5.4 specific error messages to ignore list
        rpi-default-settings: Replace default parselogs with parselogs_rpi
        linux-raspberrypi: Fix build regression from last update

  Leon Anavi (8):
        rpi-base.inc: Add infrared dtbo
        lirc_%.bbappend: Fix for gpio-ir
        lirc_%.bbappend: Remove
        rpi-u-boot-scr: Create uboot.env via boot.cmd.in
        libubootenv_%.bbappend: Add fw_env.config
        rpi-config: Add ENABLE_IR variable for infrared
        rpi-base.inc: Include modules if IR is enabled
        docs/extra-build-config.md: Infrared

  Luis Alfredo da Silva (1):
        Revert "mesa: querying dma_buf modifiers for specific formats"

  M. ter Woord (1):
        Update layer-contents.md to include pi4

  Madhavan Krishnan (1):
        libcamera: Define packageconfig to enable rpi pipeline

  Marek Belisko (2):
        u-boot: Fix booting raspberrypi CM3 module
        u-boot: Fix booting raspberrypi CM3 module

  Martin Jansa (10):
        linux-raspberrypi-5.4: bump SRCREV to latest to fix perf build
        layer.conf: Remove older releases from LAYERSERIES_COMPAT
        linux-raspberrypi-5.4: backport a fix for perf build with -fno-common from gcc-10
        rpi-gpio: add -fcommon temporarily
        linux-raspberrypi-5.4: revert 1 commit from upstream to fix lttng-modules build
        raspberrypi-{firmware,tools}: set downloadfilename
        Revert "linux-raspberrypi-5.4: revert 1 commit from upstream to fix lttng-modules build"
        linux-raspberrypi-5.4: bump SRCREV to fix raspberrypi3-64 builds
        python3-rtimu: don't use trailing slash in S
        Revert "libcamera: Define packageconfig to enable rpi pipeline"

  Murat Kilivan (1):
        linux-raspberrypi_5.4.bb: Add kernel-cache source

  Pierre-Jean Texier (9):
        raspberrypi-firmware: update to current HEAD
        linux-raspberrypi: bump to Linux version 4.19.126
        linux-raspberrypi: bump to Linux version 5.4.51
        raspberrypi-firmware: update to current HEAD
        rpi-default-versions: Switch defaults to 5.4
        raspberrypi-firmware: update to current HEAD
        linux-raspberrypi: bump to revision 4b945d5
        raspberrypi-firmware: update to current HEAD
        linux-raspberrypi: bump to Linux version 5.4.64

  colin (3):
        conf/machine/include/rpi-base.inc: Added can1 interface to bsp
        rpi-config_git: Added ENABLE_DUAL_CAN build configuration
        docs: Added documentation for Pican2 Duo support

poky: ed3bdd7fbc..424296bf9b:
  Adrian Bunk (10):
        git: Upgrade 2.24.1 -> 2.24.3
        wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29
        libubootenv: Remove the DEPENDS on mtd-utils
        iproute2: Remove -fcommon
        libxcrypt2: Remove -fcommon
        mesa: Remove -fcommon
        at-spi2-atk: Remove -fcommon
        menu-cache: Replace -fcommon with fix
        matchbox-wm: Replace -fcommon with fix
        librsvg: Upgrade 2.40.20 -> 2.40.21

  Adrian Freihofer (1):
        oe-publish-sdk: fix layers init via ssh

  Alex Kiernan (1):
        recipetool: Fix list concatenation when using edit

  Alexander Kanavin (23):
        testresults.json: add duration of the tests as well
        lz4: disable static library
        linux-firmware: upgrade 20200421 -> 20200519
        build-sysroots: add sysroot paths with native binaries to PATH
        patchelf: switch to git
        powertop: switch to Arjan's git
        apr-util: make gdbm optional
        linux-firmware: upgrade 20200519 -> 20200619
        gobject-introspection: add a patch to fix a build race
        icu: make filtered data generation optional, serial and off by default
        babeltrace: correct the git SRC_URI
        gnutls: upgrade 3.6.13 -> 3.6.14
        libexif: update to 0.6.22
        testimage: add an overall timeout setting
        oeqa: write @OETestTag content into json test reports for each case
        linux-firmware: upgrade 20200619 -> 20200721
        linux-firmware: update 20200721 -> 20200817
        selftest/virgl: drop the custom 30 sec timeout
        nasm: update 2.14.02 -> 2.15.03 for CVE fixes
        linux-firmware: upgrade 20200817 -> 20201022
        clutter-gst-3.0: do not call out to host gstreamer plugin scanner
        ptest-runner: fix upstream version check
        glib-2.0: correct build with latest meson

  Andreas M?ller (1):
        meson.bbclass: avoid unexpected operating-system names

  Andrei Gherzan (2):
        initscripts: Fix various shellcheck warnings in populate-volatile.sh
        initscripts: Fix populate-volatile.sh bug when file/dir exists

  Andrej Valek (1):
        oeqa/runtime/cases/ptest: Make output content path absolute

  Andrey Zhizhikin (3):
        kernel/yocto: fix search for defconfig from src_uri
        insane: check for missing update-alternatives inherit
        insane: add GitLab /archive/ tests

  Anibal Limon (2):
        recipes-kernel: linux-firmware add qcom-venus-{5.2,5.4} packages
        ptest-runner: Bump to 2.4.0

  Anuj Mittal (1):
        linux-yocto: bump genericx86 kernel version to v5.4.40

  Aníbal Limón (3):
        recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
        recipes-kernel/linux-firmware: Add adreno-a630 firmware package
        linux-firmware: Update to 20200122 -> 20200421

  Armin Kuster (6):
        curl: Security fixes for CVE-2020-{8169/8177}
        wpa-supplicant: Security fix CVE-2020-12695
        sqlite3: Security fix for CVE-2020-15358
        glibc: Secruity fix for CVE-2020-6096
        bind: update to 9.11.22 ESV
        timezone: update to 2020b

  Bjarne Michelsen (1):
        devtool: default to empty string, if LIC_FILES_CHKSUM is not available

  Bruce Ashfield (43):
        linux-yocto/5.4: update to v5.4.38
        linux-yocto/5.4: update to v5.4.40
        kernel/reproducibility: kernel modules need SOURCE_DATE_EPOCH export
        linux-yocto/5.4: update to v5.4.42
        linux-yocto-rt/5.4: update to rt24
        linux-yocto/5.4: temporarily revert IKHEADERS in standard kernels
        linux-yocto: gather reproducibility configs into a fragment
        linux-yocto/5.4: update to v5.4.43
        linux-yocto/5.4: update to v5.4.45
        linux-yocto-rt/5.4: update to rt25
        linux-yocto/5.4: update to v5.4.46
        linux-yocto/5.4: update to v5.4.47
        linux-yocto/5.4: update to v5.4.49 and -rt28
        yocto-bsps: bump reference boards to v5.4.49
        kernel/yocto: ensure that defconfigs are processed first
        linux-yocto/5.4: update to v5.4.50
        kernel-yocto: account for extracted defconfig in elements check
        linux-yocto/5.4: update to v5.4.51
        linux-yocto-rt/5.4: fix mmdrop stress test issues
        linux-yocto/5.4: update to v5.4.53
        linux-yocto/5.4: fix perf build with binutils 2.35
        linux-yocto/5.4: update to v5.4.54
        linux-yocto-rt/5.4: update to rt32
        linux-yocto/5.4: update to v5.4.56
        linux-yocto/5.4: update to v5.4.57
        linux-yocto/5.4: update to v5.4.58
        linux-yocto/5.4: perf cs-etm: Move definition of 'traceid_list' global variable from header file
        linux-yocto/5.4: update to v5.4.59
        linux-yocto/5.4: update to v5.4.60
        linux-yocto/5.4: update to v5.4.61
        kernel-yocto: checksum all modifications to available kernel fragments directories
        yocto-bsps: update reference BSPs to 5.4.54
        yocto-bsp: update to v5.4.56
        yocto-bsp: update to v5.4.58
        kernel-yocto: add KBUILD_DEFCONFIG search location to failure message
        linux-yocto/config: netfilter: Enable nat for ipv4 and ipv6
        linux-yocto/5.4: update to v5.4.64
        linux-yocto/5.4: update to v5.4.65
        lttng-modules: backport writeback.h changes from 2.12.x to fix kernel 5.4.62+
        linux-yocto/5.4: fix kprobes build warning
        linux-yocto/5.4: update to v5.4.67
        linux-yocto/5.4: update to v5.4.68
        linux-yocto/5.4: update to v5.4.69

  Changqing Li (10):
        mime.bbclass: fix post install scriptlet error
        modutils-initscripts: update postinst
        initscripts: update postinst
        gtk-icon-cache.bbclass: add runtime dependency
        logrotate.py: fix testimage occasionally failure
        gtk-immodules-cache.bbclass: fix post install scriptlet error
        libffi: fix multilib header conflict
        gpgme: fix multilib header conflict
        toolchain-shar-extract.sh: don't print useless info
        timezone: upgrade to 2020d

  Charlie Davies (3):
        u-boot: fix condition to allow use of *.cfg
        bitbake: bitbake: fetch/git: add support for SRC_URI containing spaces in url
        bitbake: bitbake: tests/fetch: add unit tests for SRC_URI with spaces in url

  Chee Yang Lee (7):
        qemu : fix CVE-2020-16092
        bash : inlcude patch 17 & 18
        xserver-xorg: fix CVE-2020-14346/14361/14362
        libx11: fix CVE-2020-14363
        perl: fix ptest test count
        bluez5: update to 5.55 to fix CVE-2020-27153
        ruby: fix CVE-2020-25613

  Chen Qi (8):
        db: do not install db_verify if 'verify' is not enabled
        vim: restore the 'chmod -x' workaround in do_install
        systemd-serialgetty: do not use BindsTo
        oescripts.py: fix typo
        oescripts: ignore whitespaces when comparing lines
        rpm: fix nativesdk's default var location
        grub: set CVE_PRODUCT to grub2
        fribidi: extend CVE_PRODUCT to include fribidi

  Chris Laplante (8):
        bitbake: ui/teamcity: don't use removed logging classes
        cve-update-db-native: add progress handler
        cve-check/cve-update-db-native: use lockfile to fix usage under multiconfig
        cve-update-db-native: use context manager for cve_f
        cve-check: avoid FileNotFoundError if no do_cve_check task has run
        cve-update-db-native: be less magical about checking whether the cve-check class is enabled
        cve-update-db-native: move -journal checking into do_fetch
        cve-update-db-native: remove unused variable

  Christian Eggers (3):
        libnl: Extend for native/nativesdk
        avahi: Fix typo in recipe
        packagegroup: rrecommend perf also for musl on ARM

  Christophe GUIBOUT (1):
        initramfs-framework: support kernel cmdline with double quotes

  Daniel Ammann (1):
        image.bbclass: improve wording when image size exceeds the specified limit

  Daniel Gomez (1):
        allarch: Add missing allarch ttf-bitstream-vera

  Daniel McGregor (1):
        buildhistory-collect-srcrevs: sort directories

  David Khouya (2):
        bitbake: lib/ui/taskexp: Validate gi import
        bitbake: lib/ui/taskexp: Fix missing Gtk import

  De Huo (1):
        bash: fix CVE-2019-18276

  Denys Zagorui (1):
        binutils: reproducibility: reuse debug-prefix-map for stabs

  Diego Santa Cruz (1):
        freetype: fix CVE-2020-15999, backport from 2.10.4

  Douglas (2):
        nativesdk: clear MACHINE_FEATURES
        nativesdk: Set the CXXFLAGS to the BUILDSDK_CXXFLAGS

  Geoff Parker (1):
        systemd-serialgetty: Replace sed quoting using ' with " to allow var expansion

  Gratian Crisan (1):
        kernel-module-split.bbclass: identify kernel modconf files as configuration files

  Gregor Zatko (1):
        sanity.bbclass: Detect and fail if 'inherit' is used in conf file

  Guillaume Champagne (1):
        weston: add missing packageconfigs

  Hannu Lounento (1):
        openssl: move ${libdir}/[...]/openssl.cnf to ${PN}-conf

  Hongxu Jia (1):
        iso-codes: switch upstream branch master -> main

  Jacob Kroon (4):
        bitbake: doc: Clarify how task dependencies relate to RDEPENDS
        bitbake: doc: More explanation to tasks that recursively depend on themselves
        squashfs-tools: Backport fix for compiling with gcc 10
        insane: Check for feature check variables not being used

  Jan-Simon Moeller (1):
        file: add bzip2-replacement-native to DEPENDS to fix sstate issue

  Jean-Francois Dagenais (1):
        bitbake: siggen: clean_basepath: remove recipe full path when virtual:xyz present

  Jens Rehsack (3):
        u-boot: avoid blind merging all *.cfg
        subversion: extend for nativesdk
        serf: extend for nativesdk

  Joe Slater (4):
        terminal.py: do not stop searching for auto
        qemu: force build type to production
        vim: _FORTIFY_SOURCE=2 be gone
        acpica: Upgrade 20200214 -> 20200430 for gcc-10 fixes

  Jose Quaresma (13):
        gstreamer1.0: Fix reproducibility issue around libcap
        gstreamer1.0: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-plugins-base: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-plugins-good: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-plugins-bad: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-plugins-ugly: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-libav: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-vaapi: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-rtsp-server: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-omx: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0-python: Update 1.16.2 -> Update 1.16.3
        gst-validate: Update 1.16.2 -> Update 1.16.3
        gstreamer1.0: warn the user when something is wrong with GstBufferPool

  Joshua Watt (24):
        checklayer: Skip layers without a collection
        pycryptodome: Import from meta-python
        pyelftools: Import from meta-python
        python3-pycryptodome(x): Upgrade 3.9.4 -> 3.9.7
        python3-pyelftools: Upgrade 0.25 -> 0.26
        layer.conf: Bump OE-Core layer version
        classes/archiver: Create patched archive before configuring
        bitbake: hashserv: Chunkify large messages
        bitbake: siggen: Fix error when hash equivalence has an exception
        classes/archiver: run do_unpack_and_patch after do_preconfigure
        classes/archive: do_configure should not depend on do_ar_patched
        classes/cmake: Fix host detection
        classes/package: Use HOST_OS for runtime dependencies
        oeqa: runtime_tests: Extra GPG debugging
        oeqa: sdk: Capture stderr output
        wic: Add --offset argument for partitions
        wic: Fix --extra-space argument handling
        wic: Fix error message when reporting invalid offset
        wic: Add 512 Byte alignment to --offset
        classes/sanity: Bump minimum python version to 3.5
        jquery: Upgrade 3.4.1 -> 3.5.0 to fix CVE-2020-11022 and CVE-2020-11023
        classes/reproducible: Move to library code
        lib/oe/reproducible: Fix error when no git HEAD
        lib/oe/reproducible.py: Fix git HEAD check

  Kai Kang (5):
        gcr: depends on gnupg-native
        bitbake: bitbake-user-manual-metadata.xml: fix a minor error
        mdadm: remove service template from SYSTEMD_SERVICE
        wpa-supplicant: remove service templates from SYSTEMD_SERVICE
        encodings: clear postinst script

  Kevin Hao (3):
        wic/filemap: Drop the unused block_is_unmapped()
        wic/filemap: Drop the unused get_unmapped_ranges()
        wic/filemap: Fall back to standard copy when no way to get the block map

  Khem Raj (25):
        cve-check: Run it after do_fetch
        make-mod-scripts: Fix a rare build race condition
        glibc: Update to latest on 2.31 branch
        wayland: fix condition for strndup detection
        syslinux: Fix build with gcc10
        valgrind: Do not use outline-atomics on aarch64
        valgrind: Backport upstream patch to fix __getauxval needs
        go: Disbale CGO for riscv64
        go-dep: Fix build on riscv64
        qemumips: Use 34Kf CPU emulation
        glibc: Bring in CVE fixes and other bugfixes from 2.31 release branch
        gcc-9.3.inc: Mark CVE-2019-15847 as fixed
        go: update 1.14.4 -> 1.14.6
        go: Upgrade to 1.14.7
        json-c: Fix CVE-2020-12762
        util-linux: Allow update alternatives for additional apps
        json-glib: Backport a build fix with clang
        uninative: Upgrade to 2.9
        rpcbind: Use update-alternatives for rpcinfo
        populate_sdk_ext: Do not assume local.conf will always exist
        site: Make sys_siglist default to no
        packagegroups: remove strace and lttng-tools for rv32/musl
        packagegroup-core-tools-debug: Disable for rv32/glibc as well
        qemuboot.bbclass: Fix a typo
        ptest-runner: Backport patch to fix inappropriate ioctl error

  Konrad Weihmann (14):
        qemurunner: fix ip fallback detection
        sysfsutils: rem leftover settings for libsysfs-dev
        cogl: point to correct HOMEPAGE
        runqemu: add QB_ROOTFS_EXTRA_OPT parameter
        testimage: enable ovmf support
        systemd: remove kernel-install from base pkg
        bitbake: pyshyacc: allow double COMMA statements
        ptest: append to FILES
        cve-update: handle baseMetricV2 as optional
        testexport: rename create_tarball method
        bitbake: bitbake-user-manual: Add BBFILES_DYNAMIC
        oeqa/core/context: expose results as variable
        oeqa/core/context: initialize _run_end_time
        testimage: print results for interrupted runs

  Kurt Kiefer (1):
        linux-firmware: add ibt-20 package

  Lee Chee Yang (31):
        qemu: fix CVE-2020-11869
        bind: fix CVE-2020-8616/7
        libexif: fix CVE-2020-13114
        qemu: fix CVE-2020-13361
        dbus: fix CVE-2020-12049
        perl: fix CVE-2020-10543 & CVE-2020-10878
        oeqa/core/loader: refine regex to find module
        qemu: fix CVE-2020-10702/10761/13362/13659/13800
        python3: fix CVE-2020-14422
        bison: fix Argument list too long error
        systemd : fix CVE-2020-13776
        buildhistory: use pid for temporary txt file name
        checklayer: check layer in BBLAYERS before test
        ghostscript: fix CVE-2020-15900
        qemu: fix CVE-2020-15863
        libjpeg-turbo: fix CVE-2020-13790
        webkitgtk: fix CVE-2020-13753
        ghostscript: update to 9.52
        perl: fix CVE-2020-12723
        xserver-xorg: fix CVE-2020-14347
        qemu: fix CVE-2020-14364 CVE-2020-14415
        libx11 : fix CVE-2020-14344
        libproxy: fix CVE-2020-25219
        python3: fix CVE-2020-26116
        grub2: fix CVE-2020-10713
        ffmpeg: fix CVE-2020-12284
        libproxy: fix CVE-2020-26154
        bison: update to 3.5.4 for CVE-2020-14150
        python3: whitelist CVE-2020-15523
        python3: fix CVE-2020-27619
        qemu: fix CVE-2020-24352

  Lili Li (1):
        kernel.bbclass: Fix Module.symvers support

  Marco Felsch (1):
        util-linux: alternatify rtcwake

  Marek Vasut (5):
        libubootenv: Depend on zlib
        lttng-modules: update to 2.11.6
        lttng-tools: update to 2.11.5
        lttng-ust: update to 2.11.1
        stress-ng: Upgrade 0.11.01 -> 0.11.17

  Mark Hatle (3):
        sstate.bbclass: When siginfo or sig files are missing, stop fetcher errors
        package_tar.bbclass: Sync to the other package_* classes
        package.bbclass: Sort shlib2 output for hash equivalency

  Mark Jonas (5):
        Add license text for PSF-2.0
        Map license names PSF and PSFv2 to PSF-2.0
        libsdl2: Fix directfb syntax error
        libsdl2: Fix directfb SDL_RenderFillRect
        libbsd: Remove BSD-4-Clause from main package

  Martin Jansa (13):
        net-tools: backport a patch from upstream to use the same ifconfig format as debian/ubuntu
        perf: backport a fix for confusing non-fatal error
        devtool: expand SRC_URI when guessing recipe update mode
        arch-armv7a.inc: fix typo
        arch-mips.inc: remove duplicated mips64el-o32 from PACKAGE_EXTRA_ARCHS_tune-mips64el-o32
        tune-mips64r6.inc: fix typo in mipsisa64r6-nf
        tune-ep9312.inc: add t suffix for thumb to PACKAGE_EXTRA_ARCHS_tune-ep9312
        tune-riscv.inc: use nf suffix also for TUNE_PKGARCH
        siteinfo: Recognize 32bit PPC LE
        siteinfo: Recognize bigendian sh3be and sh4be
        lib/oe/patch: prevent applying patches without any subject
        lib/oe/patch: GitApplyTree: save 1 echo in commit-msg hook
        Revert "lib/oe/patch: fix handling of patches with no header"

  Matt Madison (2):
        cogl-1.0: correct X11 dependencies
        image.bbclass: fix REPRODUCIBLE_TIMESTAMP_ROOTFS reference

  Matthew (1):
        ltp: make copyFrom scp command non-fatal

  Max Krummenacher (2):
        linux-firmware: package marvel sdio 8997 firmware
        linux-firmware: package nvidia firmware

  Maxime Roussin-Bélanger (1):
        meta: fix some unresponsive homepages and bugtracker links

  Michael Gloff (2):
        sysvinit: Remove ${B} assignment
        sysvinit rc: Use PSPLASH_FIFO_DIR for progress fifo

  Michael Tretter (1):
        devtool: deploy-target: Fix size calculation for hard links

  Mikko Rapeli (2):
        alsa-topology-conf: use ${datadir} in do_install()
        alsa-ucm-conf: use ${datadir} in do_install()

  Ming Liu (6):
        u-boot: introduce UBOOT_INITIAL_ENV
        u-boot: support merging .cfg files for UBOOT_CONFIG
        conf/machine: set UBOOT_MACHINE for qemumips and qemumips64
        multilib.conf: add u-boot to NON_MULTILIB_RECIPES
        libubootenv: uprev to v0.3
        libubootenv: inherit uboot-config

  Mingli Yu (5):
        bison: fix the parallel build
        python3-setuptools: add the missing rdepends
        python3-libarchive-c: add the missing rdepends
        update_udev_hwdb: clean hwdb.bin
        python3: add ldconfig rdepends for python3-ctypes

  Naoki Hayama (1):
        uninative: Fix typo in error message

  Nathan Rossi (1):
        diffstat: add nativesdk to BBCLASSEXTEND

  Neil Armstrong (1):
        linux-firmware: add Amlogic VDEC firmware package

  Nicolas Dechesne (2):
        checklayer: parse LAYERDEPENDS with bb.utils.explode_dep_versions2()
        linux-libc-headers: kernel headers are installed in STAGING_KERNEL_BUILDDIR

  Norman Stetter (1):
        sstate.bbclass: Check file ownership before doing 'touch -a'

  Oleksandr Kravchuk (1):
        ell: update to 0.33

  Otavio Salvador (7):
        systemd: Sync systemd-serialgetty@.service with upstream
        mtd-utils: Fix return value of ubiformat
        go-mod.bbclass: Add class for `go mod` support
        glide: Avoid use of 'go mod' support
        go-dep: Avoid use of 'go mod' support
        go.bbclass: Add `-trimpath` to default build flags
        openssh: Allow enable/disable of rng-tools recommendation on sshd

  Ovidiu Panait (1):
        libxml2: Fix CVE-2020-24977

  Paul Barker (5):
        archiver.bbclass: Make do_deploy_archives a recursive dependency
        avahi: Don't advertise example services by default
        archiver: Fix test case for srpm archiver mode
        oe-selftest: Allow overriding the build directory used for tests
        oe-selftest: Recursively patch test case paths

  Peter A. Bigot (1):
        bluez5: fix builds that require ell support

  Peter Kjellerstedt (2):
        cairo: Do not try to remove nonexistent directories
        relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist

  Pierre-Jean Texier (2):
        ell: upgrade 0.31 -> 0.32
        libubootenv: upgrade 0.3 -> 0.3.1

  Quentin Schulz (1):
        base/insane: Check pkgs lics are subset of recipe lics only once

  Rahul Chauhan (1):
        busybox: Security Fix For CVE-2018-1000500

  Rahul Kumar (1):
        systemd-serialgetty: Fix sed expression quoting

  Ralph Siemsen (1):
        cve-check: include epoch in product version output

  Randy MacLeod (1):
        curl: Change SRC_URI from http to https

  Rasmus Villemoes (3):
        coreutils: don't split stdbuf to own package with single-binary
        kernel.bbclass: run do_symlink_kernsrc before do_patch
        cml1: Move find_cfgs() helper to cml1.bbclass

  Ricardo Salveti (1):
        dosfstools: add mkfs.vfat to ALTERNATIVE

  Richard Leitner (7):
        libtirpc: remove extra "-fcommon" from CFLAGS
        gdbm: add patch to fix link failure against gcc 10
        dtc: update to 1.6.0
        libcomps: update to 0.1.15
        binutils: add patch to fix issues with gcc 10
        cpio: add patch to fix issues with gcc 10
        xcb-proto: backport fix for python gcd function

  Richard Purdie (72):
        resulttool/report: Remove leftover debugging
        resulttool/log: Add ability to dump ltp logs as well as ptest
        poky.conf: Bump version for 3.1.1 dunfell release
        build-appliance-image: Update to dunfell head revision
        build-appliance: Update branch to point at dunfell
        build-appliance-image: Update to dunfell head revision
        ltp: Exclude the memcg_stress tests due to timeout problems
        maintainers: Update Ross' email address
        logrotate: Drop obsolete setting/comment
        oeqa/targetcontrol: Rework exception handling to avoid warnings
        patchelf: Add patch to address corrupt shared library issue
        bitbake: tests/fetch: Switch from git.infradead.org to a YP mirror
        ltp: Add missing dependencies on coreutils, bc, e2fsprogs and gdb
        perl: Fix host specific modules problems
        bitbake: runqueue: Avoid unpickle errors in rare cases
        bitbake: msg: Avoid issues where paths have relative components
        pseudo: Fix attr errors due to incorrect library resolution issues
        oeqa/selftest/runcmd: Add better debug for thread count mismatch failures
        oeqa/utils/command: Improve stdin handling in runCmd
        scripts/install-buildtools: Update to 3.2 M1 buildtools
        scripts/install-buildtools: Handle new format checksum files
        oeqa/selftest: Clean up separate builddir in success case when non-threaded
        populate_sdk_ext: Fix to use python3, not python
        oeqa/selftest: recipetool/devtool: Avoid load_plugin test race
        oeqa/targetcontrol: Attempt to fix log closure warning message
        rootfs-postcommands: Improve/fix rootfs_check_host_user_contaminated
        bitbake: server/process: Increase timeout for commands
        bitbake: fetch2: Change git fetcher not to destroy old references
        bitbake: server/process: Fix a rare lockfile race
        bitbake: server/process: Ensure UI-less servers don't sit in infinite loops
        bitbake: server/process: Fix note reference -> info
        oeqa/selftest/sstatetests: Avoid polluting DL_DIR
        qemurunner: Ensure pid location is deterministic
        qemurunner: Add extra debug info when qemu fails to start
        oeqa/utils/qemurunner: Fix missing pid file tracebacks
        bitbake: cooker: Handle multiconfig name mappings correctly
        bitbake: server/process: Fix UI first connection tracking
        bitbake: server/process: Account for xmlrpc connections
        oeqa/qemurunner: Add priority/nice information for running processes
        uninative: Handle PREMIRRORS generically
        selftest/tinfoil: Increase wait event timeout
        runqemu: Show an error for conflicting graphics options
        selftest/prservice: Improve test failure message
        bitbake: fetch2: Drop cups.org from wget status checks
        runqemu: Add a hook to allow it to renice
        selftest/signing: Ensure build path relocation is safe
        oeqa/concurrencytest: Improve builddir path manipulations
        bitbake: tests/fetch: Move away from problematic freedesktop.org urls
        build-appliance-image: Update to dunfell head revision
        scripts/oe-build-perf-report: Use python3 from the environment
        build-appliance-image: Update to dunfell head revision
        python3-markupsafe: Import from meta-oe/meta-python
        python3-jinja2: Import from meta-oe/meta-python
        buildtools-tarball: Add python3-jinja2
        dropbear/openssh: Lower priority of key generation
        buildtools: Handle generic environment setup injection
        buildtools-tarball: Fix conflicts with oe-selftest and other tooling
        oeqa/qemurunner: Increase serial timeout
        oeqa/selftest/incompatible_lib: Fix append usage
        oeqa/selftest/containerimage: Update to match assumptions in configuration
        ssh-pregen-hostkeys: Add a recipe with pregenerated ssh host keys
        glibc: do_stash_locale must not delete files from ${D}
        libtools-cross/shadow-sysroot: Use nopackages inherit
        scripts/oe-build-perf-report: Allow operation with no buildstats
        oe-build-perf-report: Ensure correct data is shown for multiple branch options
        bitbake: tests/fetch: Update upstream master->main branchname transition
        oeqa: Add sync call to command execution
        sstatesig: Log timestamps for hashequiv in reprodubile builds for do_package
        ptest-runner: Fix license as it contains 'or later' clause
        libdnf: Fix license as it contains 'or later' clause
        alsa-utils: Fix license to GPLv2 only
        build-appliance-image: Update to dunfell head revision

  Robert P. J. Day (7):
        ref-manual: fix excessive command indentation
        ref-manual: IMAGE_TYPES, add tar.zst, delete elf
        ref-manual: typo "SSTATE_MIRROR" -> "SSTATE_MIRRORS"
        ref-manual: Remove long-dead PACKAGE_GROUP variable
        ref-manual: delete long-unused comments in variable glossary
        bitbake: docs: delete reference to obsolete recipe-depends.dot
        bitbake: user manual: properly tag content as <replaceable>

  Robert Yang (2):
        archiver.bbclass: Fix duplicated SRC_URIs for do_ar_original
        openssl: openssl-bin requires openssl-conf to run

  Ross Burton (20):
        install-buildtools: fail if an error occurs
        install-buildtools: remove hardcoded x86-64 architecture
        common-licenses: add BSD-2-Clause-Patent
        gstreamer1.0-plugins-bad: add support for vdpau
        common-licenses: fix filename of BSD-2-Clause-Patent
        insane: consolidate skipping of temporary do_package files
        startup-notification: add time_t type mismatch patch from upstream
        package.bbclass: explode the RPROVIDES so we don't think the versions are provides
        insane: improve gnu-hash-style warning
        gdk-pixbuf: add tests PACKAGECONFIG
        insane: only load real files as ELF
        autoconf: consolidate DEPENDS
        curl: add vendors to CVE_PRODUCT to exclude false positives
        cmake: whitelist CVE-2016-10642
        alsa-plugins: improve .la removal
        sato-screenshot: improve .la removal
        meta: add/fix invalid Upstream-Status tags
        gcc: mitigate the Straight-line Speculation attack
        glib-2.0: fix parsing of slim encoded tzdata
        syslinux: add link to upstream discussion in patch

  Sakib Sajal (1):
        busybox: make hwclock compatible with glibc 2.31

  Steve Sakoman (31):
        poky: Add Ubuntu 20.04 as a supported distro
        Documenation: Prepared for the 3.1.1 release
        oeqa/concurrencytest: don't delete build directory for failed tests
        Documentation: Add 3.1.1 version updates missing from previous commit
        u-boot-tools: backport patch from upstream to fix gcc 10 builds
        buildtools-tarball: export OPENSSL_CONF in environment setup
        u-boot: move redundant-yyloc-global patch to u-boot-common.inc
        poky.conf: Bump version for 3.1.2 release
        Documenation: Prepared for the 3.1.2 release
        poky: Add fedora32 as a supported distro
        glib-networking: upgrade 2.62.3 to 2.62.4
        Revert "gtk-icon-cache.bbclass: add runtime dependency"
        glib-2.0: update 2.62.4 to 2.62.5
        glib-2.0: update 2.62.5 to 2.62.6
        sanity.conf: update BB_MIN_VERSION to 1.46.0
        Documenation: Prepared for the 3.1.3 release
        poky.conf: Bump version for 3.1.3 release
        Revert "kernel.bbclass: run do_symlink_kernsrc before do_patch"
        xinput-calibrator: change SRC_URI to branch with libinput support
        Revert "lttng-modules: backport writeback.h changes from 2.12.x to fix kernel 5.4.62+"
        qemu: fix CVE-2019-20175
        sqlite3: fix CVE-2020-13434
        sqlite3: fix CVE-2020-13435
        sqlite3: fix CVE-2020-13630
        sqlite3: fix CVE-2020-13631
        sqlite3: fix CVE-2020-13632
        netbase: update SRC_URI to reflect new file name
        netbase: bump PE to purge bogus hash equivalence from autobuilder
        Documenation: Prepared for the 3.1.4 release
        openssh: whitelist CVE-2014-9278
        poky.conf: Bump version for 3.1.4 release

  Sumit Garg (1):
        insane: fix gnu-hash-style check

  TeohJayShen (2):
        oeqa/manual/bsp-hw.json : remove shutdown_system test
        oeqa/manual/bsp-hw.json : remove X_server_can_start_up_with_runlevel_5_boot test

  Tim Orling (4):
        bitbake: toaster-requirements.txt: require Django 2.2
        lib/oe/recipeutils.py: add AUTHOR; BBCLASSEXTEND
        scripts/lib/recipetool/create.py: fix regex strings
        oeqa/selftest/cases/devtool.py: avoid .pyc race

  Timon Ulrich (1):
        kernel.bbclass: add lz4 dependency and fix the call to lz4

  Trevor Gamblin (1):
        qemuarm: check serial consoles vs /proc/consoles

  Tuomas Salokanto (1):
        recipetool: create: fix SRCBRANCH not being passed to params

  Tyler Hicks (1):
        kernel-devicetree: Fix intermittent build failures caused by DTB builds

  Vacek, Patrick (1):
        oeqa/core/loader: fix regex to include numbers

  Vasyl Vavrychuk (1):
        runqemu: Check gtk or sdl option is passed together with gl or gl-es options.

  Victor Kamensky (1):
        qemu: change TLBs number to 64 in 34Kf mips cpu model

  Vijai Kumar K (2):
        image_types_wic: Add ASSUME_PROVIDED to WICVARS
        wic: misc: Add /bin to the list of searchpaths

  Viktor Rosendahl (1):
        boost: backport fix to make async_pipes work with asio

  Wang Mingyu (2):
        libdrm: upgrade 2.4.100 -> 2.4.101
        xserver-xorg: upgrade 1.20.7 -> 1.20.8

  Yann Dirson (1):
        package: get_package_mapping: avoid dependency mapping if renamed package provides original name

  Yann E. MORIN (2):
        common-licenses: add bzip2-1.0.4
        recipes-core/busybox: fixup licensing information

  Yi Zhao (1):
        bind: upgrade 9.11.19 -> 9.11.21

  Yoann Congal (1):
        bitbake-bblayers/create: Make the example recipe print its message

  Yongxin Liu (5):
        linux-firmware: add ice for Intel E800 series driver
        linux-firmware: fix the wrong file path for ibt-misc
        linux-firmware: move ibt-misc to the end of ibt packages
        grub: fix several CVEs in grub 2.04
        grub: clean up CVE patches

  Zhixiong Chi (1):
        gnutls: CVE-2020-24659

  akash hadke (1):
        systemd: udev SECLABEL{selinux} crash fix

  akuster (4):
        bind: update to 9.11.19
        bitbake: test/fetch: change to better svn source
        glibc: whitelist CVE-2010-10029
        cve-check.bbclass: always save cve report

  haiqing (1):
        libpam: Remove option 'obscure' from common-password

  hongxu (2):
        core-image-minimal-initramfs: keep restriction with initramfs-module-install
        sysstat: fix installed-vs-shipped QA Issue in systemd

  wenlin.kang@windriver.com (1):
        populate_sdk_base.bbclass: fix warning: name not matched

  zhengruoqin (4):
        make-mod-scripts: Fix dependence error.
        libtirpc: upgrade 1.2.5 -> 1.2.6
        gnutls: Fix krb5 code license to GPLv2.1+ to match the LICENSE file.
        ruby: upgrade 2.7.0 -> 2.7.1

meta-openembedded: e413c1ef62..f2d02cb71e:
  Adrian Bunk (4):
        unicode-ucd: Stop broken license downloading
        postfix: Upgrade 3.4.10 -> 3.4.12
        python3-docutils: Remove, moved to OE-core
        gnome-settings-daemon: Remove duplicate outdated SRC_URI hashes

  Alex Kiernan (1):
        zstd: Upgrade 1.4.4 -> 1.4.5

  Alistair Francis (1):
        python3-obd: Add missing setuptools RDEPENDS

  Anatol Belski (1):
        chrony: Patch CVE-2020-14367

  Andreas Müller (11):
        gexiv2: upgrade 0.12.0 -> 0.12.1
        thunar: upgrade 1.8.14 -> 1.8.15
        fluidsynth: upgrade 2.1.2 -> 2.1.3
        libblockdev: upgrade 2.23 -> 2.24
        openh264: upgrade 2.1.0 -> 2.1.1
        tcpreplay: upgrade 4.3.2 -> 4.3.3
        blueman: upgrade 2.1.1 -> 2.1.3
        modemmanager: upgrade 1.12.10 -> 1.12.12
        ibus: upgrade 1.5.21 -> 1.5.22
        exiv2: upgrade 0.27.1 -> 0.27.3
        gnome-settings-daemon: Remove wrong RDEPEND

  Andrew Geissler (1):
        nlohmann-json: backport gcc10 fix

  Armin Kuster (9):
        tremor: update SRC_URI as project moved to gitlab
        ntp: update 4.2.8p15
        net-snmp: Security fix CVE-2019-20892
        wireshark: Update to 3.2.5
        Revert "jsoncpp: upgrade 1.9.2 -> 1.9.3"
        jsoncpp: add PE do to revert to older PV
        vlc: fix loop initial declarations are only allowed in C99 mode
        babl-native: fix build issue
        gnome-settings-daemon: Backport 3.36 fix for building without wayland

  Bog999 (1):
        python3: Add python3-cryptography to RDEPENDS for python3-redis

  Changqing Li (4):
        python-django: add RDEPENDS
        python-m2crypto: Add RDEPENDS
        libmcrypt: set CLEANBROKEN
        radvd: add /etc/radvd.conf

  Christian Eggers (1):
        linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t

  Christoph Steiger (1):
        python-periphery: Add python-mmap to RDEPENDS

  Denys Dmytriyenko (2):
        python3-pycryptodome(x): moved to OE-Core, remove from meta-python
        python3-pyelftools: moved to OE-Core, remove from meta-python

  Diego Rondini (5):
        README: fix incorrect links
        gvfs: adjust fuse packageconfig to fuse3
        libeigen: update SRC_URI to download from gitlab
        libeigen: update SRC_URI to use gitlab git
        hplip: use libexecdir

  Domarys Correa (2):
        python3-jinja2: Update 2.11.1 -> 2.11.2
        python3-pyyaml: Update 5.3 -> 5.3.1

  Gianluca Pacchiella (1):
        Add missing dependencies for rsnapshot.

  Hongxu Jia (2):
        multipath-tools: fix compiling parallel issue
        python3-pykwalify: fix missing comma

  Julius Hemanth Pitti (1):
        netkit-telnetd: Fix buffer overflow in netoprintf

  Kai Kang (6):
        xfconf: 4.14.2 -> 4.14.3
        thunar: 1.8.12 -> 1.8.14
        catfish: 1.4.11 -> 1.4.13
        plymouth: disable systemd-integration for sysvinit
        lvm2: remove service template from SYSTEMD_SERVICE
        rdist: fix parallel build

  Khem Raj (10):
        netplan: Depend on systemd if it is in distro
        uim: Add patch to fix -fno-common link error
        postfix: Upgrade to 3.4.10 and compile with -fcommon
        safec: Update to latest on 3.5.1 release tags
        nss: Remove mcpu to avoid march conflicts
        samba: Fix conflicts with nss.h from glibc
        flashrom: Fix build failure with glibc 2.32
        iwd: Upgrade to 1.9
        ssmtp: Use update alternatives for conflicts with esmtp
        ubi-utils-klibc: Remove trailing slash from S

  Konrad Weihmann (10):
        passwdqc: remove double modify operation
        sound-theme-freedesktop: remove double depends
        python3-cmd2: remove double colorama in RDEPENDS
        python3-smbus2: remove duplicate RDEPENDS settings
        python3-twisted: remove double var modification
        proftpd: Fix typo for SRC_URI[md5sum]
        netkit-rsh: properly append PACKAGECONFIG
        zile: properly append PACKAGECONFIG
        libtalloc: fix upstream url
        openldap: packaging fixes

  Lee Chee Yang (2):
        glog : improve reproducibility
        libgphoto2: improve reproducibility

  Leon Anavi (8):
        python3-gmqtt: Upgrade to 0.6.5
        python3-appdirs: Upgrade to 1.4.4
        python3-pandas: Upgrade 1.0.1 -> 1.0.3
        python3-parallax: Upgrade 1.0.5 -> 1.0.6
        python3-openpyxl: Upgrade 2.6.3 -> 3.0.3
        python3-colorama: Upgrade 0.4.1 -> 0.4.3
        python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17
        python3-pandas: Upgrade 1.0.3 -> 1.0.5

  Maciej Pijanowski (1):
        qpdf: fix typo in RDEPENDS

  Mark Jonas (1):
        python3-pyinotify: Add missing ctypes dependency

  Martin Jansa (6):
        irssi: package libirc_proxy.a in PN-staticdev
        meta-python: depend on core version 12 or higher
        lcov: fix lcov-native build
        netkit-rsh: inherit update-alternatives
        ssmtp: adjust u-a
        remmina: use git fetcher

  Mingli Yu (5):
        python3-m2crypto: add the missing rdepends
        freeradius: fix the existed certificate error
        freeradius: fix the occasional verification failure
        smartmontools: Remove obsolete setting regarding the Standard Output
        strongswan: Remove obsolete setting regarding the Standard Output

  Oleksandr Kravchuk (1):
        iwd: update to 1.8

  Ovidiu Panait (3):
        freediameter: Fix testcnx ptest failure
        nss: Fix CVE-2020-12399
        net-snmp: Fix CVE-2020-15861 and CVE-2020-15862

  Patrick Williams (1):
        net-snmp: refresh patches

  Paul Eggleton (1):
        protobuf-c: disable parallelism to avoid race condition

  Pierre-Jean Texier (15):
        librsync: upgrade 2.3.0 -> 2.3.1
        ser2net: fix upstream check URL
        ser2net: upgrade 4.1.5 -> 4.1.8
        zchunk: upgrade 1.1.5 -> 1.1.6
        uriparser: upgrade 0.9.3 -> 0.9.4
        jsoncpp: upgrade 1.9.2 -> 1.9.3
        jpnevulator: upgrade 2.3.4 -> 2.3.5
        libnftnl: upgrade 1.1.6 -> 1.1.7
        nftables: upgrade 0.9.4 -> 0.9.5
        haveged: upgrade 1.9.8 -> 1.9.9
        rsnapshot: upgrade 1.4.2 -> 1.4.3
        fuse3: upgrade 3.9.1 -> 3.9.2
        minicoredumper: update SRC_URI to use github instead
        iwd: upgrade 1.6 -> 1.7
        haveged: upgrade 1.9.9 -> 1.9.13

  Qi.Chen@windriver.com (2):
        python-django: set CVE_PRODUCT to be django
        multipath-tools: disable parallel build as a workaround

  Robert Joslyn (1):
        postgresql: Update to 12.4

  Robert Yang (2):
        drbd-utils: Add CLEANBROKEN to fix rebuild errors
        crda: rdepends on wireless-regdb-static

  Ross Burton (1):
        mpv: fetch waf in do_fetch

  Ryan Rowe (1):
        python3-pint: add setuptools and packaging to RDEPENDS

  Trevor Gamblin (1):
        python3-iso8601: add python3-numbers to RDEPENDS

  Ulrich Ölmann (1):
        usb-modeswitch, usb-modeswitch-data: fix usrmerge

  Wang Mingyu (7):
        jansson: upgrade 2.12 -> 2.13.1
        openldap: upgrade 2.4.49 -> 2.4.50
        python3-pycparser: upgrade 2.19 -> 2.20
        cryptsetup: upgrade 2.3.1 -> 2.3.2
        postgresql: 12.2 -> 12.3
        openipmi: upgrade 2.0.28 -> 2.0.29
        twm: upgrade 1.0.10 -> 1.0.11

  Yanfei Xu (1):
        turbostat: fix the build failure for new v5.7-rc6 kernel

  Yi Zhao (4):
        apache2: create log/run directory via pkg_postinst
        samba: upgrade 4.10.15 -> 4.10.17
        libldb: upgrade 1.5.7 -> 1.5.8
        samba: upgrade 4.10.17 -> 4.10.18

  Yue Tao (1):
        lua: Security Advisory - lua - CVE-2020-15888

  Zang Ruochen (12):
        dnsmasq: upgrade 2.80 -> 2.81
        fetchmail: upgrade 6.4.3 -> 6.4.4
        libgphoto2: upgrade 2.5.24 -> 2.5.25
        mosquitto: upgrade 1.6.9 -> 1.6.10
        snort: upgrade 2.9.15 -> 2.9.16
        wireshark: upgrade 3.2.2 -> 3.2.4
        proj: upgrade 7.0.0 -> 7.0.1
        libvpx: upgrade 1.8.1 -> 1.8.2
        mm-common: upgrade 1.0..0 -> 1.0.1
        nftables: upgrade 0.9.5 -> 0.9.6
        wireshark: upgrade 3.2.5 -> 3.2.6
        wireshark: upgrade 3.2.6 -> 3.2.7

  Zheng Ruoqin (11):
        dstat: Fix runtime error that depend python.
        kea: upgrade 1.7.6 -> 1.7.7
        libqmi: upgrade 1.24.8 -> 1.24.12
        nano: upgrade 4.9.2 -> 4.9.3
        gsoap: upgrade 2.8.100 -> 2.8.103
        logwatch: upgrade 7.5.1 -> 7.5.3
        libnet-dns-perl: upgrade 1.23 -> 1.24
        Fix build error when enable multilib.
        mraa: Disable python2, otherwise, there is a build error when enable multilib.
        paho-mqtt-c: Fix build error when enable multilib.
        upm:Fix build error when enable multilib.

meta-security: d83f7cb0c9..c74cc97641:
  Adrian (1):
        gitignore added

  Alexander Kanavin (1):
        apparmor: pull in coreutils/findutils only when not using systemd as init manager

  Armin Kuster (15):
        isafw.bbclass: typo in layer name
        trousers: Several Security fixes
        gitlab-ci: add support for dunfell
        packagegroup-core-security-ptest: update fail2ban ptest pkg name
        packagegroup-core-security: remove clamav for riscv*
        libsecomp: rv32/rv64 target builds are not supported yet
        packagegroup-core-security: remove libseccomp for riscv*
        packagegroup-core-security: dont include suricata on riscv or ppc
        apparmor: exclude mips64, not supported
        apparmor: fix build issue with ptest enabled.
        packagegroup-core-security: remove clamav from musl image
        ibmswtpm2: fix QA warning
        README: updated branch for Dunfell
        apparmor: fix issue with older use of shell in make
        apparmor: fix QA warning with systemd enabled

  Charlie Davies (2):
        clamav: add INSTALL_CLAMAV_CVD flag to do_install
        clamav: update SO_VER to 9.0.4

  Jeremy Puhlman (4):
        clamav: resolve multilib issues
        tripwire: Remove makefiles from the man directories.
        cryptsetup-tpm-incubator: RPROVIDES cryptsetup and cryptsetup-dev
        packagegroup-security-tpm2: Depend on preferred provider for cryptsetup

  Jonatan Pålsson (1):
        sssd: Make manpages buildable

  Kai Kang (1):
        sssd: disable build secrets

  Mingli Yu (1):
        scap-security-guide: add expat-native to DEPENDS

  Naveen Saini (3):
        initramfs-framework/dmverity: add retry loop for slow boot devices
        wic: add wks.in for intel dm-verity
        linux-%/5.x: Add dm-verity fragment as needed

  Sajjad Ahmed (1):
        layer.conf: use += instead of := to update BBFILES

  Zheng Ruoqin (2):
        ccs-tools:Fix build error when enable multilib.
        bastille: Deleted redundant inherit to fix error when enable multilib.

  niko.mauno@vaisala.com (12):
        dm-verity-img.bbclass: Fix bashisms
        dm-verity-img.bbclass: Reorder parse-time check
        dm-verity-image-initramfs: Ensure verity hash sync
        dm-verity-image-initramfs: Bind at do_image instead
        linux-yocto(-dev): Add dm-verity fragment as needed
        dm-verity-img.bbclass: Stage verity.env file
        initramfs-framework: Add dmverity module
        dm-verity-image-initramfs: Use initramfs-framework
        dm-verity-initramfs-image: Cosmetic improvements
        dm-verity-image-initramfs: Add base-passwd package
        dm-verity-image-initramfs: Drop locales from image
        beaglebone-yocto-verity.wks.in: Refer IMGDEPLOYDIR

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I9d46472961318a9060013505d7cb5df46b4ea38a

48 files changed, 923 insertions, 904 deletions

diff --git a/poky/meta/recipes-extended/acpica/acpica_20200214.bb b/poky/meta/recipes-extended/acpica/acpica_20200430.bb
index cfa9fec4fb..478be7f56e 100644
--- a/poky/meta/recipes-extended/acpica/acpica_20200214.bb
+++ b/poky/meta/recipes-extended/acpica/acpica_20200430.bb
@@ -17,8 +17,8 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 DEPENDS = "m4-native flex-native bison-native"
 
 SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz"
-SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113"
-SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e"
+SRC_URI[sha256sum] = "fb807f1dec31664f972af37d213abf72987afe33abf68c83051e298da35d297c"
+
 UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
 
 S = "${WORKDIR}/acpica-unix-${PV}"
diff --git a/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch
new file mode 100644
index 0000000000..7b2073201e
--- /dev/null
+++ b/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch
@@ -0,0 +1,386 @@
+From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001
+From: Chet Ramey <chet.ramey@case.edu>
+Date: Mon, 1 Jul 2019 09:03:53 -0400
+Subject: [PATCH] commit bash-20190628 snapshot
+
+An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11.
+By default, if Bash is run with its effective UID not equal to its real UID,
+it will drop privileges by setting its effective UID to its real UID.
+However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality,
+the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for
+runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore
+regains privileges. However, binaries running with an effective UID of 0 are unaffected.
+
+Get the patch from [1] to fix the issue.
+
+Upstream-Status: Inappropriate [the upstream thinks it doesn't increase the credibility of CVEs in general]
+CVE: CVE-2019-18276
+
+[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=951bdaa
+
+Signed-off-by: De Huo <De.Huo@windriver.com>
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ MANIFEST          |  2 ++
+ bashline.c        | 50 +-------------------------------------------------
+ builtins/help.def |  2 +-
+ config.h.in       | 10 +++++++++-
+ configure.ac      |  1 +
+ doc/bash.1        |  3 ++-
+ doc/bashref.texi  |  3 ++-
+ lib/glob/glob.c   |  5 ++++-
+ pathexp.c         | 16 ++++++++++++++--
+ shell.c           |  8 ++++++++
+ tests/glob.tests  |  2 ++
+ tests/glob6.sub   | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/glob7.sub   | 11 +++++++++++
+ 14 files changed, 122 insertions(+), 56 deletions(-)
+ create mode 100644 tests/glob6.sub
+ create mode 100644 tests/glob7.sub
+
+diff --git a/MANIFEST b/MANIFEST
+index 03de221..f9ccad7 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -1037,6 +1037,8 @@ tests/extglob3.tests	f
+ tests/extglob3.right	f
+ tests/extglob4.sub	f
+ tests/extglob5.sub	f
++tests/glob6.sub		f
++tests/glob7.sub		f
+ tests/func.tests	f
+ tests/func.right	f
+ tests/func1.sub		f
+diff --git a/bashline.c b/bashline.c
+index 824ea9d..d86b47d 100644
+--- a/bashline.c
++++ b/bashline.c
+@@ -3718,55 +3718,7 @@ static int
+ completion_glob_pattern (string)
+      char *string;
+ {
+-  register int c;
+-  char *send;
+-  int open;
+-
+-  DECLARE_MBSTATE;
+-
+-  open = 0;
+-  send = string + strlen (string);
+-
+-  while (c = *string++)
+-    {
+-      switch (c)
+-	{
+-	case '?':
+-	case '*':
+-	  return (1);
+-
+-	case '[':
+-	  open++;
+-	  continue;
+-
+-	case ']':
+-	  if (open)
+-	    return (1);
+-	  continue;
+-
+-	case '+':
+-	case '@':
+-	case '!':
+-	  if (*string == '(')	/*)*/
+-	    return (1);
+-	  continue;
+-
+-	case '\\':
+-	  if (*string++ == 0)
+-	    return (0);	 	  
+-	}
+-
+-      /* Advance one fewer byte than an entire multibyte character to
+-	 account for the auto-increment in the loop above. */
+-#ifdef HANDLE_MULTIBYTE
+-      string--;
+-      ADVANCE_CHAR_P (string, send - string);
+-      string++;
+-#else
+-      ADVANCE_CHAR_P (string, send - string);
+-#endif
+-    }
+-  return (0);
++  return (glob_pattern_p (string) == 1);
+ }
+ 
+ static char *globtext;
+diff --git a/builtins/help.def b/builtins/help.def
+index 006c4b5..92f9b38 100644
+--- a/builtins/help.def
++++ b/builtins/help.def
+@@ -128,7 +128,7 @@ help_builtin (list)
+ 
+   /* We should consider making `help bash' do something. */
+ 
+-  if (glob_pattern_p (list->word->word))
++  if (glob_pattern_p (list->word->word) == 1)
+     {
+       printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
+       print_word_list (list, ", ");
+diff --git a/config.h.in b/config.h.in
+index 8554aec..ad4b1e8 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -1,6 +1,6 @@
+ /* config.h -- Configuration file for bash. */
+ 
+-/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc.
++/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc.
+ 
+    This file is part of GNU Bash, the Bourne Again SHell.
+ 
+@@ -807,6 +807,14 @@
+ #undef HAVE_SETREGID
+ #undef HAVE_DECL_SETREGID
+ 
++/* Define if you have the setregid function.  */
++#undef HAVE_SETRESGID
++#undef HAVE_DECL_SETRESGID
++
++/* Define if you have the setresuid function.  */
++#undef HAVE_SETRESUID
++#undef HAVE_DECL_SETRESUID
++
+ /* Define if you have the setvbuf function.  */
+ #undef HAVE_SETVBUF
+ 
+diff --git a/configure.ac b/configure.ac
+index 52b4cdb..549adef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr])
+ AC_CHECK_DECLS([printf])
+ AC_CHECK_DECLS([sbrk])
+ AC_CHECK_DECLS([setregid])
++AC_CHECK_DECLS[(setresuid, setresgid])
+ AC_CHECK_DECLS([strcpy])
+ AC_CHECK_DECLS([strsignal])
+ 
+diff --git a/doc/bash.1 b/doc/bash.1
+index e6cd08d..9e58a0b 100644
+--- a/doc/bash.1
++++ b/doc/bash.1
+@@ -4681,7 +4681,8 @@ above).
+ .PD
+ .SH "SIMPLE COMMAND EXPANSION"
+ When a simple command is executed, the shell performs the following
+-expansions, assignments, and redirections, from left to right.
++expansions, assignments, and redirections, from left to right, in
++the following order.
+ .IP 1.
+ The words that the parser has marked as variable assignments (those
+ preceding the command name) and redirections are saved for later
+diff --git a/doc/bashref.texi b/doc/bashref.texi
+index d33cd57..3065126 100644
+--- a/doc/bashref.texi
++++ b/doc/bashref.texi
+@@ -2964,7 +2964,8 @@ is not specified.  If the file does not exist, it is created.
+ @cindex command expansion
+ 
+ When a simple command is executed, the shell performs the following
+-expansions, assignments, and redirections, from left to right.
++expansions, assignments, and redirections, from left to right, in
++the following order.
+ 
+ @enumerate
+ @item
+diff --git a/lib/glob/glob.c b/lib/glob/glob.c
+index 398253b..2eaa33e 100644
+--- a/lib/glob/glob.c
++++ b/lib/glob/glob.c
+@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags)
+   register unsigned int i;
+   int mflags;		/* Flags passed to strmatch (). */
+   int pflags;		/* flags passed to sh_makepath () */
++  int hasglob;		/* return value from glob_pattern_p */
+   int nalloca;
+   struct globval *firstmalloc, *tmplink;
+   char *convfn;
+@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags)
+   patlen = (pat && *pat) ? strlen (pat) : 0;
+ 
+   /* If the filename pattern (PAT) does not contain any globbing characters,
++     or contains a pattern with only backslash escapes (hasglob == 2),
+      we can dispense with reading the directory, and just see if there is
+      a filename `DIR/PAT'.  If there is, and we can access it, just make the
+      vector to return and bail immediately. */
+-  if (skip == 0 && glob_pattern_p (pat) == 0)
++  hasglob = 0;
++  if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == 2)
+     {
+       int dirlen;
+       struct stat finfo;
+diff --git a/pathexp.c b/pathexp.c
+index c1bf2d8..e6c5392 100644
+--- a/pathexp.c
++++ b/pathexp.c
+@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT;
+ /* Control enabling special handling of `**' */
+ int glob_star = 0;
+ 
+-/* Return nonzero if STRING has any unquoted special globbing chars in it.  */
++/* Return nonzero if STRING has any unquoted special globbing chars in it.
++   This is supposed to be called when pathname expansion is performed, so
++   it implements the rules in Posix 2.13.3, specifically that an unquoted
++   slash cannot appear in a bracket expression. */
+ int
+ unquoted_glob_pattern_p (string)
+      register char *string;
+@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string)
+ 	  continue;
+ 
+ 	case ']':
+-	  if (open)
++	  if (open)		/* XXX - if --open == 0? */
+ 	    return (1);
+ 	  continue;
+ 
++	case '/':
++	  if (open)
++	    open = 0;
++
+ 	case '+':
+ 	case '@':
+ 	case '!':
+@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string)
+ 	      string++;
+ 	      continue;
+ 	    }
++	  else if (open && *string == '/')
++	    {
++	      string++;		/* quoted slashes in bracket expressions are ok */
++	      continue;
++	    }
+ 	  else if (*string == 0)
+ 	    return (0);
+ 	 	  
+diff --git a/shell.c b/shell.c
+index a2b2a55..6adabc8 100644
+--- a/shell.c
++++ b/shell.c
+@@ -1293,7 +1293,11 @@ disable_priv_mode ()
+ {
+   int e;
+ 
++#if HAVE_DECL_SETRESUID
++  if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0)
++#else
+   if (setuid (current_user.uid) < 0)
++#endif
+     {
+       e = errno;
+       sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);
+@@ -1302,7 +1306,11 @@ disable_priv_mode ()
+ 	exit (e);
+ #endif
+     }
++#if HAVE_DECL_SETRESGID
++  if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0)
++#else
+   if (setgid (current_user.gid) < 0)
++#endif
+     sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);
+ 
+   current_user.euid = current_user.uid;
+diff --git a/tests/glob.tests b/tests/glob.tests
+index 01913bb..fb012f7 100644
+--- a/tests/glob.tests
++++ b/tests/glob.tests
+@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub
+ ${THIS_SH} ./glob2.sub
+ ${THIS_SH} ./glob3.sub
+ ${THIS_SH} ./glob4.sub
++${THIS_SH} ./glob6.sub
++${THIS_SH} ./glob7.sub
+ 
+ MYDIR=$PWD	# save where we are
+ 
+diff --git a/tests/glob6.sub b/tests/glob6.sub
+new file mode 100644
+index 0000000..b099811
+--- /dev/null
++++ b/tests/glob6.sub
+@@ -0,0 +1,54 @@
++# tests of the backslash-in-glob-patterns discussion on the austin-group ML
++
++: ${TMPDIR:=/var/tmp}
++
++ORIG=$PWD
++GLOBDIR=$TMPDIR/bash-glob-$$
++mkdir $GLOBDIR && cd $GLOBDIR
++
++# does the pattern matcher allow backslashes as escape characters and remove
++# them as part of matching?
++touch abcdefg
++pat='ab\cd*'
++printf '<%s>\n' $pat
++pat='\.'
++printf '<%s>\n' $pat
++rm abcdefg
++
++# how about when escaping pattern characters?
++touch '*abc.c'
++a='\**.c'
++printf '%s\n' $a
++rm -f '*abc.c'
++
++# how about when making the distinction between readable and searchable path
++# components?
++mkdir -m a=x searchable
++mkdir -m a=r readable
++
++p='searchable/\.'
++printf "%s\n" $p
++
++p='searchable/\./.'
++printf "%s\n" $p
++
++p='readable/\.'
++printf "%s\n" $p
++
++p='readable/\./.'
++printf "%s\n" $p
++
++printf "%s\n" 'searchable/\.'
++printf "%s\n" 'readable/\.'
++
++echo */.
++
++p='*/\.'
++echo $p
++
++echo */'.'
++
++rmdir searchable readable
++
++cd $ORIG
++rmdir $GLOBDIR
+diff --git a/tests/glob7.sub b/tests/glob7.sub
+new file mode 100644
+index 0000000..0212b8e
+--- /dev/null
++++ b/tests/glob7.sub
+@@ -0,0 +1,11 @@
++# according to Posix 2.13.3, a slash in a bracket expression renders that
++# bracket expression invalid
++shopt -s nullglob
++
++echo 1: [qwe/qwe]
++echo 2: [qwe/
++echo 3: [qwe/]
++
++echo 4: [qwe\/qwe]
++echo 5: [qwe\/
++echo 6: [qwe\/]
+-- 
+1.9.1
+
diff --git a/poky/meta/recipes-extended/bash/bash_5.0.bb b/poky/meta/recipes-extended/bash/bash_5.0.bb
index 8ff9e6edaf..257a03bd8b 100644
--- a/poky/meta/recipes-extended/bash/bash_5.0.bb
+++ b/poky/meta/recipes-extended/bash/bash_5.0.bb
@@ -21,6 +21,8 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
            ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \
            ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \
            ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-017;apply=yes;striplevel=0;name=patch017 \
+           ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-018;apply=yes;striplevel=0;name=patch018 \
            file://execute_cmd.patch \
            file://mkbuiltins_have_stringize.patch \
            file://build-tests.patch \
@@ -28,6 +30,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
            file://run-ptest \
            file://run-bash-ptests \
            file://fix-run-builtins.patch \
+           file://bash-CVE-2019-18276.patch \
            "
 
 SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b"
@@ -65,6 +68,11 @@ SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02"
 SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e"
 SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5"
 SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d"
+SRC_URI[patch017.md5sum] = "d9dcaa1d8e7a24850449a1aac43a12a9"
+SRC_URI[patch017.sha256sum] = "4cf3b9fafb8a66d411dd5fc9120032533a4012df1dc6ee024c7833373e2ddc31"
+SRC_URI[patch018.md5sum] = "a64d950d5de72ae590455b13e6afefcb"
+SRC_URI[patch018.sha256sum] = "7c314e375a105a6642e8ed44f3808b9def89d15f7492fe2029a21ba9c0de81d3"
+
 
 DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
 DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
diff --git a/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch b/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch
new file mode 100644
index 0000000000..d48a3b0d19
--- /dev/null
+++ b/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch
@@ -0,0 +1,28 @@
+From 33e6cb5a28fab3d99bd6818f8c01e6f33805390f Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 20 Jan 2020 07:45:39 +0200
+Subject: [PATCH] src/global.c: Remove superfluous declaration of program_name
+
+Upstream-Status: Accepted (commit 641d3f4)
+Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
+---
+ src/global.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/global.c b/src/global.c
+index fb3abe9..acf92bc 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
+ /* Extract to standard output? */
+ bool to_stdout_option = false;
+ 
+-/* The name this program was run with.  */
+-char *program_name;
+-
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */
+ int (*xstat) ();
+-- 
+2.26.2
+
diff --git a/poky/meta/recipes-extended/cpio/cpio_2.13.bb b/poky/meta/recipes-extended/cpio/cpio_2.13.bb
index ecea8c6d8e..9e35a80f8b 100644
--- a/poky/meta/recipes-extended/cpio/cpio_2.13.bb
+++ b/poky/meta/recipes-extended/cpio/cpio_2.13.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
 
 SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
+           file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \
            "
 
 SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810"
diff --git a/poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch b/poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
index 5834ffaf9f..a9afb9948c 100644
--- a/poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
+++ b/poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
@@ -1,7 +1,7 @@
-From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001
+From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 18 Jan 2016 01:00:30 -0500
-Subject: [PATCH 03/10] configure.ac: do not check local png source
+Subject: [PATCH] configure.ac: do not check local png source
 
 In oe-core, it did not need to compile local libpng
 source in ghostscript, so do not check local png
@@ -11,28 +11,21 @@ libpng library.
 Upstream-Status: Inappropriate [OE-Core specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
 ---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9341930..80a60b1 100644
+index 698abd3..e65ac8b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR)
- AC_SUBST(FT_SYS_ZLIB)
- 
- dnl png for the png output device; it also requires zlib
--LIBPNGDIR=src
-+LIBPNGDIR=$srcdir/libpng
- PNGDEVS=''
- PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha'
- AC_MSG_CHECKING([for local png library source])
--if test -f $srcdir/libpng/pngread.c; then
-+if false; then
-         AC_MSG_RESULT([yes])
-         SHARE_LIBPNG=0
-         LIBPNGDIR=$srcdir/libpng
--- 
-1.8.3.1
-
+@@ -1241,7 +1241,7 @@ else
+   PNGDEVS=''
+   PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha'
+   AC_MSG_CHECKING([for local png library source])
+-  if test -f $srcdir/libpng/pngread.c; then
++  if false; then
+           AC_MSG_RESULT([yes])
+           SHARE_LIBPNG=0
+           LIBPNGDIR=$srcdir/libpng
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch
deleted file mode 100644
index 715ec1c450..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2019-14869-0001.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 485904772c5f0aa1140032746e5a0abfc40f4cef Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 5 Nov 2019 09:45:27 +0000
-Subject: [PATCH] Bug 701841: remove .forceput from /.charkeys
-
-When loading Type 1 or Truetype fonts from disk, we attempt to extend the glyph
-name table to include all identifiable glyph names from the Adobe Glyph List.
-
-In the case of Type 1 fonts, the font itself (almost always) marks the
-CharStrings dictionary as read-only, hence we have to use .forceput for that
-case.
-
-But for Truetype fonts, the CharStrings dictionary is created internally and is
-not read-only until *after* we have fully populated it (including the extended
-glyph names from the AGL), hence there is no need for .forceput, and no need to
-carry the security risk of using it.
-
-Replace with regular put.
-
-CVE: CVE-2019-14869
-Upstream-Status: Backport [git://git.ghostscript.com/ghostpdl.git]
-
-Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
----
- Resource/Init/gs_ttf.ps | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps
-index e34967d..5354ff0 100644
---- a/Resource/Init/gs_ttf.ps
-+++ b/Resource/Init/gs_ttf.ps
-@@ -1301,7 +1301,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
-           TTFDEBUG { (\n1 setting alias: ) print dup ==only
-                 ( to be the same as  ) print 2 index //== exec } if
- 
--          7 index 2 index 3 -1 roll exch .forceput
-+          7 index 2 index 3 -1 roll exch put
-         } forall
-         pop pop pop
-       }
-@@ -1319,7 +1319,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
-           exch pop
-           TTFDEBUG { (\n2 setting alias: ) print 1 index ==only
-                      ( to use glyph index: ) print dup //== exec } if
--          5 index 3 1 roll .forceput
-+          5 index 3 1 roll put
-           //false
-         }
-         {
-@@ -1336,7 +1336,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
-         {                            %  CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer)
-           TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only
-                 ( to be index: ) print dup //== exec } if
--          exch pop 5 index 3 1 roll .forceput
-+          exch pop 5 index 3 1 roll put
-         }
-         {
-           pop pop
-@@ -1366,7 +1366,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
-       } ifelse
-     ]
-   TTFDEBUG { (Encoding: ) print dup === flush } if
--} .bind executeonly odef		% hides .forceput
-+} .bind odef
- 
- % ---------------- CIDFontType 2 font loading ---------------- %
- 
--- 
-2.20.1
-
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
new file mode 100644
index 0000000000..d7c5f034e5
--- /dev/null
+++ b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
@@ -0,0 +1,54 @@
+From 5d499272b95a6b890a1397e11d20937de000d31b Mon Sep 17 00:00:00 2001
+From: Ray Johnston <ray.johnston@artifex.com>
+Date: Wed, 22 Jul 2020 09:57:54 -0700
+Subject: [PATCH] Bug 702582, CVE 2020-15900 Memory Corruption in Ghostscript
+ 9.52
+
+Fix the 'rsearch' calculation for the 'post' size to give the correct
+size.  Previous calculation would result in a size that was too large,
+and could underflow to max uint32_t. Also fix 'rsearch' to return the
+correct 'pre' string with empty string match.
+
+A future change may 'undefine' this undocumented, non-standard operator
+during initialization as we do with the many other non-standard internal
+PostScript operators and procedures.
+
+Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b]
+CVE: CVE-2020-15900
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ psi/zstring.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/psi/zstring.c b/psi/zstring.c
+index 33662dafa..58e1af2b3 100644
+--- a/psi/zstring.c
++++ b/psi/zstring.c
+@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward)
+     return 0;
+ found:
+     op->tas.type_attrs = op1->tas.type_attrs;
+-    op->value.bytes = ptr;
+-    r_set_size(op, size);
++    op->value.bytes = ptr;				/* match */
++    op->tas.rsize = size;				/* match */
+     push(2);
+-    op[-1] = *op1;
+-    r_set_size(op - 1, ptr - op[-1].value.bytes);
+-    op1->value.bytes = ptr + size;
+-    r_set_size(op1, count + (!forward ? (size - 1) : 0));
++    op[-1] = *op1;					/* pre */
++    op[-3].value.bytes = ptr + size;			/* post */
++    if (forward) {
++        op[-1].tas.rsize = ptr - op[-1].value.bytes;	/* pre */
++        op[-3].tas.rsize = count;			/* post */
++    } else {
++        op[-1].tas.rsize = count;			/* pre */
++        op[-3].tas.rsize -= count + size;		/* post */
++    }
+     make_true(op);
+     return 0;
+ }
+-- 
+2.17.1
+
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
deleted file mode 100644
index a05de29def..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
deleted file mode 100644
index e8772cd958..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
deleted file mode 100644
index 359097f356..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
deleted file mode 100644
index 7b70bb8e2c..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c076d0fc970f190f723018258790c79b59daba2e Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Sat, 11 May 2019 21:20:27 +0800
-Subject: [PATCH] not generate objarch.h at compile time
-
-Import patch from windriver linux for cross compilation, and split
-patches into oe way under different directories such as i586, powerpc etc
-according to Richard's opinion.
-
-Upstream-Status: Pending
-
-Signed-off-by: Kang Kai <kai.kang@windriver.com>
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-
-Rebase to 9.27
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- base/lib.mak | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/base/lib.mak b/base/lib.mak
-index 3ed088a..5af2b43 100644
---- a/base/lib.mak
-+++ b/base/lib.mak
-@@ -87,8 +87,8 @@ arch_h=$(GLGEN)arch.h
- stdpre_h=$(GLSRC)stdpre.h
- stdint__h=$(GLSRC)stdint_.h
- 
--$(GLGEN)arch.h : $(GENARCH_XE)
--	$(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
-+##$(GLGEN)arch.h : $(GENARCH_XE)
-+##	$(EXP)$(GENARCH_XE) $(GLGEN)arch.h $(TARGET_ARCH_FILE)
- 
- # Platform interfaces
- 
--- 
-2.7.4
-
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
deleted file mode 100644
index 5817b7a6d7..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 4
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
-
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/i686 b/poky/meta/recipes-extended/ghostscript/ghostscript/i686
deleted file mode 120000
index 87aaca5903..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/i686
+++ /dev/null
@@ -1 +0,0 @@
-i586
\ No newline at end of file
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h
deleted file mode 100644
index 63232fdfa6..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 4
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
deleted file mode 100644
index 3ec8101681..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 4
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
deleted file mode 100644
index 0d0a16bfa3..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
deleted file mode 100644
index a05de29def..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
deleted file mode 100644
index 0d0a16bfa3..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
deleted file mode 100644
index a05de29def..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
deleted file mode 100644
index b8b637cca2..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 4
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
deleted file mode 100644
index 29f90ddf85..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 4
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h
deleted file mode 100644
index 3ec8101681..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 4
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
deleted file mode 100644
index 359097f356..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
deleted file mode 100644
index 0d0a16bfa3..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h
deleted file mode 100644
index a05de29def..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64le/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
deleted file mode 100644
index a05de29def..0000000000
--- a/poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
-	 /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
-	 /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
-	 /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
-	 /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript_9.50.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_9.52.bb
index 39c32644db..65135f5821 100644
--- a/poky/meta/recipes-extended/ghostscript/ghostscript_9.50.bb
+++ b/poky/meta/recipes-extended/ghostscript/ghostscript_9.52.bb
@@ -19,20 +19,22 @@ DEPENDS_class-native = "libpng-native"
 UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/${BPN}-${PV}.tar.gz \
+def gs_verdir(v):
+    return "".join(v.split("."))
+
+
+SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
                 file://ghostscript-9.15-parallel-make.patch \
                 file://ghostscript-9.16-Werror-return-type.patch \
                 file://do-not-check-local-libpng-source.patch \
                 file://avoid-host-contamination.patch \
                 file://mkdir-p.patch \
-                file://CVE-2019-14869-0001.patch \
 "
 
 SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.21-prevent_recompiling.patch \
-           file://ghostscript-9.02-genarch.patch \
-           file://objarch.h \
            file://cups-no-gcrypt.patch \
+           file://CVE-2020-15900.patch \
            "
 
 SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -40,8 +42,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
                         file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
                         "
 
-SRC_URI[md5sum] = "00970cf622bd5b46f68eec9383753870"
-SRC_URI[sha256sum] = "0f53e89fd647815828fc5171613e860e8535b68f7afbc91bf89aee886769ce89"
+SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901"
+SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176"
 
 # Put something like
 #
@@ -72,7 +74,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \
                              --without-jbig2dec --without-libpaper \
                              --with-fontpath=${datadir}/fonts \
                              --without-libidn --disable-fontconfig \
-                             --disable-freetype --disable-cups"
+                             --enable-freetype --disable-cups "
 
 # This has been fixed upstream but for now we need to subvert the check for time.h
 # http://bugs.ghostscript.com/show_bug.cgi?id=692443
@@ -80,15 +82,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \
 CFLAGS += "-DHAVE_SYS_TIME_H=1"
 BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1"
 
-inherit autotools
-
-do_configure_prepend () {
-	mkdir -p obj
-	mkdir -p soobj
-	if [ -e ${WORKDIR}/objarch.h ]; then
-		cp ${WORKDIR}/objarch.h obj/arch.h
-	fi
-}
+inherit autotools-brokensep
 
 do_configure_append () {
 	# copy tools from the native ghostscript build
diff --git a/poky/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch b/poky/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
deleted file mode 100644
index 3797cdf521..0000000000
--- a/poky/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Tue, 21 Jan 2020 11:51:16 -0500
-Subject: [PATCH] xdr_float: do not include bits/endian.h
-
-bits/endian.h is an internal header. endian.h should be included.
-
-Fixes compilation with recent musl.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
-
-Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- src/xdr_float.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xdr_float.c b/src/xdr_float.c
-index 26bc865..349d48f 100644
---- a/src/xdr_float.c
-+++ b/src/xdr_float.c
-@@ -83,7 +83,7 @@ static struct sgl_limits {
- };
- #else
- 
--#include <bits/endian.h>
-+#include <endian.h>
- #define IEEEFP
- 
- #endif /* vax */
--- 
-2.21.1
-
diff --git a/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb b/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb
index fc66821ecc..10a324c3b6 100644
--- a/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
+++ b/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb
@@ -9,20 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
 
 PROVIDES = "virtual/librpc"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
-           file://0001-xdr_float-do-not-include-bits-endian.h.patch \
-           "
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
-SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1"
-SRC_URI[sha256sum] = "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca"
+SRC_URI[md5sum] = "b25f9cc18bfad50f7c446c77f4ae00bb"
+SRC_URI[sha256sum] = "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gssapi"
 
-CFLAGS += "-fcommon"
-
 do_install_append() {
 	chown root:root ${D}${sysconfdir}/netconfig
 }
diff --git a/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb
index 7c7d51b39e..17f4bf4617 100644
--- a/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb
+++ b/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb
@@ -9,13 +9,6 @@ DEPENDS="coreutils popt"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-# When updating logrotate to latest upstream, SRC_URI should point to
-# a proper release tarball from https://github.com/logrotate/logrotate/releases
-# and we have to take the snapshot for now because there is no such
-# tarball available for 3.9.1.
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar"
 
diff --git a/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb b/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb
index a06cbcf845..3e8f7a13ec 100644
--- a/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb
+++ b/poky/meta/recipes-extended/lsb/lsb-release_1.4.bb
@@ -1,6 +1,6 @@
 SUMMARY = "lsb_release support for OpenEmbedded"
 SECTION = "console/utils"
-HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
+HOMEPAGE = "https://sourceforge.net/projects/lsb/files"
 LICENSE = "GPLv2+"
 
 # lsb_release needs getopt
diff --git a/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch b/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
index 5622a64d43..d77990e0e2 100644
--- a/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
+++ b/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] guard mallocopt() with __GLIBC__
 
 mallocopt is not available on non glibc implementations
 
-Upstream-Status: Pending
+Upstream-Status: Accepted [967612c454aea66770b64f69287671037fe895b3]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/poky/meta/recipes-extended/ltp/ltp_20200120.bb b/poky/meta/recipes-extended/ltp/ltp_20200120.bb
index deac3917d7..6633755a20 100644
--- a/poky/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/poky/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -74,18 +74,26 @@ do_install(){
          -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
          -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
          -e 's@[^ ]*--sysroot=[^ "]*@@g' 
+
+    # The controllers memcg_stree test seems to cause us hangs and takes 900s
+    # (maybe we expect more regular output?), anyhow, skip it
+    sed -e '/^memcg_stress/d' -i ${D}${prefix}/runtest/controllers
 }
 
 RDEPENDS_${PN} = "\
     attr \
     bash \
+    bc \
+    coreutils \
     cpio \
     cronie \
     curl \
+    e2fsprogs \
     e2fsprogs-mke2fs \
     expect \
     file \
     gawk \
+    gdb \
     gzip \
     iproute2 \
     ldd \
diff --git a/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb b/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 40c5273e00..001d3331a7 100644
--- a/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -19,8 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
            file://0001-fix-gcc-8-format-truncation-warning.patch \
            file://debian-no-Werror.patch \
            file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \
-	   file://mdadm.init \
-	   file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
+           file://mdadm.init \
+           file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
            file://include_sysmacros.patch \
            file://0001-mdadm-skip-test-11spare-migration.patch \
            "
@@ -30,7 +30,7 @@ SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1
 
 inherit autotools-brokensep ptest systemd
 
-SYSTEMD_SERVICE_${PN} = "mdmonitor.service mdmon@.service"
+SYSTEMD_SERVICE_${PN} = "mdmonitor.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"
diff --git a/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb
index 1e6f1317eb..6c539c553b 100644
--- a/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb
+++ b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Text-based modem control and terminal emulation program"
-HOMEPAGE = "http://alioth.debian.org/projects/minicom/"
+HOMEPAGE = "https://salsa.debian.org/minicom-team/minicom"
 DESCRIPTION = "Minicom is a text-based modem control and terminal emulation program for Unix-like operating systems"
 SECTION = "console/network"
 DEPENDS = "ncurses virtual/libiconv"
diff --git a/poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch b/poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch
new file mode 100644
index 0000000000..523d434b7c
--- /dev/null
+++ b/poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch
@@ -0,0 +1,381 @@
+From eb04ef31571f6c707eacaba6846feeebfab518e6 Mon Sep 17 00:00:00 2001
+From: Bernd Eckenfels <net-tools@lina.inka.de>
+Date: Thu, 29 May 2003 02:09:14 +0000
+Subject: [PATCH] added 'ull' prefix to unsigned long long constants to make
+ gcc 3.3 happy
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/eb04ef31571f6c707eacaba6846feeebfab518e6]
+---
+ lib/interface.c | 299 ++++++++++++++++++++++++++----------------------
+ 1 file changed, 161 insertions(+), 138 deletions(-)
+
+diff -uNr net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c
+--- net-tools-1.60.orig/lib/interface.c	2020-06-16 10:04:16.308411879 +0000
++++ net-tools-1.60/lib/interface.c	2020-06-16 10:05:15.697264291 +0000
+@@ -23,7 +23,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <ctype.h>
+-#include <string.h>
+ 
+ #if HAVE_AFIPX
+ #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+@@ -654,6 +653,8 @@
+     const char *Rext = "B";
+     const char *Text = "B";
+ 
++    static char flags[200];
++
+ #if HAVE_AFIPX
+     static struct aftype *ipxtype = NULL;
+ #endif
+@@ -685,32 +686,68 @@
+     if (hw == NULL)
+ 	hw = get_hwntype(-1);
+ 
+-    printf(_("%-9s Link encap:%s  "), ptr->name, hw->title);
+-    /* For some hardware types (eg Ash, ATM) we don't print the 
+-       hardware address if it's null.  */
+-    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
+-				  hw->suppress_null_addr)))
+-	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
+-#ifdef IFF_PORTSEL
+-    if (ptr->flags & IFF_PORTSEL) {
+-	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
+-	if (ptr->flags & IFF_AUTOMEDIA)
+-	    printf(_("(auto)"));
+-    }
++    sprintf(flags, "flags=%d<", ptr->flags);
++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
++    if (ptr->flags == 0)
++       strcat(flags,">");
++    if (ptr->flags & IFF_UP)
++       strcat(flags,_("UP,"));
++    if (ptr->flags & IFF_BROADCAST)
++       strcat(flags,_("BROADCAST,"));
++    if (ptr->flags & IFF_DEBUG)
++       strcat(flags,_("DEBUG,"));
++    if (ptr->flags & IFF_LOOPBACK)
++       strcat(flags,_("LOOPBACK,"));
++    if (ptr->flags & IFF_POINTOPOINT)
++       strcat(flags,_("POINTOPOINT,"));
++    if (ptr->flags & IFF_NOTRAILERS)
++       strcat(flags,_("NOTRAILERS,"));
++    if (ptr->flags & IFF_RUNNING)
++       strcat(flags,_("RUNNING,"));
++    if (ptr->flags & IFF_NOARP)
++       strcat(flags,_("NOARP,"));
++    if (ptr->flags & IFF_PROMISC)
++       strcat(flags,_("PROMISC,"));
++    if (ptr->flags & IFF_ALLMULTI)
++       strcat(flags,_("ALLMULTI,"));
++    if (ptr->flags & IFF_SLAVE)
++       strcat(flags,_("SLAVE,"));
++    if (ptr->flags & IFF_MASTER)
++       strcat(flags,_("MASTER,"));
++    if (ptr->flags & IFF_MULTICAST)
++       strcat(flags,_("MULTICAST,"));
++#ifdef HAVE_DYNAMIC
++    if (ptr->flags & IFF_DYNAMIC)
++       strcat(flags,_("DYNAMIC,"));
++#endif
++    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
++    if (flags[strlen(flags)-1] == ',')
++      flags[strlen(flags)-1] = '>';
++    else
++      flags[strlen(flags)-1] = 0;
++      
++
++    printf(_("%s: %s  mtu %d  metric %d"),
++          ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1);
++#ifdef SIOCSKEEPALIVE
++    if (ptr->outfill || ptr->keepalive)
++       printf(_("  outfill %d  keepalive %d"),
++              ptr->outfill, ptr->keepalive);
+ #endif
+     printf("\n");
+ 
+ #if HAVE_AFINET
+     if (ptr->has_ip) {
+-	printf(_("          %s addr:%s "), ap->name,
++        printf(_("        %s %s"), ap->name,
+ 	       ap->sprint(&ptr->addr, 1));
+-	if (ptr->flags & IFF_POINTOPOINT) {
+-	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
+-	}
++        printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
+ 	if (ptr->flags & IFF_BROADCAST) {
+-	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
++            printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
+ 	}
+-	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
++       if (ptr->flags & IFF_POINTOPOINT) {
++           printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
++       }
++       printf("\n");
+     }
+ #endif
+ 
+@@ -727,29 +764,30 @@
+ 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
+ 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
+ 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
+-		printf(_("          inet6 addr: %s/%d"),
+-		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
+-		printf(_(" Scope:"));
+-		switch (scope) {
+-		case 0:
+-		    printf(_("Global"));
+-		    break;
+-		case IPV6_ADDR_LINKLOCAL:
+-		    printf(_("Link"));
+-		    break;
+-		case IPV6_ADDR_SITELOCAL:
+-		    printf(_("Site"));
+-		    break;
+-		case IPV6_ADDR_COMPATv4:
+-		    printf(_("Compat"));
+-		    break;
+-		case IPV6_ADDR_LOOPBACK:
+-		    printf(_("Host"));
+-		    break;
+-		default:
+-		    printf(_("Unknown"));
++		printf(_("        %s %s  prefixlen %d"),
++			inet6_aftype.name, 
++			inet6_aftype.sprint((struct sockaddr *) &sap, 1), 
++			plen);
++		printf(_("  scopeid 0x%x"), scope);
++
++		flags[0] = '<'; flags[1] = 0;
++		if (scope & IPV6_ADDR_COMPATv4) {
++		    	strcat(flags, _("compat,"));
++		    	scope -= IPV6_ADDR_COMPATv4;
+ 		}
+-		printf("\n");
++		if (scope == 0)
++			strcat(flags, _("global,"));
++		if (scope & IPV6_ADDR_LINKLOCAL)
++			strcat(flags, _("link,"));
++		if (scope & IPV6_ADDR_SITELOCAL)
++			strcat(flags, _("site,"));
++		if (scope & IPV6_ADDR_LOOPBACK)
++			strcat(flags, _("host,"));
++		if (flags[strlen(flags)-1] == ',')
++			flags[strlen(flags)-1] = '>';
++		else
++			flags[strlen(flags)-1] = 0;
++		printf("%s\n", flags);
+ 	    }
+ 	}
+ 	fclose(f);
+@@ -762,17 +800,17 @@
+ 
+     if (ipxtype != NULL) {
+ 	if (ptr->has_ipx_bb)
+-	    printf(_("          IPX/Ethernet II addr:%s\n"),
+-		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
++	    printf(_("        %s Ethernet-II   %s\n"),
++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
+ 	if (ptr->has_ipx_sn)
+-	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
+-		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
++	    printf(_("        %s Ethernet-SNAP %s\n"),
++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
+ 	if (ptr->has_ipx_e2)
+-	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
+-		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
++	    printf(_("        %s Ethernet802.2 %s\n"),
++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
+ 	if (ptr->has_ipx_e3)
+-	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
+-		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
++	    printf(_("        %s Ethernet802.3 %s\n"),
++		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
+     }
+ #endif
+ 
+@@ -781,7 +819,7 @@
+ 	ddptype = get_afntype(AF_APPLETALK);
+     if (ddptype != NULL) {
+ 	if (ptr->has_ddp)
+-	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
++	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
+     }
+ #endif
+ 
+@@ -790,53 +828,30 @@
+ 	ectype = get_afntype(AF_ECONET);
+     if (ectype != NULL) {
+ 	if (ptr->has_econet)
+-	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
++	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
+     }
+ #endif
+ 
+-    printf("          ");
+-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
+-    if (ptr->flags == 0)
+-	printf(_("[NO FLAGS] "));
+-    if (ptr->flags & IFF_UP)
+-	printf(_("UP "));
+-    if (ptr->flags & IFF_BROADCAST)
+-	printf(_("BROADCAST "));
+-    if (ptr->flags & IFF_DEBUG)
+-	printf(_("DEBUG "));
+-    if (ptr->flags & IFF_LOOPBACK)
+-	printf(_("LOOPBACK "));
+-    if (ptr->flags & IFF_POINTOPOINT)
+-	printf(_("POINTOPOINT "));
+-    if (ptr->flags & IFF_NOTRAILERS)
+-	printf(_("NOTRAILERS "));
+-    if (ptr->flags & IFF_RUNNING)
+-	printf(_("RUNNING "));
+-    if (ptr->flags & IFF_NOARP)
+-	printf(_("NOARP "));
+-    if (ptr->flags & IFF_PROMISC)
+-	printf(_("PROMISC "));
+-    if (ptr->flags & IFF_ALLMULTI)
+-	printf(_("ALLMULTI "));
+-    if (ptr->flags & IFF_SLAVE)
+-	printf(_("SLAVE "));
+-    if (ptr->flags & IFF_MASTER)
+-	printf(_("MASTER "));
+-    if (ptr->flags & IFF_MULTICAST)
+-	printf(_("MULTICAST "));
+-#ifdef HAVE_DYNAMIC
+-    if (ptr->flags & IFF_DYNAMIC)
+-	printf(_("DYNAMIC "));
+-#endif
+-    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
+-    printf(_(" MTU:%d  Metric:%d"),
+-	   ptr->mtu, ptr->metric ? ptr->metric : 1);
+-#ifdef SIOCSKEEPALIVE
+-    if (ptr->outfill || ptr->keepalive)
+-	printf(_("  Outfill:%d  Keepalive:%d"),
+-	       ptr->outfill, ptr->keepalive);
++    /* For some hardware types (eg Ash, ATM) we don't print the 
++       hardware address if it's null.  */
++    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
++				  hw->suppress_null_addr)))
++	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
++    else
++	printf(_("        %s"), hw->name);
++    if (ptr->tx_queue_len != -1)
++    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
++    printf("  (%s)\n", hw->title);
++
++#ifdef IFF_PORTSEL
++    if (ptr->flags & IFF_PORTSEL) {
++	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
++	if (ptr->flags & IFF_AUTOMEDIA)
++	    printf(_("autoselect"));
++    	printf("\n");
++    }
+ #endif
+-    printf("\n");
++
+ 
+     /* If needed, display the interface statistics. */
+ 
+@@ -845,19 +860,9 @@
+ 	 *      not for the aliases, although strictly speaking they're shared
+ 	 *      by all addresses.
+ 	 */
+-	printf("          ");
+-
+-	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
+-	       ptr->stats.rx_packets, ptr->stats.rx_errors,
+-	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
+-	       ptr->stats.rx_frame_errors);
+-	if (can_compress)
+-	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
+ 
+ 	rx = ptr->stats.rx_bytes;  
+-	tx = ptr->stats.tx_bytes;
+ 	short_rx = rx * 10;  
+-	short_tx = tx * 10;
+ 	if (rx > 1125899906842624ull) {
+ 	    short_rx /= 1125899906842624ull;
+ 	    Rext = "PiB";
+@@ -874,6 +879,8 @@
+ 	    short_rx /= 1024;
+ 	    Rext = "KiB";
+ 	}
++        tx = ptr->stats.tx_bytes;
++        short_tx = tx * 10;
+ 	if (tx > 1125899906842624ull) {
+ 	    short_tx /= 1125899906842624ull;
+ 	    Text = "PiB";
+@@ -891,37 +898,50 @@
+ 	    Text = "KiB";
+ 	}
+ 
+-	printf("          ");
+-	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
+-	       ptr->stats.tx_packets, ptr->stats.tx_errors,
+-	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
+-	       ptr->stats.tx_carrier_errors);
+-	printf(_("          collisions:%lu "), ptr->stats.collisions);
+-	if (can_compress)
+-	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
+-	if (ptr->tx_queue_len != -1)
+-	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
+-	printf("\n          ");
+-	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
++	printf("        ");
++	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"), 
++		ptr->stats.rx_packets, 
+ 	       rx, (unsigned long)(short_rx / 10), 
+-	       (unsigned long)(short_rx % 10), Rext, 
+-	       tx, (unsigned long)(short_tx / 10), 
+-	       (unsigned long)(short_tx % 10), Text);
++	       (unsigned long)(short_rx % 10), Rext);
++	if (can_compress) {
++  	    printf("        ");
++	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
++	}
++	printf("        ");
++	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
++	       ptr->stats.rx_errors, ptr->stats.rx_dropped, 
++	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
++
++
++	printf("        ");
++	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
++		ptr->stats.tx_packets, 
++	        tx, (unsigned long)(short_tx / 10), 
++	        (unsigned long)(short_tx % 10), Text);
++	if (can_compress) {
++  	    printf("        ");
++	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
++	}
++	printf("        ");
++	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
++	       ptr->stats.tx_errors,
++	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
++	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
+     }
+ 
+     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
+ 	 ptr->map.base_addr >= 0x100)) {
+-	printf("          ");
++	printf("        device ");
+ 	if (ptr->map.irq)
+-	    printf(_("Interrupt:%d "), ptr->map.irq);
++	    printf(_("interrupt %d  "), ptr->map.irq);
+ 	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
+ 						   I/O maps */
+-	    printf(_("Base address:0x%x "), ptr->map.base_addr);
++	    printf(_("base 0x%x  "), ptr->map.base_addr);
+ 	if (ptr->map.mem_start) {
+-	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
++	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
+ 	}
+ 	if (ptr->map.dma)
+-	    printf(_("DMA chan:%x "), ptr->map.dma);
++	    printf(_("  dma 0x%x"), ptr->map.dma);
+ 	printf("\n");
+     }
+     printf("\n");
diff --git a/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 5a376e72f0..8bd30fc6d9 100644
--- a/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/
            file://net-tools-1.60-sctp3-addrs.patch \
            file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \
            file://net-tools-fix-building-with-linux-4.8.patch \
+           file://0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch \
           "
 
 # for this package we're mostly interested in tracking debian patches,
diff --git a/poky/meta/recipes-extended/pam/libpam/pam.d/common-password b/poky/meta/recipes-extended/pam/libpam/pam.d/common-password
index 3896057328..52478dae77 100644
--- a/poky/meta/recipes-extended/pam/libpam/pam.d/common-password
+++ b/poky/meta/recipes-extended/pam/libpam/pam.d/common-password
@@ -10,13 +10,10 @@
 # The "sha512" option enables salted SHA512 passwords.  Without this option,
 # the default is Unix crypt.  Prior releases used the option "md5".
 #
-# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in
-# login.defs.
-#
 # See the pam_unix manpage for other options.
 
 # here are the per-package modules (the "Primary" block)
-password	[success=1 default=ignore]	pam_unix.so obscure sha512
+password	[success=1 default=ignore]	pam_unix.so sha512
 # here's the fallback if no module succeeds
 password	requisite			pam_deny.so
 # prime the stack with a positive return value if there isn't one already;
diff --git a/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
index e321cd2b27..bcdcb7307d 100644
--- a/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
+++ b/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "PBZIP2 is a parallel implementation of the bzip2 block-sorting \
 file compressor that uses pthreads and achieves near-linear speedup on SMP \
 machines. The output of this version is fully compatible with bzip2 v1.0.2 or \
 newer (ie: anything compressed with pbzip2 can be decompressed with bzip2)."
-HOMEPAGE = "http://compression.ca/pbzip2/"
+HOMEPAGE = "https://launchpad.net/pbzip2/"
 SECTION = "console/utils"
 LICENSE = "bzip2-1.0.6"
 LIC_FILES_CHKSUM = "file://COPYING;md5=398b8832c6f840cfebd20ab2be6a3743"
diff --git a/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb b/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb
index aff00e56e6..ec8f9e48b2 100644
--- a/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb
+++ b/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "ed46f09b9c0fa2d49015f6431bc5ea7b"
 SRC_URI[sha256sum] = "2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a"
 
-inherit autotools update-rc.d systemd pkgconfig
+inherit autotools update-rc.d systemd pkgconfig update-alternatives
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -50,3 +50,6 @@ do_install_append () {
 		${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
 	chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
 }
+
+ALTERNATIVE_${PN} = "rpcinfo"
+ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo"
diff --git a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
index 79fc8b80b5..5f7ea00bf1 100644
--- a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
+++ b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
@@ -30,3 +30,5 @@ SYSROOT_DIRS += "${sysconfdir}"
 # otherwise: dbus-dev depends on shadow-sysroot-dev which depends on shadow-sysroot
 # and this has another copy of /etc/login.defs already provided by shadow
 PACKAGES = ""
+
+inherit nopackages
diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch b/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
index c860c717ac..f1911b1d88 100644
--- a/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
+++ b/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
@@ -13,7 +13,7 @@ diff --git a/Makefile b/Makefile
 index f36e57e..20488af 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -452,6 +452,6 @@ install: stress-ng stress-ng.1.gz
+@@ -461,6 +461,6 @@ install: stress-ng stress-ng.1.gz
  	mkdir -p ${DESTDIR}${MANDIR}
  	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
  	mkdir -p ${DESTDIR}${JOBDIR}
diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.17.bb
index 3486be1b03..9b987c7bde 100644
--- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb
+++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.17.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
            file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
            "
-SRC_URI[md5sum] = "a558fc7fb9d0a851afe6de09080b5401"
-SRC_URI[sha256sum] = "9fe19548c87aa1a1b9b2be3b359ec2621b88bcb16998b77527549a7736f65494"
+SRC_URI[md5sum] = "7b89157c838f2bb4bdeba8f46e3c56ae"
+SRC_URI[sha256sum] = "860291dd3a18b985b3483190a627bbede2b5c52113766c1921001b3fb4b83af0"
 
 DEPENDS = "coreutils-native"
 
diff --git a/poky/meta/recipes-extended/sysstat/sysstat.inc b/poky/meta/recipes-extended/sysstat/sysstat.inc
index 8fd87b943b..e5e134c038 100644
--- a/poky/meta/recipes-extended/sysstat/sysstat.inc
+++ b/poky/meta/recipes-extended/sysstat/sysstat.inc
@@ -62,6 +62,6 @@ pkg_postinst_${PN} () {
 	fi
 }
 
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES_${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc
index 32723f3dec..5368464f30 100644
--- a/poky/meta/recipes-extended/timezone/timezone.inc
+++ b/poky/meta/recipes-extended/timezone/timezone.inc
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "PD & BSD & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
 
-PV = "2020a"
+PV = "2020d"
 
 SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
@@ -14,7 +14,5 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz
 
 UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
-SRC_URI[tzcode.md5sum] = "f87c3477e85a5c4b00df0def6c6a0055"
-SRC_URI[tzcode.sha256sum] = "7d2af7120ee03df71fbca24031ccaf42404752e639196fe93c79a41b38a6d669"
-SRC_URI[tzdata.md5sum] = "96a985bb8eeab535fb8aa2132296763a"
-SRC_URI[tzdata.sha256sum] = "547161eca24d344e0b5f96aff6a76b454da295dc14ed4ca50c2355043fb899a2"
+SRC_URI[tzcode.sha256sum] = "6cf050ba28e8053029d3f32d71341d11a794c6b5dd51a77fc769d6dae364fad5"
+SRC_URI[tzdata.sha256sum] = "8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3"
diff --git a/poky/meta/recipes-extended/timezone/tzdata.bb b/poky/meta/recipes-extended/timezone/tzdata.bb
index 1e2b440fb0..e6a0655afe 100644
--- a/poky/meta/recipes-extended/timezone/tzdata.bb
+++ b/poky/meta/recipes-extended/timezone/tzdata.bb
@@ -15,18 +15,18 @@ DEFAULT_TIMEZONE ?= "Universal"
 INSTALL_TIMEZONE_FILE ?= "1"
 
 TZONES= "africa antarctica asia australasia europe northamerica southamerica  \
-         factory etcetera backward systemv \
+         factory etcetera backward \
         "
 # pacificnew 
 
 do_compile () {
         for zone in ${TZONES}; do \
             ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
-                -y ${S}/yearistype.sh ${S}/${zone} ; \
+                ${S}/${zone} ; \
             ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
-                -y ${S}/yearistype.sh ${S}/${zone} ; \
+                ${S}/${zone} ; \
             ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
-                -y ${S}/yearistype.sh ${S}/${zone} ; \
+                ${S}/${zone} ; \
         done
 }
 
diff --git a/poky/meta/recipes-extended/which/which_2.21.bb b/poky/meta/recipes-extended/which/which_2.21.bb
index fac0fd3944..fc9185061b 100644
--- a/poky/meta/recipes-extended/which/which_2.21.bb
+++ b/poky/meta/recipes-extended/which/which_2.21.bb
@@ -4,7 +4,7 @@ executables that bash(1) would execute when the passed \
 program names would have been entered on the shell prompt. \
 It does this by using the exact same algorithm as bash."
 SECTION = "libs"
-HOMEPAGE = "http://carlo17.home.xs4all.nl/which/"
+HOMEPAGE = "https://carlowood.github.io/which/"
 
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\