diff options
Diffstat (limited to 'poky/meta')
371 files changed, 4786 insertions, 3790 deletions
diff --git a/poky/meta/classes/archiver.bbclass b/poky/meta/classes/archiver.bbclass index 598298ef6f..858507b343 100644 --- a/poky/meta/classes/archiver.bbclass +++ b/poky/meta/classes/archiver.bbclass @@ -590,6 +590,7 @@ addtask do_dumpdata addtask do_ar_recipe addtask do_deploy_archives do_build[recrdeptask] += "do_deploy_archives" +do_rootfs[recrdeptask] += "do_deploy_archives" do_populate_sdk[recrdeptask] += "do_deploy_archives" python () { diff --git a/poky/meta/classes/ccache.bbclass b/poky/meta/classes/ccache.bbclass index b5457359ca..f00fafc292 100644 --- a/poky/meta/classes/ccache.bbclass +++ b/poky/meta/classes/ccache.bbclass @@ -1,5 +1,7 @@ # # Usage: +# - Install ccache package on the host distribution and set up a build directory +# # - Enable ccache # Add the following line to a conffile such as conf/local.conf: # INHERIT += "ccache" @@ -33,6 +35,10 @@ export CCACHE_CONFIGPATH ?= "${COREBASE}/meta/conf/ccache.conf" export CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${MULTIMACH_TARGET_SYS}/${PN}" +# Fixed errors: +# ccache: error: Failed to create directory /run/user/0/ccache-tmp: Permission denied +export CCACHE_TEMPDIR ?= "${CCACHE_DIR}/tmp" + # We need to stop ccache considering the current directory or the # debug-prefix-map target directory to be significant when calculating # its hash. Without this the cache would be invalidated every time @@ -47,7 +53,6 @@ python() { # quilt-native doesn't need ccache since no c files if not (pn in ('ccache-native', 'quilt-native') or bb.utils.to_boolean(d.getVar('CCACHE_DISABLE'))): - d.appendVar('DEPENDS', ' ccache-native') d.setVar('CCACHE', 'ccache ') } diff --git a/poky/meta/classes/distutils3.bbclass b/poky/meta/classes/distutils3.bbclass index 7356b5245a..a916a8000c 100644 --- a/poky/meta/classes/distutils3.bbclass +++ b/poky/meta/classes/distutils3.bbclass @@ -12,28 +12,30 @@ DISTUTILS_INSTALL_ARGS ?= "--root=${D} \ DISTUTILS_PYTHON = "python3" DISTUTILS_PYTHON_class-native = "nativepython3" +DISTUTILS_SETUP_PATH ?= "${S}" + distutils3_do_configure() { : } distutils3_do_compile() { - cd ${S} + cd ${DISTUTILS_SETUP_PATH} NO_FETCH_BUILD=1 \ STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${S}/setup.py \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ build --build-base=${B} ${DISTUTILS_BUILD_ARGS} || \ bbfatal_log "'${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." } distutils3_do_compile[vardepsexclude] = "MACHINE" distutils3_do_install() { - cd ${S} + cd ${DISTUTILS_SETUP_PATH} install -d ${D}${PYTHON_SITEPACKAGES_DIR} STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${S}/setup.py \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ build --build-base=${B} install --skip-build ${DISTUTILS_INSTALL_ARGS} || \ bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." diff --git a/poky/meta/classes/go.bbclass b/poky/meta/classes/go.bbclass index a9e31b50ea..5b26378a4e 100644 --- a/poky/meta/classes/go.bbclass +++ b/poky/meta/classes/go.bbclass @@ -40,6 +40,7 @@ GO_RPATH_LINK_class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pk GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" GO_LINKMODE ?= "" GO_LINKMODE_class-nativesdk = "--linkmode=external" +GO_LINKMODE_class-native = "--linkmode=external" GO_LDFLAGS ?= '-ldflags="${GO_RPATH} ${GO_LINKMODE} -extldflags '${GO_EXTLDFLAGS}'"' export GOBUILDFLAGS ?= "-v ${GO_LDFLAGS} -trimpath" export GOPATH_OMIT_IN_ACTIONID ?= "1" diff --git a/poky/meta/classes/grub-efi-cfg.bbclass b/poky/meta/classes/grub-efi-cfg.bbclass index 3a2cdd698b..ea21b3de3d 100644 --- a/poky/meta/classes/grub-efi-cfg.bbclass +++ b/poky/meta/classes/grub-efi-cfg.bbclass @@ -120,3 +120,4 @@ python build_efi_cfg() { cfgfile.close() } +build_efi_cfg[vardepsexclude] += "OVERRIDES" diff --git a/poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass index cf2165c517..105d2a5ce8 100644 --- a/poky/meta/classes/insane.bbclass +++ b/poky/meta/classes/insane.bbclass @@ -87,7 +87,8 @@ def package_qa_add_message(messages, section, new_msg): QAPATHTEST[shebang-size] = "package_qa_check_shebang_size" def package_qa_check_shebang_size(path, name, d, elf, messages): - if os.path.islink(path) or elf: + import stat + if os.path.islink(path) or stat.S_ISFIFO(os.stat(path).st_mode) or elf: return try: diff --git a/poky/meta/classes/kernel-fitimage.bbclass b/poky/meta/classes/kernel-fitimage.bbclass index bb2f3c4ccc..9fa302a5c8 100644 --- a/poky/meta/classes/kernel-fitimage.bbclass +++ b/poky/meta/classes/kernel-fitimage.bbclass @@ -72,6 +72,19 @@ FIT_KEY_REQ_ARGS ?= "-batch -new" # Standard format for public key certificate FIT_KEY_SIGN_PKCS ?= "-x509" +# Description string +FIT_DESC ?= "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" + +# Sign individual images as well +FIT_SIGN_INDIVIDUAL ?= "0" + +# mkimage command +UBOOT_MKIMAGE ?= "uboot-mkimage" +UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}" + +# Arguments passed to mkimage for signing +UBOOT_MKIMAGE_SIGN_ARGS ?= "" + # # Emit the fitImage ITS header # @@ -81,7 +94,7 @@ fitimage_emit_fit_header() { /dts-v1/; / { - description = "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}"; + description = "${FIT_DESC}"; #address-cells = <1>; EOF } @@ -132,6 +145,8 @@ EOF fitimage_emit_section_kernel() { kernel_csum="${FIT_HASH_ALG}" + kernel_sign_algo="${FIT_SIGN_ALG}" + kernel_sign_keyname="${UBOOT_SIGN_KEYNAME}" ENTRYPOINT="${UBOOT_ENTRYPOINT}" if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then @@ -154,6 +169,17 @@ fitimage_emit_section_kernel() { }; }; EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${kernel_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${kernel_csum},${kernel_sign_algo}"; + key-name-hint = "${kernel_sign_keyname}"; + }; + }; +EOF + fi } # @@ -165,6 +191,8 @@ EOF fitimage_emit_section_dtb() { dtb_csum="${FIT_HASH_ALG}" + dtb_sign_algo="${FIT_SIGN_ALG}" + dtb_sign_keyname="${UBOOT_SIGN_KEYNAME}" dtb_loadline="" dtb_ext=${DTB##*.} @@ -188,6 +216,17 @@ fitimage_emit_section_dtb() { }; }; EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${dtb_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${dtb_csum},${dtb_sign_algo}"; + key-name-hint = "${dtb_sign_keyname}"; + }; + }; +EOF + fi } # @@ -226,6 +265,8 @@ EOF fitimage_emit_section_ramdisk() { ramdisk_csum="${FIT_HASH_ALG}" + ramdisk_sign_algo="${FIT_SIGN_ALG}" + ramdisk_sign_keyname="${UBOOT_SIGN_KEYNAME}" ramdisk_loadline="" ramdisk_entryline="" @@ -251,6 +292,17 @@ fitimage_emit_section_ramdisk() { }; }; EOF + + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${ramdisk_sign_keyname}" ] ; then + sed -i '$ d' ${1} + cat << EOF >> ${1} + signature@1 { + algo = "${ramdisk_csum},${ramdisk_sign_algo}"; + key-name-hint = "${ramdisk_sign_keyname}"; + }; + }; +EOF + fi } # @@ -270,6 +322,13 @@ fitimage_emit_section_config() { conf_sign_keyname="${UBOOT_SIGN_KEYNAME}" fi + its_file="${1}" + kernel_id="${2}" + dtb_image="${3}" + ramdisk_id="${4}" + config_id="${5}" + default_flag="${6}" + # Test if we have any DTBs at all sep="" conf_desc="" @@ -282,49 +341,49 @@ fitimage_emit_section_config() { # conf node name is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID - if [ -n "${3}" ]; then - conf_node=$conf_node${3} + if [ -n "${dtb_image}" ]; then + conf_node=$conf_node${dtb_image} else - conf_node=$conf_node${2} + conf_node=$conf_node${kernel_id} fi - if [ -n "${2}" ]; then + if [ -n "${kernel_id}" ]; then conf_desc="Linux kernel" sep=", " - kernel_line="kernel = \"kernel@${2}\";" + kernel_line="kernel = \"kernel@${kernel_id}\";" fi - if [ -n "${3}" ]; then + if [ -n "${dtb_image}" ]; then conf_desc="${conf_desc}${sep}FDT blob" sep=", " - fdt_line="fdt = \"fdt@${3}\";" + fdt_line="fdt = \"fdt@${dtb_image}\";" fi - if [ -n "${4}" ]; then + if [ -n "${ramdisk_id}" ]; then conf_desc="${conf_desc}${sep}ramdisk" sep=", " - ramdisk_line="ramdisk = \"ramdisk@${4}\";" + ramdisk_line="ramdisk = \"ramdisk@${ramdisk_id}\";" fi - if [ -n "${5}" ]; then + if [ -n "${config_id}" ]; then conf_desc="${conf_desc}${sep}setup" - setup_line="setup = \"setup@${5}\";" + setup_line="setup = \"setup@${config_id}\";" fi - if [ "${6}" = "1" ]; then + if [ "${default_flag}" = "1" ]; then # default node is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID - if [ -n "${3}" ]; then - default_line="default = \"conf@${3}\";" + if [ -n "${dtb_image}" ]; then + default_line="default = \"conf@${dtb_image}\";" else - default_line="default = \"conf@${2}\";" + default_line="default = \"conf@${kernel_id}\";" fi fi - cat << EOF >> ${1} + cat << EOF >> ${its_file} ${default_line} $conf_node { - description = "${6} ${conf_desc}"; + description = "${default_flag} ${conf_desc}"; ${kernel_line} ${fdt_line} ${ramdisk_line} @@ -339,28 +398,28 @@ EOF sign_line="sign-images = " sep="" - if [ -n "${2}" ]; then + if [ -n "${kernel_id}" ]; then sign_line="${sign_line}${sep}\"kernel\"" sep=", " fi - if [ -n "${3}" ]; then + if [ -n "${dtb_image}" ]; then sign_line="${sign_line}${sep}\"fdt\"" sep=", " fi - if [ -n "${4}" ]; then + if [ -n "${ramdisk_id}" ]; then sign_line="${sign_line}${sep}\"ramdisk\"" sep=", " fi - if [ -n "${5}" ]; then + if [ -n "${config_id}" ]; then sign_line="${sign_line}${sep}\"setup\"" fi sign_line="${sign_line};" - cat << EOF >> ${1} + cat << EOF >> ${its_file} signature@1 { algo = "${conf_csum},${conf_sign_algo}"; key-name-hint = "${conf_sign_keyname}"; @@ -369,7 +428,7 @@ EOF EOF fi - cat << EOF >> ${1} + cat << EOF >> ${its_file} }; EOF } @@ -495,7 +554,7 @@ fitimage_assemble() { # # Step 6: Assemble the image # - uboot-mkimage \ + ${UBOOT_MKIMAGE} \ ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ -f ${1} \ arch/${ARCH}/boot/${2} @@ -511,11 +570,12 @@ fitimage_assemble() { cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B} add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}" fi - uboot-mkimage \ + ${UBOOT_MKIMAGE_SIGN} \ ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ -F -k "${UBOOT_SIGN_KEYDIR}" \ $add_key_to_u_boot \ - -r arch/${ARCH}/boot/${2} + -r arch/${ARCH}/boot/${2} \ + ${UBOOT_MKIMAGE_SIGN_ARGS} fi } diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index 1a444efabf..2f1006ddf0 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -1,5 +1,7 @@ inherit linux-kernel-base kernel-module-split +COMPATIBLE_HOST = ".*-linux" + KERNEL_PACKAGE_NAME ??= "kernel" KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index f90176d6c0..dc91118340 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -31,6 +31,7 @@ python do_populate_lic() { f.write("%s: %s\n" % (key, info[key])) } +PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '')).split())}" # it would be better to copy them in do_install_append, but find_license_filesa is python python perform_packagecopy_prepend () { enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) diff --git a/poky/meta/classes/linuxloader.bbclass b/poky/meta/classes/linuxloader.bbclass index 720e5dfad4..b161c51a50 100644 --- a/poky/meta/classes/linuxloader.bbclass +++ b/poky/meta/classes/linuxloader.bbclass @@ -1,6 +1,6 @@ def get_musl_loader_arch(d): import re - ldso_arch = None + ldso_arch = "NotSupported" targetarch = d.getVar("TARGET_ARCH") if targetarch.startswith("microblaze"): @@ -32,7 +32,7 @@ def get_musl_loader(d): def get_glibc_loader(d): import re - dynamic_loader = None + dynamic_loader = "NotSupported" targetarch = d.getVar("TARGET_ARCH") if targetarch in ["powerpc", "microblaze"]: dynamic_loader = "${base_libdir}/ld.so.1" @@ -58,7 +58,7 @@ def get_linuxloader(d): overrides = d.getVar("OVERRIDES").split(":") if "libc-baremetal" in overrides: - return None + return "NotSupported" if "libc-musl" in overrides: dynamic_loader = get_musl_loader(d) diff --git a/poky/meta/classes/populate_sdk_base.bbclass b/poky/meta/classes/populate_sdk_base.bbclass index 49b1833265..4db0511dba 100644 --- a/poky/meta/classes/populate_sdk_base.bbclass +++ b/poky/meta/classes/populate_sdk_base.bbclass @@ -263,7 +263,7 @@ fakeroot create_shar() { rm -f ${T}/pre_install_command ${T}/post_install_command - if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then + if [ "${SDK_RELOCATE_AFTER_INSTALL}" = "1" ] ; then cp ${TOOLCHAIN_SHAR_REL_TMPL} ${T}/post_install_command fi cat << "EOF" >> ${T}/pre_install_command diff --git a/poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass index 3262d08fbf..d134b40a87 100644 --- a/poky/meta/classes/sanity.bbclass +++ b/poky/meta/classes/sanity.bbclass @@ -770,10 +770,10 @@ def check_sanity_everybuild(status, d): if 0 == os.getuid(): raise_sanity_error("Do not use Bitbake as root.", d) - # Check the Python version, we now have a minimum of Python 3.4 + # Check the Python version, we now have a minimum of Python 3.6 import sys - if sys.hexversion < 0x030500F0: - status.addresult('The system requires at least Python 3.5 to run. Please update your Python interpreter.\n') + if sys.hexversion < 0x030600F0: + status.addresult('The system requires at least Python 3.6 to run. Please update your Python interpreter.\n') # Check the bitbake version meets minimum requirements from distutils.version import LooseVersion diff --git a/poky/meta/classes/uboot-extlinux-config.bbclass b/poky/meta/classes/uboot-extlinux-config.bbclass index f4bf94be04..be285daa01 100644 --- a/poky/meta/classes/uboot-extlinux-config.bbclass +++ b/poky/meta/classes/uboot-extlinux-config.bbclass @@ -153,5 +153,6 @@ python do_create_extlinux_config() { } UBOOT_EXTLINUX_VARS = "CONSOLE MENU_DESCRIPTION ROOT KERNEL_IMAGE FDTDIR FDT KERNEL_ARGS INITRD" do_create_extlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS').split()])}" +do_create_extlinux_config[vardepsexclude] += "OVERRIDES" addtask create_extlinux_config before do_install do_deploy after do_compile diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 0d38eac094..be94b78eb1 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -136,7 +136,7 @@ TARGET_CC_ARCH = "${TUNE_CCARGS}" TARGET_LD_ARCH = "${TUNE_LDARGS}" TARGET_AS_ARCH = "${TUNE_ASARGS}" -SDKMACHINE ??= "x86_64" +SDKMACHINE ??= "${BUILD_ARCH}" SDK_OS = "${BUILD_OS}" SDK_VENDOR = "-oesdk" SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}" @@ -486,7 +486,7 @@ HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ - head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ + head hostname iconv id install ld ldd ln ls make md5sum mkdir mkfifo mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ sha1sum sha224sum sha256sum sha384sum sha512sum \ @@ -498,7 +498,7 @@ HOSTTOOLS += " \ HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" # Link to these if present -HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" +HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" # Temporary add few more detected in bitbake world HOSTTOOLS_NONFATAL += "join nl size yes zcat" @@ -685,15 +685,15 @@ SRC_URI = "" PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" -PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${COREBASE}/meta,${CCACHE_DIR}" +PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}" export PSEUDO_DISABLED = "1" #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" #export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" #export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib -FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=1" +FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=1 PYTHONDONTWRITEBYTECODE=1" FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" -FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=0" +FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=0" FAKEROOTNOENV = "PSEUDO_UNLOAD=1" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index e9c69b2e6e..b0ddfb89a8 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -31,14 +31,14 @@ RECIPE_MAINTAINER_pn-acl = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-acpica = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-acpid = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-plugins = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-tools = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-topology-conf = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-lib = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-plugins = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-state = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-tools = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-topology-conf = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-utils = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>" @@ -175,7 +175,7 @@ RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-file = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-findutils = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-flac = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-flex = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <akuster808@gmail.com>" @@ -297,10 +297,10 @@ RECIPE_MAINTAINER_pn-kmod = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani <dv@pseudoterminal.org>" RECIPE_MAINTAINER_pn-l3afpad = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-lame = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-less = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-liba52 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador <otavio.salvador@ossystems.com.br>" @@ -343,7 +343,7 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libhandy = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libical = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libice = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-libid3tag = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libinput = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <ross.burton@arm.com>" @@ -374,11 +374,11 @@ RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin <alex.kanavin@gmail.c RECIPE_MAINTAINER_pn-libpsl = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-librepo = "Wang Mingyu <wangmy@cn.fujitsu.com>" RECIPE_MAINTAINER_pn-librsvg = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-libsamplerate0 = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-libsamplerate0 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsdl2 = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libsecret = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libsndfile1 = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-libsndfile1 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libssp-nonshared = "Khem Raj <raj.khem@gmail.com>" @@ -577,8 +577,8 @@ RECIPE_MAINTAINER_pn-pseudo = "Richard Purdie <richard.purdie@linuxfoundation.or RECIPE_MAINTAINER_pn-psmisc = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-psplash = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-pulseaudio = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" @@ -651,7 +651,7 @@ RECIPE_MAINTAINER_pn-ruby = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-sbc = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-screen = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-sed = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-serf = "Anuj Mittal <anuj.mittal@intel.com>" @@ -666,8 +666,8 @@ RECIPE_MAINTAINER_pn-shutdown-desktop = "Alexander Kanavin <alex.kanavin@gmail.c RECIPE_MAINTAINER_pn-signing-keys = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-slang = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-socat = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-speex = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-speexdsp = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-speex = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-speexdsp = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-spirv-tools = "Jose Quaresma <quaresma.jose@gmail.com>" RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-squashfs-tools = "Robert Yang <liezhi.yang@windriver.com>" @@ -797,3 +797,4 @@ RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>" +RECIPE_MAINTAINER_pn-zstd = "Alexander Kanavin <alex.kanavin@gmail.com>" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index 75796a73fb..fd4d760b3f 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.35%" GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.32" -LINUXLIBCVERSION ?= "5.8%" +LINUXLIBCVERSION ?= "5.10%" QEMUVERSION ?= "5.1%" GOVERSION ?= "1.15%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote diff --git a/poky/meta/conf/image-uefi.conf b/poky/meta/conf/image-uefi.conf index aaeff12ccb..882a0e720c 100644 --- a/poky/meta/conf/image-uefi.conf +++ b/poky/meta/conf/image-uefi.conf @@ -8,9 +8,12 @@ EFI_PREFIX ?= "/boot" # Location inside rootfs. EFI_FILES_PATH = "${EFI_PREFIX}${EFIDIR}" +# The EFI name for the architecture +EFI_ARCH ?= "INVALID" +EFI_ARCH_x86 = "ia32" +EFI_ARCH_x86-64 = "x64" +EFI_ARCH_aarch64 = "aa64" +EFI_ARCH_arm = "arm" + # Determine name of bootloader image -EFI_BOOT_IMAGE ?= "bootINVALID.efi" -EFI_BOOT_IMAGE_x86-64 = "bootx64.efi" -EFI_BOOT_IMAGE_x86 = "bootia32.efi" -EFI_BOOT_IMAGE_aarch64 = "bootaa64.efi" -EFI_BOOT_IMAGE_arm = "bootarm.efi" +EFI_BOOT_IMAGE ?= "boot${EFI_ARCH}.efi" diff --git a/poky/meta/conf/machine/include/riscv/qemuriscv.inc b/poky/meta/conf/machine/include/riscv/qemuriscv.inc index 0e88c91aa6..47d7e9b174 100644 --- a/poky/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/poky/meta/conf/machine/include/riscv/qemuriscv.inc @@ -10,6 +10,7 @@ KERNEL_IMAGETYPES += "uImage" KEEPUIMAGE = "no" SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" IMAGE_FSTYPES += "ext4 wic.qcow2" diff --git a/poky/meta/conf/machine/include/x86-base.inc b/poky/meta/conf/machine/include/x86-base.inc index a3169b7405..ef6690b0b9 100644 --- a/poky/meta/conf/machine/include/x86-base.inc +++ b/poky/meta/conf/machine/include/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.8%" +PREFERRED_VERSION_linux-yocto ??= "5.10%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 702b850cbb..257cfa3e63 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -17,7 +17,7 @@ QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" +QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256" # For graphics to work we need to define the VGA device as well as the necessary USB devices QB_OPT_APPEND = "-device VGA,edid=on" QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" diff --git a/poky/meta/conf/machine/qemuarmv5.conf b/poky/meta/conf/machine/qemuarmv5.conf index 7e8c9e1fa6..dfe2a89573 100644 --- a/poky/meta/conf/machine/qemuarmv5.conf +++ b/poky/meta/conf/machine/qemuarmv5.conf @@ -12,9 +12,9 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" +QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256" QB_OPT_APPEND = "-usb -device usb-tablet" -PREFERRED_VERSION_linux-yocto ??= "5.8%" +PREFERRED_VERSION_linux-yocto ??= "5.10%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm" diff --git a/poky/meta/lib/oe/path.py b/poky/meta/lib/oe/path.py index 082972457b..c8d8ad05b9 100644 --- a/poky/meta/lib/oe/path.py +++ b/poky/meta/lib/oe/path.py @@ -320,3 +320,24 @@ def which_wild(pathname, path=None, mode=os.F_OK, *, reverse=False, candidates=F return files +def canonicalize(paths, sep=','): + """Given a string with paths (separated by commas by default), expand + each path using os.path.realpath() and return the resulting paths as a + string (separated using the same separator a the original string). + """ + # Ignore paths containing "$" as they are assumed to be unexpanded bitbake + # variables. Normally they would be ignored, e.g., when passing the paths + # through the shell they would expand to empty strings. However, when they + # are passed through os.path.realpath(), it will cause them to be prefixed + # with the absolute path to the current directory and thus not be empty + # anymore. + # + # Also maintain trailing slashes, as the paths may actually be used as + # prefixes in sting compares later on, where the slashes then are important. + canonical_paths = [] + for path in (paths or '').split(sep): + if '$' not in path: + trailing_slash = path.endswith('/') and '/' or '' + canonical_paths.append(os.path.realpath(path) + trailing_slash) + + return sep.join(canonical_paths) diff --git a/poky/meta/lib/oe/qa.py b/poky/meta/lib/oe/qa.py index ea831b930a..e8a854a302 100644 --- a/poky/meta/lib/oe/qa.py +++ b/poky/meta/lib/oe/qa.py @@ -156,6 +156,7 @@ def elf_machine_to_string(machine): """ try: return { + 0x00: "Unset", 0x02: "SPARC", 0x03: "x86", 0x08: "MIPS", diff --git a/poky/meta/lib/oeqa/runtime/cases/suspend.py b/poky/meta/lib/oeqa/runtime/cases/suspend.py new file mode 100644 index 0000000000..67b6f7e56f --- /dev/null +++ b/poky/meta/lib/oeqa/runtime/cases/suspend.py @@ -0,0 +1,33 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfQemu +import threading +import time + +class Suspend_Test(OERuntimeTestCase): + + def test_date(self): + (status, output) = self.target.run('date') + self.assertEqual(status, 0, msg = 'Failed to run date command, output : %s' % output) + + def test_ping(self): + t_thread = threading.Thread(target=self.target.run, args=("ping 8.8.8.8",)) + t_thread.start() + time.sleep(2) + + status, output = self.target.run('pidof ping') + self.target.run('kill -9 %s' % output) + self.assertEqual(status, 0, msg = 'Not able to find process that runs ping, output : %s' % output) + + def set_suspend(self): + (status, output) = self.target.run('sudo rtcwake -m mem -s 10') + self.assertEqual(status, 0, msg = 'Failed to suspends your system to RAM, output : %s' % output) + + @skipIfQemu('qemuall', 'Test only runs on real hardware') + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_suspend(self): + self.test_date() + self.test_ping() + self.set_suspend() + self.test_date() + self.test_ping() diff --git a/poky/meta/lib/oeqa/runtime/cases/terminal.py b/poky/meta/lib/oeqa/runtime/cases/terminal.py index a268f26880..8fcca99f47 100644 --- a/poky/meta/lib/oeqa/runtime/cases/terminal.py +++ b/poky/meta/lib/oeqa/runtime/cases/terminal.py @@ -10,9 +10,12 @@ class TerminalTest(OERuntimeTestCase): @OEHasPackage(['matchbox-terminal']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_terminal_running(self): - t_thread = threading.Thread(target=self.target.run, args=('export DISPLAY=:0 && matchbox-terminal',)) + t_thread = threading.Thread(target=self.target.run, args=("export DISPLAY=:0 && matchbox-terminal -e 'sh -c \"uname -a && exec sh\"'",)) t_thread.start() time.sleep(2) + status, output = self.target.run('pidof matchbox-terminal') + number_of_terminal = len(output.split()) + self.assertEqual(number_of_terminal, 1, msg='There should be only one terminal being launched. Number of terminal launched : %s' % number_of_terminal) self.target.run('kill -9 %s' % output) - self.assertEqual(status, 0, msg='Not able to find process that runs terminal.') + self.assertEqual(status, 0, msg='Not able to find process that runs terminal.') diff --git a/poky/meta/lib/oeqa/selftest/cases/buildoptions.py b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py index e91f0bd18f..d0f6477300 100644 --- a/poky/meta/lib/oeqa/selftest/cases/buildoptions.py +++ b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py @@ -33,10 +33,10 @@ class ImageOptionsTests(OESelftestTestCase): self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) def test_ccache_tool(self): - bitbake("ccache-native") - bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') - p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache" - self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) + bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native') + p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache" + if not os.path.isfile(p): + self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR']) self.write_config('INHERIT += "ccache"') self.add_command_to_tearDown('bitbake -c clean m4-native') bitbake("m4-native -c clean") diff --git a/poky/meta/lib/oeqa/selftest/cases/devtool.py b/poky/meta/lib/oeqa/selftest/cases/devtool.py index b8edc89768..4eba23890f 100644 --- a/poky/meta/lib/oeqa/selftest/cases/devtool.py +++ b/poky/meta/lib/oeqa/selftest/cases/devtool.py @@ -57,7 +57,7 @@ def setUpModule(): if relpth.endswith('/'): destdir = os.path.join(corecopydir, relpth) # avoid race condition by not copying .pyc files YPBZ#13421,13803 - shutil.copytree(pth, destdir, ignore=ignore_patterns('*.pyc', '__pycache__')) + shutil.copytree(pth, destdir, ignore=shutil.ignore_patterns('*.pyc', '__pycache__')) else: destdir = os.path.join(corecopydir, os.path.dirname(relpth)) bb.utils.mkdirhier(destdir) diff --git a/poky/meta/lib/oeqa/selftest/cases/fitimage.py b/poky/meta/lib/oeqa/selftest/cases/fitimage.py new file mode 100644 index 0000000000..19b9f53ee4 --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/fitimage.py @@ -0,0 +1,233 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu +import os +import json +import re + +class FitImageTests(OESelftestTestCase): + + def test_fit_image(self): + """ + Summary: Check if FIT image and Image Tree Source (its) are built + and the Image Tree Source has the correct fields. + Expected: 1. fitImage and fitImage-its can be built + 2. The type, load address, entrypoint address and + default values of kernel and ramdisk are as expected + in the Image Tree Source. Not all the fields are tested, + only the key fields that wont vary between different + architectures. + Product: oe-core + Author: Usama Arif <usama.arif@arm.com> + """ + config = """ +# Enable creation of fitImage +KERNEL_IMAGETYPE = "Image" +KERNEL_IMAGETYPES += " fitImage " +KERNEL_CLASSES = " kernel-fitimage " + +# RAM disk variables including load address and entrypoint for kernel and RAM disk +IMAGE_FSTYPES += "cpio.gz" +INITRAMFS_IMAGE = "core-image-minimal" +UBOOT_RD_LOADADDRESS = "0x88000000" +UBOOT_RD_ENTRYPOINT = "0x88000000" +UBOOT_LOADADDRESS = "0x80080000" +UBOOT_ENTRYPOINT = "0x80080000" +FIT_DESC = "A model description" +""" + self.write_config(config) + + # fitImage is created as part of linux recipe + bitbake("virtual/kernel") + + image_type = "core-image-minimal" + deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') + machine = get_bb_var('MACHINE') + fitimage_its_path = os.path.join(deploy_dir_image, + "fitImage-its-%s-%s-%s" % (image_type, machine, machine)) + fitimage_path = os.path.join(deploy_dir_image, + "fitImage-%s-%s-%s" % (image_type, machine, machine)) + + self.assertTrue(os.path.exists(fitimage_its_path), + "%s image tree source doesn't exist" % (fitimage_its_path)) + self.assertTrue(os.path.exists(fitimage_path), + "%s FIT image doesn't exist" % (fitimage_path)) + + # Check that the type, load address, entrypoint address and default + # values for kernel and ramdisk in Image Tree Source are as expected. + # The order of fields in the below array is important. Not all the + # fields are tested, only the key fields that wont vary between + # different architectures. + its_field_check = [ + 'description = "A model description";', + 'type = "kernel";', + 'load = <0x80080000>;', + 'entry = <0x80080000>;', + 'type = "ramdisk";', + 'load = <0x88000000>;', + 'entry = <0x88000000>;', + 'default = "conf@1";', + 'kernel = "kernel@1";', + 'ramdisk = "ramdisk@1";' + ] + + with open(fitimage_its_path) as its_file: + field_index = 0 + for line in its_file: + if field_index == len(its_field_check): + break + if its_field_check[field_index] in line: + field_index +=1 + + if field_index != len(its_field_check): # if its equal, the test passed + self.assertTrue(field_index == len(its_field_check), + "Fields in Image Tree Source File %s did not match, error in finding %s" + % (fitimage_its_path, its_field_check[field_index])) + + + def test_sign_fit_image(self): + """ + Summary: Check if FIT image and Image Tree Source (its) are created + and signed correctly. + Expected: 1) its and FIT image are built successfully + 2) Scanning the its file indicates signing is enabled + as requested by UBOOT_SIGN_ENABLE (using keys generated + via FIT_GENERATE_KEYS) + 3) Dumping the FIT image indicates signature values + are present (including for images as enabled via + FIT_SIGN_INDIVIDUAL) + 4) Examination of the do_assemble_fitimage runfile/logfile + indicate that UBOOT_MKIMAGE, UBOOT_MKIMAGE_SIGN and + UBOOT_MKIMAGE_SIGN_ARGS are working as expected. + Product: oe-core + Author: Paul Eggleton <paul.eggleton@microsoft.com> based upon + work by Usama Arif <usama.arif@arm.com> + """ + config = """ +# Enable creation of fitImage +MACHINE = "beaglebone-yocto" +KERNEL_IMAGETYPES += " fitImage " +KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper " +UBOOT_SIGN_ENABLE = "1" +FIT_GENERATE_KEYS = "1" +UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" +UBOOT_SIGN_KEYNAME = "oe-selftest" +FIT_SIGN_INDIVIDUAL = "1" +UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" +""" + self.write_config(config) + + # fitImage is created as part of linux recipe + bitbake("virtual/kernel") + + image_type = "core-image-minimal" + deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') + machine = get_bb_var('MACHINE') + fitimage_its_path = os.path.join(deploy_dir_image, + "fitImage-its-%s" % (machine,)) + fitimage_path = os.path.join(deploy_dir_image, + "fitImage-%s.bin" % (machine,)) + + self.assertTrue(os.path.exists(fitimage_its_path), + "%s image tree source doesn't exist" % (fitimage_its_path)) + self.assertTrue(os.path.exists(fitimage_path), + "%s FIT image doesn't exist" % (fitimage_path)) + + req_itspaths = [ + ['/', 'images', 'kernel@1'], + ['/', 'images', 'kernel@1', 'signature@1'], + ['/', 'images', 'fdt@am335x-boneblack.dtb'], + ['/', 'images', 'fdt@am335x-boneblack.dtb', 'signature@1'], + ['/', 'configurations', 'conf@am335x-boneblack.dtb'], + ['/', 'configurations', 'conf@am335x-boneblack.dtb', 'signature@1'], + ] + + itspath = [] + itspaths = [] + linect = 0 + sigs = {} + with open(fitimage_its_path) as its_file: + linect += 1 + for line in its_file: + line = line.strip() + if line.endswith('};'): + itspath.pop() + elif line.endswith('{'): + itspath.append(line[:-1].strip()) + itspaths.append(itspath[:]) + elif itspath and itspath[-1] == 'signature@1': + itsdotpath = '.'.join(itspath) + if not itsdotpath in sigs: + sigs[itsdotpath] = {} + if not '=' in line or not line.endswith(';'): + self.fail('Unexpected formatting in %s sigs section line %d:%s' % (fitimage_its_path, linect, line)) + key, value = line.split('=', 1) + sigs[itsdotpath][key.rstrip()] = value.lstrip().rstrip(';') + + for reqpath in req_itspaths: + if not reqpath in itspaths: + self.fail('Missing section in its file: %s' % reqpath) + + reqsigvalues_image = { + 'algo': '"sha256,rsa2048"', + 'key-name-hint': '"oe-selftest"', + } + reqsigvalues_config = { + 'algo': '"sha256,rsa2048"', + 'key-name-hint': '"oe-selftest"', + 'sign-images': '"kernel", "fdt"', + } + + for itspath, values in sigs.items(): + if 'conf@' in itspath: + reqsigvalues = reqsigvalues_config + else: + reqsigvalues = reqsigvalues_image + for reqkey, reqvalue in reqsigvalues.items(): + value = values.get(reqkey, None) + if value is None: + self.fail('Missing key "%s" in its file signature section %s' % (reqkey, itspath)) + self.assertEqual(value, reqvalue) + + # Dump the image to see if it really got signed + bitbake("u-boot-tools-native -c addto_recipe_sysroot") + result = runCmd('bitbake -e u-boot-tools-native | grep ^RECIPE_SYSROOT_NATIVE=') + recipe_sysroot_native = result.output.split('=')[1].strip('"') + dumpimage_path = os.path.join(recipe_sysroot_native, 'usr', 'bin', 'dumpimage') + result = runCmd('%s -l %s' % (dumpimage_path, fitimage_path)) + in_signed = None + signed_sections = {} + for line in result.output.splitlines(): + if line.startswith((' Configuration', ' Image')): + in_signed = re.search('\((.*)\)', line).groups()[0] + elif re.match('^ *', line) in (' ', ''): + in_signed = None + elif in_signed: + if not in_signed in signed_sections: + signed_sections[in_signed] = {} + key, value = line.split(':', 1) + signed_sections[in_signed][key.strip()] = value.strip() + self.assertIn('kernel@1', signed_sections) + self.assertIn('fdt@am335x-boneblack.dtb', signed_sections) + self.assertIn('conf@am335x-boneblack.dtb', signed_sections) + for signed_section, values in signed_sections.items(): + value = values.get('Sign algo', None) + self.assertEqual(value, 'sha256,rsa2048:oe-selftest', 'Signature algorithm for %s not expected value' % signed_section) + value = values.get('Sign value', None) + self.assertEqual(len(value), 512, 'Signature value for section %s not expected length' % signed_section) + + # Check for UBOOT_MKIMAGE_SIGN_ARGS + result = runCmd('bitbake -e virtual/kernel | grep ^T=') + tempdir = result.output.split('=', 1)[1].strip().strip('') + result = runCmd('grep "a smart comment" %s/run.do_assemble_fitimage' % tempdir, ignore_status=True) + self.assertEqual(result.status, 0, 'UBOOT_MKIMAGE_SIGN_ARGS value did not get used') + + # Check for evidence of test-mkimage-wrapper class + result = runCmd('grep "### uboot-mkimage wrapper message" %s/log.do_assemble_fitimage' % tempdir, ignore_status=True) + self.assertEqual(result.status, 0, 'UBOOT_MKIMAGE did not work') + result = runCmd('grep "### uboot-mkimage signing wrapper message" %s/log.do_assemble_fitimage' % tempdir, ignore_status=True) + self.assertEqual(result.status, 0, 'UBOOT_MKIMAGE_SIGN did not work') + diff --git a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py index 415e0315fc..6723a8198f 100644 --- a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -264,80 +264,6 @@ PNBLACKLIST[busybox] = "Don't build this" bitbake("--graphviz core-image-sato") - def test_fit_image(self): - """ - Summary: Check if FIT image and Image Tree Source (its) are built - and the Image Tree Source has the correct fields. - Expected: 1. fitImage and fitImage-its can be built - 2. The type, load address, entrypoint address and - default values of kernel and ramdisk are as expected - in the Image Tree Source. Not all the fields are tested, - only the key fields that wont vary between different - architectures. - Product: oe-core - Author: Usama Arif <usama.arif@arm.com> - """ - config = """ -# Enable creation of fitImage -KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES += " fitImage " -KERNEL_CLASSES = " kernel-fitimage " - -# RAM disk variables including load address and entrypoint for kernel and RAM disk -IMAGE_FSTYPES += "cpio.gz" -INITRAMFS_IMAGE = "core-image-minimal" -UBOOT_RD_LOADADDRESS = "0x88000000" -UBOOT_RD_ENTRYPOINT = "0x88000000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_ENTRYPOINT = "0x80080000" -""" - self.write_config(config) - - # fitImage is created as part of linux recipe - bitbake("virtual/kernel") - - image_type = "core-image-minimal" - deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') - machine = get_bb_var('MACHINE') - fitimage_its_path = os.path.join(deploy_dir_image, - "fitImage-its-%s-%s-%s" % (image_type, machine, machine)) - fitimage_path = os.path.join(deploy_dir_image, - "fitImage-%s-%s-%s" % (image_type, machine, machine)) - - self.assertTrue(os.path.exists(fitimage_its_path), - "%s image tree source doesn't exist" % (fitimage_its_path)) - self.assertTrue(os.path.exists(fitimage_path), - "%s FIT image doesn't exist" % (fitimage_path)) - - # Check that the type, load address, entrypoint address and default - # values for kernel and ramdisk in Image Tree Source are as expected. - # The order of fields in the below array is important. Not all the - # fields are tested, only the key fields that wont vary between - # different architectures. - its_field_check = ['type = "kernel";', - 'load = <0x80080000>;', - 'entry = <0x80080000>;', - 'type = "ramdisk";', - 'load = <0x88000000>;', - 'entry = <0x88000000>;', - 'default = "conf@1";', - 'kernel = "kernel@1";', - 'ramdisk = "ramdisk@1";' - ] - - with open(fitimage_its_path) as its_file: - field_index = 0 - for line in its_file: - if field_index == len(its_field_check): - break - if its_field_check[field_index] in line: - field_index +=1 - - if field_index != len(its_field_check): # if its equal, the test passed - self.assertTrue(field_index == len(its_field_check), - "Fields in Image Tree Source File %s did not match, error in finding %s" - % (fitimage_its_path, its_field_check[field_index])) - def test_image_gen_debugfs(self): """ Summary: Check debugfs generation diff --git a/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py b/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py index d0a28090f2..5a5f9b4fdf 100644 --- a/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py +++ b/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py @@ -21,6 +21,6 @@ class TestElf(TestCase): self.assertEqual(oe.qa.elf_machine_to_string(0xB7), "AArch64") self.assertEqual(oe.qa.elf_machine_to_string(0xF7), "BPF") - self.assertEqual(oe.qa.elf_machine_to_string(0x00), "Unknown (0)") + self.assertEqual(oe.qa.elf_machine_to_string(0x00), "Unset") self.assertEqual(oe.qa.elf_machine_to_string(0xDEADBEEF), "Unknown (3735928559)") self.assertEqual(oe.qa.elf_machine_to_string("foobar"), "Unknown ('foobar')") diff --git a/poky/meta/lib/oeqa/selftest/cases/package.py b/poky/meta/lib/oeqa/selftest/cases/package.py index 3010b1af49..7166c3991f 100644 --- a/poky/meta/lib/oeqa/selftest/cases/package.py +++ b/poky/meta/lib/oeqa/selftest/cases/package.py @@ -168,6 +168,7 @@ class PackageTests(OESelftestTestCase): with runqemu('core-image-minimal') as qemu: for path in [ sysconfdir + "/selftest-chown/file", sysconfdir + "/selftest-chown/dir", - sysconfdir + "/selftest-chown/symlink"]: + sysconfdir + "/selftest-chown/symlink", + sysconfdir + "/selftest-chown/fifotest/fifo"]: if not check_ownership(qemu, "test", "test", path): self.fail('Test ownership %s failed' % path) diff --git a/poky/meta/lib/oeqa/selftest/cases/pkgdata.py b/poky/meta/lib/oeqa/selftest/cases/pkgdata.py index 833a1803ba..254abc40c6 100644 --- a/poky/meta/lib/oeqa/selftest/cases/pkgdata.py +++ b/poky/meta/lib/oeqa/selftest/cases/pkgdata.py @@ -218,3 +218,9 @@ class OePkgdataUtilTests(OESelftestTestCase): def test_specify_pkgdatadir(self): result = runCmd('oe-pkgdata-util -p %s lookup-pkg zlib' % get_bb_var('PKGDATA_DIR')) self.assertEqual(result.output, 'libz1') + + def test_no_param(self): + result = runCmd('oe-pkgdata-util', ignore_status=True) + self.assertEqual(result.status, 2, "Status different than 2. output: %s" % result.output) + currpos = result.output.find('usage: oe-pkgdata-util') + self.assertTrue(currpos != -1, msg = "Test is Failed. Help is not Displayed in %s" % result.output) diff --git a/poky/meta/lib/oeqa/selftest/cases/pseudo.py b/poky/meta/lib/oeqa/selftest/cases/pseudo.py new file mode 100644 index 0000000000..33593d5ce9 --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/pseudo.py @@ -0,0 +1,27 @@ +# +# SPDX-License-Identifier: MIT +# + +import glob +import os +import shutil +from oeqa.utils.commands import bitbake, get_test_layer +from oeqa.selftest.case import OESelftestTestCase + +class Pseudo(OESelftestTestCase): + + def test_pseudo_pyc_creation(self): + self.write_config("") + + metaselftestpath = get_test_layer() + pycache_path = os.path.join(metaselftestpath, 'lib/__pycache__') + if os.path.exists(pycache_path): + shutil.rmtree(pycache_path) + + bitbake('pseudo-pyc-test -c install') + + test1_pyc_present = len(glob.glob(os.path.join(pycache_path, 'pseudo_pyc_test1.*.pyc'))) + self.assertTrue(test1_pyc_present, 'test1 pyc file missing, should be created outside of pseudo context.') + + test2_pyc_present = len(glob.glob(os.path.join(pycache_path, 'pseudo_pyc_test2.*.pyc'))) + self.assertFalse(test2_pyc_present, 'test2 pyc file present, should not be created in pseudo context.') diff --git a/poky/meta/lib/oeqa/selftest/cases/reproducible.py b/poky/meta/lib/oeqa/selftest/cases/reproducible.py index a7ef336143..eee494e5cc 100644 --- a/poky/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/poky/meta/lib/oeqa/selftest/cases/reproducible.py @@ -17,6 +17,72 @@ import stat import os import datetime +# For sample packages, see: +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-0t7wr_oo/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-4s9ejwyp/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-haiwdlbr/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201127-hwds3mcl/ +# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201203-sua0pzvc/ +# (both packages/ and packages-excluded/) +exclude_packages = [ + 'acpica-src', + 'babeltrace2-ptest', + 'bootchart2-doc', + 'cups', + 'cwautomacros', + 'dtc', + 'efivar', + 'epiphany', + 'gcr', + 'git', + 'glide', + 'go-dep', + 'go-helloworld', + 'go-runtime', + 'go_', + 'groff', + 'gst-devtools', + 'gstreamer1.0-python', + 'gtk-doc', + 'igt-gpu-tools', + 'kernel-devsrc', + 'libaprutil', + 'libcap-ng', + 'libhandy-1-src', + 'libid3tag', + 'libproxy', + 'libsecret-dev', + 'libsecret-src', + 'lttng-tools-dbg', + 'lttng-tools-ptest', + 'ltp', + 'meson', + 'ovmf-shell-efi', + 'parted-ptest', + 'perf', + 'python3-cython', + 'qemu', + 'quilt-ptest', + 'rsync', + 'ruby', + 'spirv-tools-dev', + 'swig', + 'syslinux-misc', + 'systemd-bootchart', + 'valgrind-ptest', + 'vim', + 'watchdog', + 'xmlto', + 'xorg-minimal-fonts' + ] + +def is_excluded(package): + package_name = os.path.basename(package) + for i in exclude_packages: + if package_name.startswith(i): + return True + return False + MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' SAME = 'SAME' @@ -39,6 +105,7 @@ class PackageCompareResults(object): self.total = [] self.missing = [] self.different = [] + self.different_excluded = [] self.same = [] def add_result(self, r): @@ -46,7 +113,10 @@ class PackageCompareResults(object): if r.status == MISSING: self.missing.append(r) elif r.status == DIFFERENT: - self.different.append(r) + if is_excluded(r.reference): + self.different_excluded.append(r) + else: + self.different.append(r) else: self.same.append(r) @@ -54,10 +124,11 @@ class PackageCompareResults(object): self.total.sort() self.missing.sort() self.different.sort() + self.different_excluded.sort() self.same.sort() def __str__(self): - return 'same=%i different=%i missing=%i total=%i' % (len(self.same), len(self.different), len(self.missing), len(self.total)) + return 'same=%i different=%i different_excluded=%i missing=%i total=%i' % (len(self.same), len(self.different), len(self.different_excluded), len(self.missing), len(self.total)) def compare_file(reference, test, diffutils_sysroot): result = CompareResult() @@ -105,7 +176,7 @@ class DiffoscopeTests(OESelftestTestCase): class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] - images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] + images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'world'] save_results = False if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] @@ -176,6 +247,12 @@ class ReproducibleTests(OESelftestTestCase): PACKAGE_CLASSES = "{package_classes}" INHIBIT_PACKAGE_STRIP = "1" TMPDIR = "{tmpdir}" + LICENSE_FLAGS_WHITELIST = "commercial" + DISTRO_FEATURES_append = ' systemd pam' + USERADDEXTENSION = "useradd-staticids" + USERADD_ERROR_DYNAMIC = "skip" + USERADD_UID_TABLES += "files/static-passwd" + USERADD_GID_TABLES += "files/static-group" ''').format(package_classes=' '.join('package_%s' % c for c in self.package_classes), tmpdir=tmpdir) @@ -235,6 +312,7 @@ class ReproducibleTests(OESelftestTestCase): self.write_package_list(package_class, 'missing', result.missing) self.write_package_list(package_class, 'different', result.different) + self.write_package_list(package_class, 'different_excluded', result.different_excluded) self.write_package_list(package_class, 'same', result.same) if self.save_results: @@ -242,8 +320,12 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.reference, '/'.join([save_dir, 'packages', strip_topdir(d.reference)])) self.copy_file(d.test, '/'.join([save_dir, 'packages', strip_topdir(d.test)])) + for d in result.different_excluded: + self.copy_file(d.reference, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.test)])) + if result.missing or result.different: - fails.append("The following %s packages are missing or different: %s" % + fails.append("The following %s packages are missing or different and not in exclusion list: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) # Clean up empty directories diff --git a/poky/meta/lib/oeqa/selftest/cases/wic.py b/poky/meta/lib/oeqa/selftest/cases/wic.py index 714637ec1e..091f0ab47c 100644 --- a/poky/meta/lib/oeqa/selftest/cases/wic.py +++ b/poky/meta/lib/oeqa/selftest/cases/wic.py @@ -990,6 +990,26 @@ class Wic2(WicTestCase): out = glob(self.resultdir + "%s-*direct" % wksname) self.assertEqual(1, len(out)) + def test_empty_plugin(self): + """Test empty plugin""" + config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_empty_plugin.wks"\n' + self.append_config(config) + self.assertEqual(0, bitbake('core-image-minimal').status) + self.remove_config(config) + + bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'MACHINE']) + deploy_dir = bb_vars['DEPLOY_DIR_IMAGE'] + machine = bb_vars['MACHINE'] + image_path = os.path.join(deploy_dir, 'core-image-minimal-%s.wic' % machine) + self.assertEqual(True, os.path.exists(image_path)) + + sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') + + # Fstype column from 'wic ls' should be empty for the second partition + # as listed in test_empty_plugin.wks + result = runCmd("wic ls %s -n %s | awk -F ' ' '{print $1 \" \" $5}' | grep '^2' | wc -w" % (image_path, sysroot)) + self.assertEqual('1', result.output) + @only_for_arch(['i586', 'i686', 'x86_64']) def test_biosplusefi_plugin_qemu(self): """Test biosplusefi plugin in qemu""" diff --git a/poky/meta/lib/oeqa/selftest/context.py b/poky/meta/lib/oeqa/selftest/context.py index dd3609c1d6..1659926975 100644 --- a/poky/meta/lib/oeqa/selftest/context.py +++ b/poky/meta/lib/oeqa/selftest/context.py @@ -34,7 +34,7 @@ class NonConcurrentTestSuite(unittest.TestSuite): (builddir, newbuilddir) = self.setupfunc("-st", None, self.suite) ret = super().run(result) os.chdir(builddir) - if newbuilddir and ret.wasSuccessful(): + if newbuilddir and ret.wasSuccessful() and self.removefunc: self.removefunc(newbuilddir) def removebuilddir(d): @@ -54,7 +54,7 @@ def removebuilddir(d): bb.utils.prunedir(d, ionice=True) class OESelftestTestContext(OETestContext): - def __init__(self, td=None, logger=None, machines=None, config_paths=None, newbuilddir=None): + def __init__(self, td=None, logger=None, machines=None, config_paths=None, newbuilddir=None, keep_builddir=None): super(OESelftestTestContext, self).__init__(td, logger) self.machines = machines @@ -62,6 +62,11 @@ class OESelftestTestContext(OETestContext): self.config_paths = config_paths self.newbuilddir = newbuilddir + if keep_builddir: + self.removebuilddir = None + else: + self.removebuilddir = removebuilddir + def setup_builddir(self, suffix, selftestdir, suite): builddir = os.environ['BUILDDIR'] if not selftestdir: @@ -119,9 +124,9 @@ class OESelftestTestContext(OETestContext): if processes: from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - return ConcurrentTestSuite(suites, processes, self.setup_builddir, removebuilddir) + return ConcurrentTestSuite(suites, processes, self.setup_builddir, self.removebuilddir) else: - return NonConcurrentTestSuite(suites, processes, self.setup_builddir, removebuilddir) + return NonConcurrentTestSuite(suites, processes, self.setup_builddir, self.removebuilddir) def runTests(self, processes=None, machine=None, skips=[]): if machine: @@ -179,6 +184,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): action='append', default=None, help='Exclude all (unhidden) tests that match any of the specified tag(s). (exclude applies before select)') + parser.add_argument('-K', '--keep-builddir', action='store_true', + help='Keep the test build directory even if all tests pass') + parser.add_argument('-B', '--newbuilddir', help='New build directory to use for tests.') parser.add_argument('-v', '--verbose', action='store_true') parser.set_defaults(func=self.run) @@ -236,6 +244,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") self.tc_kwargs['init']['newbuilddir'] = args.newbuilddir + self.tc_kwargs['init']['keep_builddir'] = args.keep_builddir def tag_filter(tags): if args.exclude_tags: diff --git a/poky/meta/lib/oeqa/utils/commands.py b/poky/meta/lib/oeqa/utils/commands.py index 6c1535ddfb..a71c16ab14 100644 --- a/poky/meta/lib/oeqa/utils/commands.py +++ b/poky/meta/lib/oeqa/utils/commands.py @@ -188,7 +188,10 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T # call sync around the tests to ensure the IO queue doesn't get too large, taking any IO # hit here rather than in bitbake shutdown. if sync: + p = os.environ['PATH'] + os.environ['PATH'] = "/usr/bin:/bin:/usr/sbin:/sbin:" + p os.system("sync") + os.environ['PATH'] = p result.command = command result.status = cmd.status diff --git a/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch index 896a2145d4..7214ead9a7 100644 --- a/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch +++ b/poky/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch @@ -30,7 +30,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> Upstream-Status: Backport -CVE: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 +CVE: CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 Reference to upstream patch: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffbe4ba99080dc2c570944c6 diff --git a/poky/meta/recipes-bsp/grub/files/determinism.patch b/poky/meta/recipes-bsp/grub/files/determinism.patch new file mode 100644 index 0000000000..3c1f562c71 --- /dev/null +++ b/poky/meta/recipes-bsp/grub/files/determinism.patch @@ -0,0 +1,56 @@ +The output in moddep.lst generated from syminfo.lst using genmoddep.awk is +not deterministic since the order of the dependencies on each line can vary +depending on how awk sorts the values in the array. + +Be deterministic in the output by sorting the dependencies on each line. + +Also, the output of the SOURCES lines in grub-core/Makefile.core.am, generated +from grub-core/Makefile.core.def with gentpl.py is not deterministic due to +missing sorting of the list used to generate it. Add such a sort. + +Also ensure the generated unidata.c file is deterministic by sorting the +keys of the dict. + +Upstream-Status: Pending +Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: grub-2.04/grub-core/genmoddep.awk +=================================================================== +--- grub-2.04.orig/grub-core/genmoddep.awk ++++ grub-2.04/grub-core/genmoddep.awk +@@ -59,7 +59,9 @@ END { + } + modlist = "" + depcount[mod] = 0 +- for (depmod in uniqmods) { ++ n = asorti(uniqmods, w) ++ for (i = 1; i <= n; i++) { ++ depmod = w[i] + modlist = modlist " " depmod; + inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod + depcount[mod]++ +Index: grub-2.04/gentpl.py +=================================================================== +--- grub-2.04.orig/gentpl.py ++++ grub-2.04/gentpl.py +@@ -568,6 +568,7 @@ def foreach_platform_value(defn, platfor + for group in RMAP[platform]: + for value in defn.find_all(group + suffix): + r.append(closure(value)) ++ r.sort() + return ''.join(r) + + def platform_conditional(platform, closure): +Index: grub-2.04/util/import_unicode.py +=================================================================== +--- grub-2.04.orig/util/import_unicode.py ++++ grub-2.04/util/import_unicode.py +@@ -174,7 +174,7 @@ infile.close () + + outfile.write ("struct grub_unicode_arabic_shape grub_unicode_arabic_shapes[] = {\n ") + +-for x in arabicsubst: ++for x in sorted(arabicsubst): + try: + if arabicsubst[x]['join'] == "DUAL": + outfile.write ("{0x%x, 0x%x, 0x%x, 0x%x, 0x%x},\n " % (arabicsubst[x][0], arabicsubst[x][1], arabicsubst[x][2], arabicsubst[x][3], arabicsubst[x][4])) diff --git a/poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc index d020103605..49c869b5dc 100644 --- a/poky/meta/recipes-bsp/grub/grub2.inc +++ b/poky/meta/recipes-bsp/grub/grub2.inc @@ -27,6 +27,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://script-Remove-unused-fields-from-grub_script_functio.patch \ file://CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch \ file://CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc index 8ae290acc6..4ed936a70d 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc @@ -23,6 +23,21 @@ SED_CONFIG_EFI_armeb = '' SED_CONFIG_EFI_aarch64 = '' do_compile () { + # Yes, this is crazy. If you build on a system with git < 2.14 from scratch, the tree will + # be marked as "dirty" and the version will include "-dirty", leading to a reproducibility problem. + # The issue is the inode count for Licnses/README changing due to do_populate_lic hardlinking a + # copy of the file. We avoid this by ensuring the index is updated with a "git diff" before the + # u-boot machinery tries to determine the version. + # + # build$ ../git/scripts/setlocalversion ../git + # "" + # build$ ln ../git/ + # build$ ln ../git/README ../foo + # build$ ../git/scripts/setlocalversion ../git + # ""-dirty + # (i.e. creating a hardlink dirties the index) + cd ${S}; git diff; cd ${B} + oe_runmake -C ${S} sandbox_defconfig O=${B} # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-avoid-start-failure-with-bind-user.patch index 8db96ec049..8db96ec049 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-avoid-start-failure-with-bind-user.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 5bcc16c9b2..5bcc16c9b2 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind-ensure-searching-for-json-headers-searches-sysr.patch index f9cdc7ca4d..f9cdc7ca4d 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind9 b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 index 968679ff7f..968679ff7f 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/bind9 +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/bind9 diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/conf.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch index aad345f9fc..aad345f9fc 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/conf.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/conf.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh b/poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh index 633e29c0e6..633e29c0e6 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/generate-rndc-key.sh diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/init.d-add-support-for-read-only-rootfs.patch index 11db95ede1..11db95ede1 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/init.d-add-support-for-read-only-rootfs.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.10/make-etc-initd-bind-stop-work.patch index 146f3e35db..146f3e35db 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/make-etc-initd-bind-stop-work.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.9/named.service b/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service index cda56ef015..cda56ef015 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.9/named.service +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.10/named.service diff --git a/poky/meta/recipes-connectivity/bind/bind_9.16.9.bb b/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb index be8a294a43..71194a61bf 100644 --- a/poky/meta/recipes-connectivity/bind/bind_9.16.9.bb +++ b/poky/meta/recipes-connectivity/bind/bind_9.16.10.bb @@ -19,7 +19,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "bcb292c4d738a46e3cbcb8afaa25ecf54f77652fa575135da9a2a1d525304a5a" +SRC_URI[sha256sum] = "bc47fc019c6205e6a6bfb839c544a1472321df0537ba905b846a4cbffe3362b3" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4 diff --git a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb index cca60ddae2..56fcf5cc0b 100644 --- a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb +++ b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb @@ -17,7 +17,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://dhcpcd@.service \ " -SRC_URI[sha256sum] = "6d49af5e766a2515e6366e4f669663df04ecdf90a1a60ddb1d7a2feb4b5d2566" +SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513" inherit pkgconfig autotools-brokensep systemd useradd diff --git a/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb index adf6d4414e..09a196ad9d 100644 --- a/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/poky/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -71,6 +71,7 @@ do_install_append () { install -m 0755 -d ${D}${base_bindir} mv ${D}${bindir}/ping* ${D}${base_bindir}/ mv ${D}${bindir}/hostname ${D}${base_bindir}/ + mv ${D}${bindir}/dnsdomainname ${D}${base_bindir}/ fi mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/ @@ -118,8 +119,9 @@ PACKAGES =+ "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg" NOAUTOPACKAGEDEBUG = "1" ALTERNATIVE_PRIORITY = "79" -ALTERNATIVE_${PN} = "whois" +ALTERNATIVE_${PN} = "whois dnsdomainname" ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" +ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" ALTERNATIVE_PRIORITY_${PN}-logger = "60" ALTERNATIVE_${PN}-logger = "logger" diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2.inc b/poky/meta/recipes-connectivity/iproute2/iproute2.inc index 403d264308..7a22fe9252 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/poky/meta/recipes-connectivity/iproute2/iproute2.inc @@ -20,11 +20,13 @@ PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," PACKAGECONFIG[devlink] = ",,libmnl," +IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}" + EXTRA_OEMAKE = "\ CC='${CC}' \ KERNEL_INCLUDE=${STAGING_INCDIR} \ DOCDIR=${docdir}/iproute2 \ - SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ SBINDIR='${base_sbindir}' \ LIBDIR='${libdir}' \ " diff --git a/poky/meta/recipes-connectivity/kea/kea_1.7.10.bb b/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb index c9a11908e5..3dc4f6af70 100644 --- a/poky/meta/recipes-connectivity/kea/kea_1.7.10.bb +++ b/poky/meta/recipes-connectivity/kea/kea_1.8.2.bb @@ -19,7 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ " -SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" +SRC_URI[sha256sum] = "486ca7abedb9d6fdf8e4344ad8688d1171f2ef0f5506d118988aadeae80a1d39" inherit autotools systemd update-rc.d upstream-version-is-even diff --git a/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index 0b0bbab168..7dccc15e03 100644 --- a/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProvider SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "22b49d86fb7aded2c195a9d49e5924da696b3228" -PV = "20190618" +SRCREV = "90f3fe28aa25135b7e4a54a7816388913bfd4a2a" +PV = "20201225" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https" diff --git a/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb b/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb index 676a8a6533..688fc8a024 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb +++ b/poky/meta/recipes-connectivity/openssh/openssh_8.4p1.bb @@ -67,8 +67,8 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ --disable-strip \ " -# musl doesn't implement wtmp/utmp -EXTRA_OECONF_append_libc-musl = " --disable-wtmp" +# musl doesn't implement wtmp/utmp and logwtmp +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" # Since we do not depend on libbsd, we do not want configure to use it # just because it finds libutil.h. But, specifying --disable-libutil diff --git a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb index 1827167201..c63ba3c8e7 100644 --- a/poky/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb +++ b/poky/meta/recipes-connectivity/openssl/openssl_1.1.1i.bb @@ -23,7 +23,7 @@ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9" +SRC_URI[sha256sum] = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" @@ -113,6 +113,9 @@ do_configure () { linux-sparc | linux-supersparc) target=linux-sparcv9 ;; + mingw32-x86_64) + target=mingw64 + ;; esac useprefix=${prefix} @@ -195,6 +198,8 @@ FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ ${libdir}/ssl-1.1/openssl.cnf* \ " FILES_${PN}-engines = "${libdir}/engines-1.1" +# ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP) +FILES_${PN}-engines_append_mingw32_class-nativesdk = " ${prefix}${libdir}/engines-1_1" FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" FILES_${PN} =+ "${libdir}/ssl-1.1/*" FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" diff --git a/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch deleted file mode 100644 index 65291368bd..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch +++ /dev/null @@ -1,124 +0,0 @@ -From e50cdaed07e51f2508f94eb1f34fe43776e4ca78 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 May 2015 14:57:05 -0700 -Subject: [PATCH] Fix build with musl - -There are several assumption about glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending ---- - include/net/ppp_defs.h | 2 ++ - pppd/Makefile.linux | 2 +- - pppd/plugins/rp-pppoe/config.h | 3 ++- - pppd/plugins/rp-pppoe/plugin.c | 1 - - pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++---- - pppd/plugins/rp-pppoe/pppoe.h | 2 +- - pppd/sys-linux.c | 3 ++- - 7 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h -index b06eda5..dafa36c 100644 ---- a/include/net/ppp_defs.h -+++ b/include/net/ppp_defs.h -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include <sys/time.h> -+ - /* - * The basic PPP frame. - */ -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 4e485a1..76411bc 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -131,7 +131,7 @@ LIBS += -lcrypt - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - -diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h -index a708859..4a16a88 100644 ---- a/pppd/plugins/rp-pppoe/config.h -+++ b/pppd/plugins/rp-pppoe/config.h -@@ -78,8 +78,9 @@ - #define HAVE_NET_IF_ARP_H 1 - - /* Define if you have the <net/ethernet.h> header file. */ -+#ifdef __GLIBC__ - #define HAVE_NET_ETHERNET_H 1 -- -+#endif - /* Define if you have the <net/if.h> header file. */ - #define HAVE_NET_IF_H 1 - -diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c -index 44e0c31..93c0906 100644 ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> - #include <linux/if_pppox.h> -diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c -index f19c6d8..f45df2c 100644 ---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -29,10 +29,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index a4e7d5c..de191c8 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -90,7 +90,7 @@ typedef unsigned long UINT32_t; - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif --#ifndef HAVE_SYS_DLPI_H -+#if !defined HAVE_SYS_DLPI_H && defined HAVE_NET_ETHERNET_H - #include <netinet/if_ether.h> - #endif - #endif -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index a0531e9..84ee394 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -112,7 +112,7 @@ - #include <linux/types.h> - #include <linux/if.h> - #include <linux/if_arp.h> --#include <linux/route.h> -+/* #include <linux/route.h> */ - #include <linux/if_ether.h> - #endif - #include <netinet/in.h> -@@ -145,6 +145,7 @@ - #endif - - #ifdef INET6 -+#include <net/route.h> - #ifndef _LINUX_IN6_H - /* - * This is in linux/include/net/ipv6.h. --- -2.17.1 - diff --git a/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch deleted file mode 100644 index a32f89fbc8..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit cd90fd147844a0cfec101f1e2db7a3c59d236621 -Author: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed Dec 28 14:11:22 2016 +0200 - -pppol2tp plugin: Remove unneeded include - -The include is not required and will break compile on musl libc with - -| In file included from pppol2tp.c:34:0: -| /usr/include/linux/if.h:97:2: error: expected identifier before numeric constant -| IFF_LOWER_UP = 1<<16, /* __volatile__ */ - -Patch originally from Khem Raj. - -Upstream-Status: Pending [https://github.com/paulusmack/ppp/issues/73] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - -diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c -index 9643b96..458316b 100644 ---- a/pppd/plugins/pppol2tp/openl2tp.c -+++ b/pppd/plugins/pppol2tp/openl2tp.c -@@ -47,7 +47,6 @@ - #include <linux/if_ether.h> - #include <linux/ppp_defs.h> - #include <linux/if_ppp.h> --#include <linux/if_pppox.h> - #include <linux/if_pppol2tp.h> - - #include "l2tp_event.h" -diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c -index 0e28606..4f6d98c 100644 ---- a/pppd/plugins/pppol2tp/pppol2tp.c -+++ b/pppd/plugins/pppol2tp/pppol2tp.c -@@ -46,7 +46,6 @@ - #include <linux/if_ether.h> - #include <linux/ppp_defs.h> - #include <linux/if_ppp.h> --#include <linux/if_pppox.h> - #include <linux/if_pppol2tp.h> - - /* should be added to system's socket.h... */ ---- - diff --git a/poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch deleted file mode 100644 index b7ba7ba643..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 -From: Paul Mackerras <paulus@ozlabs.org> -Date: Mon, 3 Feb 2020 15:53:28 +1100 -Subject: [PATCH] pppd: Fix bounds check in EAP code - -Given that we have just checked vallen < len, it can never be the case -that vallen >= len + sizeof(rhostname). This fixes the check so we -actually avoid overflowing the rhostname array. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Paul Mackerras <paulus@ozlabs.org> - -Upstream-Status: Backport -[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] - -CVE: CVE-2020-8597 - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - pppd/eap.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pppd/eap.c b/pppd/eap.c -index 94407f5..1b93db0 100644 ---- a/pppd/eap.c -+++ b/pppd/eap.c -@@ -1420,7 +1420,7 @@ int len; - } - - /* Not so likely to happen. */ -- if (vallen >= len + sizeof (rhostname)) { -+ if (len - vallen >= sizeof (rhostname)) { - dbglog("EAP: trimming really long peer name down"); - BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); - rhostname[sizeof (rhostname) - 1] = '\0'; -@@ -1846,7 +1846,7 @@ int len; - } - - /* Not so likely to happen. */ -- if (vallen >= len + sizeof (rhostname)) { -+ if (len - vallen >= sizeof (rhostname)) { - dbglog("EAP: trimming really long peer name down"); - BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); - rhostname[sizeof (rhostname) - 1] = '\0'; --- -2.17.1 - diff --git a/poky/meta/recipes-connectivity/ppp/ppp/copts.patch b/poky/meta/recipes-connectivity/ppp/ppp/copts.patch deleted file mode 100644 index 53ff06e03e..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/copts.patch +++ /dev/null @@ -1,21 +0,0 @@ -ppp: use build system CFLAGS when compiling - -Upstream-Status: Pending - -Override the hard-coded COPTS make variables with -CFLAGS. Add COPTS into one Makefile that did not -use it. - -Signed-off-by: Joe Slater <jslater@windriver.com> - ---- a/pppd/plugins/radius/Makefile.linux -+++ b/pppd/plugins/radius/Makefile.linux -@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ - INSTALL = install - - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. diff --git a/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch b/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch deleted file mode 100644 index c5a0be86f5..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch +++ /dev/null @@ -1,30 +0,0 @@ -ppp: Buffer overflow in radius plugin - -From: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=782450 - -Upstream-Status: Backport -CVE: CVE-2015-3310 - -On systems with more than 65535 processes running, pppd aborts when -sending a "start" accounting message to the RADIUS server because of a -buffer overflow in rc_mksid. - -The process id is used in rc_mksid to generate a pseudo-unique string, -assuming that the hex representation of the pid will be at most 4 -characters (FFFF). __sprintf_chk(), used when compiling with -optimization levels greater than 0 and FORTIFY_SOURCE, detects the -buffer overflow and makes pppd crash. - -The following patch fixes the problem. - ---- ppp-2.4.6.orig/pppd/plugins/radius/util.c -+++ ppp-2.4.6/pppd/plugins/radius/util.c -@@ -77,7 +77,7 @@ rc_mksid (void) - static unsigned short int cnt = 0; - sprintf (buf, "%08lX%04X%02hX", - (unsigned long int) time (NULL), -- (unsigned int) getpid (), -+ (unsigned int) getpid () % 65535, - cnt & 0xFF); - cnt++; - return buf; diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch deleted file mode 100644 index 614a474c37..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 505705d0e1b55ce3fdc10d0e5eab5488f869adb6 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Thu, 1 Jul 2010 14:34:12 +0800 -Subject: [PATCH] ppp: Upgraded to version 2.4.5 - -The patch comes from OpenEmbedded. -Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> - -Updated from OE-Classic to include the pcap hunk. -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> - -Upstream-Status: Inappropriate [configuration] - ---- - pppd/Makefile.linux | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 4e485a1..44c4193 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -188,10 +188,10 @@ LIBS += -ldl - endif - - ifdef FILTER --ifneq ($(wildcard /usr/include/pcap-bpf.h),) -+#ifneq ($(wildcard /usr/include/pcap-bpf.h),) - LIBS += -lpcap - CFLAGS += -DPPP_FILTER --endif -+#endif - endif - - ifdef HAVE_INET6 diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch deleted file mode 100644 index 25b8ded441..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch +++ /dev/null @@ -1,115 +0,0 @@ -From f7fb1d1abfa6d208fb40fca1602e0c488108f1b5 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard@openedhand.com> -Date: Wed, 31 Aug 2005 10:45:47 +0000 -Subject: [PATCH] Initial population - -The patch comes from OpenEmbedded -Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Inappropriate [configuration] - ---- - chat/Makefile.linux | 2 +- - pppd/Makefile.linux | 4 ++-- - pppd/plugins/radius/Makefile.linux | 10 +++++----- - pppd/plugins/rp-pppoe/Makefile.linux | 4 ++-- - pppdump/Makefile.linux | 2 +- - pppstats/Makefile.linux | 2 +- - 6 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/chat/Makefile.linux b/chat/Makefile.linux -index 0732ec8..f082dab 100644 ---- a/chat/Makefile.linux -+++ b/chat/Makefile.linux -@@ -25,7 +25,7 @@ chat.o: chat.c - - install: chat - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c chat $(BINDIR) -+ $(INSTALL) -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR) - - clean: -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 9664f70..4e485a1 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -107,7 +107,7 @@ ifdef USE_SRP - CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include - LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto - TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -219,7 +219,7 @@ all: $(TARGETS) - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR) -diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux -index e702263..af57ae3 100644 ---- a/pppd/plugins/radius/Makefile.linux -+++ b/pppd/plugins/radius/Makefile.linux -@@ -36,11 +36,11 @@ all: $(PLUGIN) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) -- $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) -- $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) -+ $(INSTALL) -c -m 755 radius.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) -+ $(INSTALL) -m 444 pppd-radius.8 $(MANDIR) -+ $(INSTALL) -m 444 pppd-radattr.8 $(MANDIR) - - radius.so: radius.o libradiusclient.a - $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a -diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux -index 749ccc2..2c93f4a 100644 ---- a/pppd/plugins/rp-pppoe/Makefile.linux -+++ b/pppd/plugins/rp-pppoe/Makefile.linux -@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) - $(INSTALL) -d -m 755 $(BINDIR) -- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) -+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) - - clean: - rm -f *.o *.so pppoe-discovery -diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux -index cdf7ac4..0457561 100644 ---- a/pppdump/Makefile.linux -+++ b/pppdump/Makefile.linux -@@ -17,5 +17,5 @@ clean: - - install: - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) -diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux -index 71afbe6..1819370 100644 ---- a/pppstats/Makefile.linux -+++ b/pppstats/Makefile.linux -@@ -22,7 +22,7 @@ all: pppstats - - install: pppstats - -mkdir -p $(MANDIR) -- $(INSTALL) -s -c pppstats $(BINDIR) -+ $(INSTALL) -c pppstats $(BINDIR) - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS) diff --git a/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch new file mode 100644 index 0000000000..9471df32e9 --- /dev/null +++ b/poky/meta/recipes-connectivity/ppp/ppp/makefix.patch @@ -0,0 +1,40 @@ +We were seeing reproducibility issues where one host would use the internal +logwtmp wrapper, another would use the one in libutil. The issue was that in +some cases the "\#include" was making it to CC, in others, "#include". The +issue seems to be related to shell escaping. + +The root cause looks to be: +http://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 + +Instead of relying on shell quoting, use make to indirect the variable +and avoid the problem. + +See https://github.com/paulusmack/ppp/issues/233 + +Upstream-Status: Backport [https://github.com/paulusmack/ppp/commit/b4430f7092ececdff2504d5f3393a4c6528c3686] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: ppp-2.4.9/pppd/Makefile.linux +=================================================================== +--- ppp-2.4.9.orig/pppd/Makefile.linux ++++ ppp-2.4.9/pppd/Makefile.linux +@@ -80,7 +80,8 @@ PLUGIN=y + #USE_SRP=y + + # Use libutil; test if logwtmp is declared in <utmp.h> to detect +-ifeq ($(shell echo '\#include <utmp.h>' | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes) ++UTMPHEADER = "\#include <utmp.h>" ++ifeq ($(shell echo $(UTMPHEADER) | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes) + USE_LIBUTIL=y + endif + +@@ -143,7 +144,8 @@ CFLAGS += -DHAS_SHADOW + #LIBS += -lshadow $(LIBS) + endif + +-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) ++CRYPTHEADER = "\#include <utmp.h>" ++ifeq ($(shell echo $(CRYPTHEADER) | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) + CFLAGS += -DHAVE_CRYPT_H=1 + LIBS += -lcrypt + endif diff --git a/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch b/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch deleted file mode 100644 index a72414ff8a..0000000000 --- a/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch +++ /dev/null @@ -1,45 +0,0 @@ -The patch comes from OpenEmbedded -Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Inappropriate [embedded specific] - -diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c ---- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800 -+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 17:02:33.930393283 +0800 -@@ -55,6 +55,8 @@ - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+#include <sys/stat.h> -+#include <unistd.h> - - #include "pppd.h" - #include "fsm.h" -@@ -2095,6 +2097,14 @@ - u_int32_t peerdns1, peerdns2; - { - FILE *f; -+ struct stat dirinfo; -+ -+ if(stat(_PATH_OUTDIR, &dirinfo)) { -+ if(mkdir(_PATH_OUTDIR, 0775)) { -+ error("Failed to create directory %s: %m", _PATH_OUTDIR); -+ return; -+ } -+ } - - f = fopen(_PATH_RESOLV, "w"); - if (f == NULL) { -diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h ---- ppp-2.4.5-orig/pppd/pathnames.h 2010-06-30 15:51:12.043682063 +0800 -+++ ppp-2.4.5/pppd/pathnames.h 2010-06-30 17:03:20.594371055 +0800 -@@ -30,7 +30,8 @@ - #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." - #define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" - #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" --#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" -+#define _PATH_OUTDIR _ROOT_PATH _PATH_VARRUN "/ppp" -+#define _PATH_RESOLV _PATH_OUTDIR "/resolv.conf" - - #define _PATH_USEROPT ".ppprc" - #define _PATH_PSEUDONYM ".ppp_pseudonym" diff --git a/poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb b/poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb index f9c60d6bad..a78992fa5e 100644 --- a/poky/meta/recipes-connectivity/ppp/ppp_2.4.8.bb +++ b/poky/meta/recipes-connectivity/ppp/ppp_2.4.9.bb @@ -12,9 +12,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ - file://makefile.patch \ - file://pppd-resolv-varrun.patch \ - file://makefile-remove-hard-usr-reference.patch \ + file://makefix.patch \ file://pon \ file://poff \ file://init \ @@ -22,26 +20,18 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://ip-down \ file://08setupdns \ file://92removedns \ - file://copts.patch \ file://pap \ file://ppp_on_boot \ file://provider \ file://ppp@.service \ - file://fix-CVE-2015-3310.patch \ - file://0001-ppp-Remove-unneeded-include.patch \ - file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " -SRC_URI_append_libc-musl = "\ - file://0001-Fix-build-with-musl.patch \ -" -SRC_URI[md5sum] = "2ca8342b9804be15103fd3f687af701c" -SRC_URI[sha256sum] = "f6bf89beae26b2943dff8f1003533d6a5a4909a0fa6edfbec44fe039bbe61bc6" +SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d" inherit autotools-brokensep systemd TARGET_CC_ARCH += " ${LDFLAGS}" -EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" +EXTRA_OEMAKE = "CC='${CC}' STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" EXTRA_OECONF = "--disable-strip" # Package Makefile computes CFLAGS, referencing COPTS. @@ -86,7 +76,7 @@ CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" -FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" +FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so" FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so" FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" @@ -101,3 +91,6 @@ SUMMARY_${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout SUMMARY_${PN}-password = "Plugin for PPP to get passwords via a pipe" SUMMARY_${PN}-l2tp = "Plugin for PPP for l2tp support" SUMMARY_${PN}-tools = "Additional tools for the PPP package" + +# Ignore compatibility symlink rp-pppoe.so->pppoe.so +INSANE_SKIP_${PN}-oe += "dev-so" diff --git a/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb b/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb index 61fb8cbad1..8d0f419f4d 100644 --- a/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb +++ b/poky/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb @@ -23,6 +23,53 @@ do_install() { id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'` echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab done + if [ "${USE_VT}" = "1" ]; then + cat <<EOF >>${D}${sysconfdir}/inittab +# ${base_sbindir}/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# <id>:<runlevels>:<action>:<process> +# + +EOF + + for n in ${SYSVINIT_ENABLED_GETTYS} + do + echo "tty$n:12345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab + done + echo "" >> ${D}${sysconfdir}/inittab + fi + +} + +pkg_postinst_${PN} () { +# run this on host and on target +if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then + exit 0 +fi +} + +pkg_postinst_ontarget_${PN} () { +# run this on the target +if [ -e /proc/consoles ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed -e s/^.*\;//g -e s/\:.*//g` + k=`echo ${i} | sed s/^.*\://g` + if [ -z "`grep ${j} /proc/consoles`" ]; then + if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then + sed -i -e /^.*${j}\ /d -e /^.*${j}$/d /etc/inittab + fi + fi + done + kill -HUP 1 +else + exit 1 +fi } # SERIAL_CONSOLES is generally defined by the MACHINE .conf. @@ -33,3 +80,6 @@ FILES_${PN} = "${sysconfdir}/inittab" CONFFILES_${PN} = "${sysconfdir}/inittab" RCONFLICTS_${PN} = "sysvinit-inittab" + +USE_VT ?= "1" +SYSVINIT_ENABLED_GETTYS ?= "1" diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index e0522be729..47fcb59302 100644 --- a/poky/meta/recipes-core/busybox/busybox.inc +++ b/poky/meta/recipes-core/busybox/busybox.inc @@ -309,9 +309,10 @@ do_install () { install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev fi fi - if grep -q "CONFIG_INIT=y" ${B}/.config; then + if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK + install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then diff --git a/poky/meta/recipes-core/busybox/busybox/mdev.cfg b/poky/meta/recipes-core/busybox/busybox/mdev.cfg index 6aefe90e43..143e6097cb 100644 --- a/poky/meta/recipes-core/busybox/busybox/mdev.cfg +++ b/poky/meta/recipes-core/busybox/busybox/mdev.cfg @@ -9,3 +9,5 @@ CONFIG_SETSID=y CONFIG_CTTYHACK=y CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_MDEV_DAEMON=y diff --git a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb b/poky/meta/recipes-core/busybox/busybox_1.32.0.bb index 8e23b0d4a2..3a669444dd 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.32.0.bb @@ -33,6 +33,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://getopts.cfg \ file://resize.cfg \ ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ + ${@["", "file://rcS.default"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ file://syslog.cfg \ file://unicode.cfg \ diff --git a/poky/meta/recipes-core/busybox/files/mdev b/poky/meta/recipes-core/busybox/files/mdev index 8c9c06e96c..2fbdfb073e 100755 --- a/poky/meta/recipes-core/busybox/files/mdev +++ b/poky/meta/recipes-core/busybox/files/mdev @@ -1,21 +1,43 @@ #!/bin/sh -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 -mkdir /dev/pts /dev/shm -chmod 777 /dev/shm -mount -t devpts devpts /dev/pts -touch /dev/mdev.seq -#sysctl -w kernel.hotplug=/sbin/mdev -echo "/sbin/mdev" > /proc/sys/kernel/hotplug -mdev -s - # -# We might have mounted something over /dev, see if /dev/initctl is there. +# Run the mdev daemon # -if test ! -p /dev/initctl -then - rm -f /dev/initctl - mknod -m 600 /dev/initctl p -fi + +DAEMON="mdev" +PIDFILE="/var/run/$DAEMON.pid" + + +start() { + echo -n "Starting $DAEMON... " + start-stop-daemon -S -b -m -p $PIDFILE -x /sbin/mdev -- -df + [ $? -eq 0 ] && echo "OK" || echo "ERROR" + + # coldplug modules + find /sys/ -name modalias -print0 | \ + xargs -0 sort -u | \ + tr '\n' '\0' | \ + xargs -0 modprobe -abq +} + +stop() { + echo -n "Stopping $DAEMON... " + start-stop-daemon -K -p $PIDFILE + [ $? -eq 0 ] && echo "OK" || echo "ERROR" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1" + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/poky/meta/recipes-core/busybox/files/rcS.default b/poky/meta/recipes-core/busybox/files/rcS.default new file mode 100644 index 0000000000..44c9747e34 --- /dev/null +++ b/poky/meta/recipes-core/busybox/files/rcS.default @@ -0,0 +1,31 @@ +# +# Defaults for the boot scripts in /etc/rcS.d +# + +# Time files in /tmp are kept in days. +TMPTIME=0 +# Set to yes if you want sulogin to be spawned on bootup +SULOGIN=no +# Set to no if you want to be able to login over telnet/rlogin +# before system startup is complete (as soon as inetd is started) +DELAYLOGIN=no +# Assume that the BIOS clock is set to UTC time (recommended) +UTC=yes +# Set VERBOSE to "no" if you would like a more quiet bootup. +VERBOSE=no +# Set EDITMOTD to "no" if you don't want /etc/motd to be edited automatically +EDITMOTD=no +# Whether to fsck root on boot +ENABLE_ROOTFS_FSCK=no +# Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup. +FSCKFIX=yes +# Set TICKADJ to the correct tick value for this specific machine +#TICKADJ=10000 +# Enable caching in populate-volatile.sh +VOLATILE_ENABLE_CACHE=yes +# Indicate whether the rootfs is intended to be read-only or not. +# Setting ROOTFS_READ_ONLY to yes and rebooting will give you a read-only rootfs. +# Normally you should not change this value. +ROOTFS_READ_ONLY=no +# Indicate init system type +INIT_SYSTEM=busybox diff --git a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb index 4eb357e310..320f93bdc2 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb @@ -39,6 +39,9 @@ PACKAGECONFIG_class-target ??= "\ # The lib/oe/path.py requires xattr PACKAGECONFIG_class-native ??= "xattr" +# oe-core builds need xattr support +PACKAGECONFIG_class-nativesdk ??= "xattr" + # with, without, depends, rdepends # PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," diff --git a/poky/meta/recipes-core/dropbear/dropbear.inc b/poky/meta/recipes-core/dropbear/dropbear.inc index 080ee26b2e..a30f98faa4 100644 --- a/poky/meta/recipes-core/dropbear/dropbear.inc +++ b/poky/meta/recipes-core/dropbear/dropbear.inc @@ -58,6 +58,9 @@ EXTRA_OECONF += "\ # This is causing [textrel] QA warning EXTRA_OECONF += "--disable-harden" +# musl does not implement wtmp/logwtmp APIs +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" + do_install() { install -d ${D}${sysconfdir} \ ${D}${sysconfdir}/init.d \ diff --git a/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch b/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch new file mode 100644 index 0000000000..2460d26bdc --- /dev/null +++ b/poky/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch @@ -0,0 +1,23 @@ +From dd350f4e2258b5a638bc8fb26a6193147902d292 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org> +Date: Mon, 30 Nov 2020 18:40:33 -0300 +Subject: [PATCH] ell: add missing include in dhcp-server. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ell/dhcp-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c +index c983ed4..144e83e 100644 +--- a/ell/dhcp-server.c ++++ b/ell/dhcp-server.c +@@ -24,6 +24,7 @@ + #include <config.h> + #endif + ++#include <linux/types.h> + #include <net/ethernet.h> + #include <sys/socket.h> + #include <arpa/inet.h> diff --git a/poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch b/poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch new file mode 100644 index 0000000000..f0ce6f1364 --- /dev/null +++ b/poky/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch @@ -0,0 +1,27 @@ +From 277e1eca67fcc23cb31be7b826d83a19d9b89bd2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 22 Dec 2020 10:30:54 +0000 +Subject: [PATCH] pem.c: do not use rawmemchr() + +This is a glibc-only function, and causes build failures with +alternative libc implementations such as musl. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ell/pem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ell/pem.c b/ell/pem.c +index 790f2c2..237ae02 100644 +--- a/ell/pem.c ++++ b/ell/pem.c +@@ -224,7 +224,7 @@ static uint8_t *pem_load_buffer(const void *buf, size_t buf_len, + + /* Check that each header line has a key and a colon */ + while (start < end) { +- const char *lf = rawmemchr(start, '\n'); ++ const char *lf = memchr(start, '\n', end - start); + const char *colon = memchr(start, ':', lf - start); + + if (!colon) diff --git a/poky/meta/recipes-core/ell/ell_0.33.bb b/poky/meta/recipes-core/ell/ell_0.35.bb index 2fa05104fb..ccc54b5ff7 100644 --- a/poky/meta/recipes-core/ell/ell_0.33.bb +++ b/poky/meta/recipes-core/ell/ell_0.35.bb @@ -13,8 +13,11 @@ DEPENDS = "dbus" inherit autotools pkgconfig -SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d9e40e641164150394b74b719b9726fc734f24b2cde679cf5f3be6915c34eded" +SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-ell-add-missing-include-in-dhcp-server.patch \ + file://0001-pem.c-do-not-use-rawmemchr.patch \ + " +SRC_URI[sha256sum] = "2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f" do_configure_prepend () { mkdir -p ${S}/build-aux diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch new file mode 100644 index 0000000000..508c8c3bad --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch @@ -0,0 +1,26 @@ +From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sun, 20 Dec 2020 22:01:43 +0100 +Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds + +This may be necessary on overloaded CI systems. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gio/tests/codegen.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py +index 51de0ed..ca98c9d 100644 +--- a/gio/tests/codegen.py ++++ b/gio/tests/codegen.py +@@ -51,7 +51,7 @@ class TestCodegen(unittest.TestCase): + cwd = '' + + def setUp(self): +- self.timeout_seconds = 10 # seconds per test ++ self.timeout_seconds = 100 # seconds per test + self.tmpdir = tempfile.TemporaryDirectory() + self.cwd = os.getcwd() + os.chdir(self.tmpdir.name) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 2b8e930511..4cbcc29a50 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 85931fbb981b5aae38f1c1370d5d3c091cb862b8 Mon Sep 17 00:00:00 2001 +From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb index 1f83660856..70e8aa8785 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb @@ -16,11 +16,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ + file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4" +SRC_URI[sha256sum] = "97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch b/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch new file mode 100644 index 0000000000..a458a2a223 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch @@ -0,0 +1,110 @@ +From 75a193b7611bade31a150dfcc528b973e3d46231 Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella <adhemerval.zanella@linaro.org> +Date: Mon, 2 Nov 2020 16:18:29 -0300 +Subject: [PATCH] linux: Allow adjtime with NULL argument [BZ #26833] + +The adjtime interface allows return the amount of time remaining +from any previous adjustment that has not yet been completed by +passing a NULL as first argument. This was introduced with y2038 +support 0308077e3a. + +Checked on i686-linux-gnu. + +Reviewed-by: Lukasz Majewski <lukma@denx.de> +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=75a193b7611bade31a150dfcc528b973e3d46231] +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +--- + sysdeps/unix/sysv/linux/adjtime.c | 11 +++++--- + time/Makefile | 3 ++- + time/tst-adjtime.c | 44 +++++++++++++++++++++++++++++++ + 3 files changed, 54 insertions(+), 4 deletions(-) + create mode 100644 time/tst-adjtime.c + +diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c +index 3f9a4ea2eb..6d1d1b6af2 100644 +--- a/sysdeps/unix/sysv/linux/adjtime.c ++++ b/sysdeps/unix/sysv/linux/adjtime.c +@@ -68,11 +68,16 @@ libc_hidden_def (__adjtime64) + int + __adjtime (const struct timeval *itv, struct timeval *otv) + { +- struct __timeval64 itv64, otv64; ++ struct __timeval64 itv64, *pitv64 = NULL; ++ struct __timeval64 otv64; + int retval; + +- itv64 = valid_timeval_to_timeval64 (*itv); +- retval = __adjtime64 (&itv64, otv != NULL ? &otv64 : NULL); ++ if (itv != NULL) ++ { ++ itv64 = valid_timeval_to_timeval64 (*itv); ++ pitv64 = &itv64; ++ } ++ retval = __adjtime64 (pitv64, otv != NULL ? &otv64 : NULL); + if (otv != NULL) + *otv = valid_timeval64_to_timeval (otv64); + +diff --git a/time/Makefile b/time/Makefile +index 26aa835166..f27a75a115 100644 +--- a/time/Makefile ++++ b/time/Makefile +@@ -47,7 +47,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ + tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ + tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ + tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \ +- tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 ++ tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \ ++ tst-adjtime + + include ../Rules + +diff --git a/time/tst-adjtime.c b/time/tst-adjtime.c +new file mode 100644 +index 0000000000..ae2b37cdab +--- /dev/null ++++ b/time/tst-adjtime.c +@@ -0,0 +1,44 @@ ++/* Basic tests for adjtime. ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <sys/time.h> ++#include <stdlib.h> ++ ++#include <errno.h> ++#include <support/check.h> ++ ++ ++static int ++do_test (void) ++{ ++ /* Check if the interface allows getting the amount of time remaining ++ from any previous adjustment that has not yet been completed. This ++ is a non-privileged function of adjtime. */ ++ struct timeval tv; ++ int r = adjtime (NULL, &tv); ++ if (r == -1) ++ { ++ if (errno == ENOSYS) ++ FAIL_UNSUPPORTED ("adjtime unsupported"); ++ FAIL_EXIT1 ("adjtime (NULL, ...) failed: %m"); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch new file mode 100644 index 0000000000..134b4e3613 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29562.patch @@ -0,0 +1,155 @@ +From 228edd356f03bf62dcf2b1335f25d43c602ee68d Mon Sep 17 00:00:00 2001 +From: Michael Colavita <mcolavita@fb.com> +Date: Thu, 19 Nov 2020 11:44:40 -0500 +Subject: [PATCH] iconv: Fix incorrect UCS4 inner loop bounds (BZ#26923) + +Previously, in UCS4 conversion routines we limit the number of +characters we examine to the minimum of the number of characters in the +input and the number of characters in the output. This is not the +correct behavior when __GCONV_IGNORE_ERRORS is set, as we do not consume +an output character when we skip a code unit. Instead, track the input +and output pointers and terminate the loop when either reaches its +limit. + +This resolves assertion failures when resetting the input buffer in a step of +iconv, which assumes that the input will be fully consumed given sufficient +output space. + +Upstream-Status: Backport [git://sourceware.org/git/glibc.git] +CVE: CVE-2020-29562 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + iconv/Makefile | 2 +- + iconv/gconv_simple.c | 16 ++++---------- + iconv/tst-iconv8.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 13 deletions(-) + create mode 100644 iconv/tst-iconv8.c + +diff --git a/iconv/Makefile b/iconv/Makefile +index 30bf996d3a..f9b51e23ec 100644 +--- a/iconv/Makefile ++++ b/iconv/Makefile +@@ -44,7 +44,7 @@ CFLAGS-linereader.c += -DNO_TRANSLITERATION + CFLAGS-simple-hash.c += -I../locale + + tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \ +- tst-iconv7 tst-iconv-mt tst-iconv-opt ++ tst-iconv7 tst-iconv8 tst-iconv-mt tst-iconv-opt + + others = iconv_prog iconvconfig + install-others-programs = $(inst_bindir)/iconv +diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c +index d4797fba17..963b29f246 100644 +--- a/iconv/gconv_simple.c ++++ b/iconv/gconv_simple.c +@@ -239,11 +239,9 @@ ucs4_internal_loop (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + uint32_t inval; + +@@ -307,11 +305,9 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + if (__glibc_unlikely (inptr[0] > 0x80)) + { +@@ -613,11 +609,9 @@ ucs4le_internal_loop (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + uint32_t inval; + +@@ -684,11 +678,9 @@ ucs4le_internal_loop_unaligned (struct __gconv_step *step, + int flags = step_data->__flags; + const unsigned char *inptr = *inptrp; + unsigned char *outptr = *outptrp; +- size_t n_convert = MIN (inend - inptr, outend - outptr) / 4; + int result; +- size_t cnt; + +- for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) ++ for (; inptr + 4 <= inend && outptr + 4 <= outend; inptr += 4) + { + if (__glibc_unlikely (inptr[3] > 0x80)) + { +diff --git a/iconv/tst-iconv8.c b/iconv/tst-iconv8.c +new file mode 100644 +index 0000000000..0b92b19f66 +--- /dev/null ++++ b/iconv/tst-iconv8.c +@@ -0,0 +1,50 @@ ++/* Test iconv behavior on UCS4 conversions with //IGNORE. ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++/* Derived from BZ #26923 */ ++#include <errno.h> ++#include <iconv.h> ++#include <stdio.h> ++#include <support/check.h> ++ ++static int ++do_test (void) ++{ ++ iconv_t cd = iconv_open ("UTF-8//IGNORE", "ISO-10646/UCS4/"); ++ TEST_VERIFY_EXIT (cd != (iconv_t) -1); ++ ++ /* ++ * Convert sequence beginning with an irreversible character into buffer that ++ * is too small. ++ */ ++ char input[12] = "\xe1\x80\xa1" "AAAAAAAAA"; ++ char *inptr = input; ++ size_t insize = sizeof (input); ++ char output[6]; ++ char *outptr = output; ++ size_t outsize = sizeof (output); ++ ++ TEST_VERIFY (iconv (cd, &inptr, &insize, &outptr, &outsize) == -1); ++ TEST_VERIFY (errno == E2BIG); ++ ++ TEST_VERIFY_EXIT (iconv_close (cd) != -1); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +-- +2.17.0 + diff --git a/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch new file mode 100644 index 0000000000..0f54d72cad --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/CVE-2020-29573.patch @@ -0,0 +1,56 @@ +From 681900d29683722b1cb0a8e565a0585846ec5a61 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 22 Sep 2020 19:07:48 +0200 +Subject: [PATCH] x86: Harden printf against non-normal long double values (bug + 26649) + +The behavior of isnan/__builtin_isnan on bit patterns that do not +correspond to something that the CPU would produce from valid inputs +is currently under-defined in the toolchain. (The GCC built-in and +glibc disagree.) + +The isnan check in PRINTF_FP_FETCH in stdio-common/printf_fp.c +assumes the GCC behavior that returns true for non-normal numbers +which are not specified as NaN. (The glibc implementation returns +false for such numbers.) + +At present, passing non-normal numbers to __mpn_extract_long_double +causes this function to produce irregularly shaped multi-precision +integers, triggering undefined behavior in __printf_fp_l. + +With GCC 10 and glibc 2.32, this behavior is not visible because +__builtin_isnan is used, which avoids calling +__mpn_extract_long_double in this case. This commit updates the +implementation of __mpn_extract_long_double so that regularly shaped +multi-precision integers are produced in this case, avoiding +undefined behavior in __printf_fp_l. + +Upstream-Status: Backport [git://sourceware.org/git/glibc.git] +CVE: CVE-2020-29573 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + sysdeps/i386/ldbl2mpn.c | 8 ++++ + 1 files changed, 8 insertions(+) + +diff --git a/sysdeps/i386/ldbl2mpn.c b/sysdeps/i386/ldbl2mpn.c +index ec8464eef7..23afedfb67 100644 +--- a/sysdeps/i386/ldbl2mpn.c ++++ b/sysdeps/i386/ldbl2mpn.c +@@ -115,6 +115,14 @@ __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size, + && res_ptr[N - 1] == 0) + /* Pseudo zero. */ + *expt = 0; ++ else ++ /* Unlike other floating point formats, the most significant bit ++ is explicit and expected to be set for normal numbers. Set it ++ in case it is cleared in the input. Otherwise, callers will ++ not be able to produce the expected multi-precision integer ++ layout by shifting. */ ++ res_ptr[N - 1] |= (mp_limb_t) 1 << (LDBL_MANT_DIG - 1 ++ - ((N - 1) * BITS_PER_MP_LIMB)); + + return N; + } +-- +2.17.0 + diff --git a/poky/meta/recipes-core/glibc/glibc_2.32.bb b/poky/meta/recipes-core/glibc/glibc_2.32.bb index 2a0e464385..b850c28c78 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.32.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.32.bb @@ -43,6 +43,9 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ + file://0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch \ + file://CVE-2020-29562.patch \ + file://CVE-2020-29573.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb b/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb index b591f412c6..33977e66c1 100644 --- a/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb +++ b/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb @@ -16,7 +16,7 @@ SECTION = "base" LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" -SRCREV = "6a1860c6f5ad295af605ddf588933544e7c24ce1" +SRCREV = "dbd9197569c0935029acd5c9b02b84c68fd937ee" SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh index 02f0351fcb..a63e71b780 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh @@ -74,7 +74,7 @@ test "$VERBOSE" != no && echo "Activating swap" # # Check the root filesystem. # -if test -f /fastboot || test $rootcheck = no +if test -f /fastboot || test "$rootcheck" = "no" then test $rootcheck = yes && echo "Fast boot, no filesystem check" else diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh index c719be5d9a..2839d57cbe 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh @@ -19,15 +19,21 @@ test "$VERBOSE" != no && echo "Mounting local filesystems..." mount -at nonfs,nosmbfs,noncpfs 2>/dev/null -# -# We might have mounted something over /dev, see if /dev/initctl is there. -# -if test ! -p /dev/initctl -then - rm -f /dev/initctl - mknod -m 600 /dev/initctl p + +# We might have mounted something over /run; see if +# /dev/initctl is present. Look for +# /sbin/init.sysvinit to verify that sysvinit (and +# not busybox or systemd) is installed as default init). +INITCTL="/dev/initctl" +if [ ! -p "$INITCTL" ] && [ "${INIT_SYSTEM}" = "sysvinit" ]; then + # Create new control channel + rm -f "$INITCTL" + mknod -m 600 "$INITCTL" p + + # Reopen control channel. + PID="$(pidof -s /sbin/init || echo 1)" + [ -n "$PID" ] && kill -s USR1 "$PID" fi -kill -USR1 1 # # Execute swapon command again, in case we want to swap to diff --git a/poky/meta/recipes-core/kbd/kbd_2.3.0.bb b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb index 529f49bef4..65ba70bf47 100644 --- a/poky/meta/recipes-core/kbd/kbd_2.3.0.bb +++ b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb @@ -15,7 +15,7 @@ RCONFLICTS_${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ " -SRC_URI[sha256sum] = "685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a" +SRC_URI[sha256sum] = "55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ " @@ -29,6 +29,13 @@ FILES_${PN}-consoletrans = "${datadir}/consoletrans" FILES_${PN}-keymaps = "${datadir}/keymaps" FILES_${PN}-unimaps = "${datadir}/unimaps" +do_install_append () { + if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ + && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then + mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd + fi +} + inherit update-alternatives ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ diff --git a/poky/meta/recipes-core/meta/buildtools-tarball.bb b/poky/meta/recipes-core/meta/buildtools-tarball.bb index 560b8d67b9..9da81d5523 100644 --- a/poky/meta/recipes-core/meta/buildtools-tarball.bb +++ b/poky/meta/recipes-core/meta/buildtools-tarball.bb @@ -67,7 +67,7 @@ create_sdk_files_append () { # Generate new (mini) sdk-environment-setup file script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script + echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script diff --git a/poky/meta/recipes-core/meta/wic-tools.bb b/poky/meta/recipes-core/meta/wic-tools.bb index 3e7d0ed48d..bc6cc0d183 100644 --- a/poky/meta/recipes-core/meta/wic-tools.bb +++ b/poky/meta/recipes-core/meta/wic-tools.bb @@ -3,14 +3,15 @@ SUMMARY = "A meta recipe to build native tools used by wic." LICENSE = "MIT" DEPENDS = "\ - parted-native syslinux-native gptfdisk-native dosfstools-native \ + parted-native gptfdisk-native dosfstools-native \ mtools-native bmap-tools-native grub-native cdrtools-native \ btrfs-tools-native squashfs-tools-native pseudo-native \ e2fsprogs-native util-linux-native tar-native\ " -DEPENDS_append_x86 = " syslinux grub-efi systemd-boot" -DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" -DEPENDS_append_x86-x32 = " syslinux grub-efi" +DEPENDS_append_x86 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS_append_x86-64 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS_append_x86-x32 = " syslinux-native syslinux grub-efi" +DEPENDS_append_aarch64 = " grub-efi systemd-boot" INHIBIT_DEFAULT_DEPS = "1" diff --git a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch b/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch index d2bd587e39..35c8b65740 100644 --- a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch +++ b/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch @@ -43,8 +43,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> crt/x86_64/crtn.s | 1 + 28 files changed, 28 insertions(+) -diff --git a/crt/aarch64/crti.s b/crt/aarch64/crti.s -index 775df0ac..0f7c23a9 100644 --- a/crt/aarch64/crti.s +++ b/crt/aarch64/crti.s @@ -1,3 +1,4 @@ @@ -52,8 +50,6 @@ index 775df0ac..0f7c23a9 100644 .section .init .global _init .type _init,%function -diff --git a/crt/aarch64/crtn.s b/crt/aarch64/crtn.s -index 73cab692..d62fc129 100644 --- a/crt/aarch64/crtn.s +++ b/crt/aarch64/crtn.s @@ -1,3 +1,4 @@ @@ -61,8 +57,6 @@ index 73cab692..d62fc129 100644 .section .init ldp x29,x30,[sp],#16 ret -diff --git a/crt/arm/crti.s b/crt/arm/crti.s -index 18dc1e41..8df72979 100644 --- a/crt/arm/crti.s +++ b/crt/arm/crti.s @@ -1,3 +1,4 @@ @@ -70,8 +64,6 @@ index 18dc1e41..8df72979 100644 .syntax unified .section .init -diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s -index dc020f92..7451355b 100644 --- a/crt/arm/crtn.s +++ b/crt/arm/crtn.s @@ -1,3 +1,4 @@ @@ -79,8 +71,6 @@ index dc020f92..7451355b 100644 .syntax unified .section .init -diff --git a/crt/i386/crti.s b/crt/i386/crti.s -index d2682a20..2823fc3b 100644 --- a/crt/i386/crti.s +++ b/crt/i386/crti.s @@ -1,3 +1,4 @@ @@ -88,8 +78,6 @@ index d2682a20..2823fc3b 100644 .section .init .global _init _init: -diff --git a/crt/i386/crtn.s b/crt/i386/crtn.s -index f3b61e01..04fb1646 100644 --- a/crt/i386/crtn.s +++ b/crt/i386/crtn.s @@ -1,3 +1,4 @@ @@ -97,8 +85,6 @@ index f3b61e01..04fb1646 100644 .section .init add $12,%esp ret -diff --git a/crt/microblaze/crti.s b/crt/microblaze/crti.s -index ed1c2fa4..29ee4733 100644 --- a/crt/microblaze/crti.s +++ b/crt/microblaze/crti.s @@ -1,3 +1,4 @@ @@ -106,8 +92,6 @@ index ed1c2fa4..29ee4733 100644 .section .init .global _init .align 2 -diff --git a/crt/microblaze/crtn.s b/crt/microblaze/crtn.s -index 1e02c984..c2083749 100644 --- a/crt/microblaze/crtn.s +++ b/crt/microblaze/crtn.s @@ -1,3 +1,4 @@ @@ -115,8 +99,6 @@ index 1e02c984..c2083749 100644 .section .init lwi r15, r1, 0 rtsd r15, 8 -diff --git a/crt/mips/crti.s b/crt/mips/crti.s -index 39dee380..0211764e 100644 --- a/crt/mips/crti.s +++ b/crt/mips/crti.s @@ -1,3 +1,4 @@ @@ -124,8 +106,6 @@ index 39dee380..0211764e 100644 .set noreorder .section .init -diff --git a/crt/mips/crtn.s b/crt/mips/crtn.s -index 506a04b7..606490cf 100644 --- a/crt/mips/crtn.s +++ b/crt/mips/crtn.s @@ -1,3 +1,4 @@ @@ -133,8 +113,6 @@ index 506a04b7..606490cf 100644 .set noreorder .section .init -diff --git a/crt/mips64/crti.s b/crt/mips64/crti.s -index c962dd09..f2c19cdd 100644 --- a/crt/mips64/crti.s +++ b/crt/mips64/crti.s @@ -1,3 +1,4 @@ @@ -142,8 +120,6 @@ index c962dd09..f2c19cdd 100644 .set noreorder .section .init -diff --git a/crt/mips64/crtn.s b/crt/mips64/crtn.s -index f3930b24..68903ffa 100644 --- a/crt/mips64/crtn.s +++ b/crt/mips64/crtn.s @@ -1,3 +1,4 @@ @@ -151,8 +127,6 @@ index f3930b24..68903ffa 100644 .set noreorder .section .init -diff --git a/crt/mipsn32/crti.s b/crt/mipsn32/crti.s -index 14fa28d9..a35387d3 100644 --- a/crt/mipsn32/crti.s +++ b/crt/mipsn32/crti.s @@ -1,3 +1,4 @@ @@ -160,8 +134,6 @@ index 14fa28d9..a35387d3 100644 .set noreorder .section .init .global _init -diff --git a/crt/mipsn32/crtn.s b/crt/mipsn32/crtn.s -index dccd7e89..bdb6e561 100644 --- a/crt/mipsn32/crtn.s +++ b/crt/mipsn32/crtn.s @@ -1,3 +1,4 @@ @@ -169,8 +141,6 @@ index dccd7e89..bdb6e561 100644 .set noreorder .section .init ld $gp, 16($sp) -diff --git a/crt/or1k/crti.s b/crt/or1k/crti.s -index 7e741459..919369ca 100644 --- a/crt/or1k/crti.s +++ b/crt/or1k/crti.s @@ -1,3 +1,4 @@ @@ -178,8 +148,6 @@ index 7e741459..919369ca 100644 .section .init .global _init _init: -diff --git a/crt/or1k/crtn.s b/crt/or1k/crtn.s -index 4185a027..d670b327 100644 --- a/crt/or1k/crtn.s +++ b/crt/or1k/crtn.s @@ -1,3 +1,4 @@ @@ -187,8 +155,6 @@ index 4185a027..d670b327 100644 .section .init l.lwz r9,0(r1) l.jr r9 -diff --git a/crt/powerpc/crti.s b/crt/powerpc/crti.s -index 60461ca4..b748ca48 100644 --- a/crt/powerpc/crti.s +++ b/crt/powerpc/crti.s @@ -1,3 +1,4 @@ @@ -196,8 +162,6 @@ index 60461ca4..b748ca48 100644 .section .init .align 2 .global _init -diff --git a/crt/powerpc/crtn.s b/crt/powerpc/crtn.s -index 2d14a6f0..d989e36f 100644 --- a/crt/powerpc/crtn.s +++ b/crt/powerpc/crtn.s @@ -1,3 +1,4 @@ @@ -205,8 +169,6 @@ index 2d14a6f0..d989e36f 100644 .section .init .align 2 lwz 0,36(1) -diff --git a/crt/powerpc64/crti.s b/crt/powerpc64/crti.s -index 9f712f0e..d3323a67 100644 --- a/crt/powerpc64/crti.s +++ b/crt/powerpc64/crti.s @@ -1,3 +1,4 @@ @@ -214,8 +176,6 @@ index 9f712f0e..d3323a67 100644 .section .init .align 2 .global _init -diff --git a/crt/powerpc64/crtn.s b/crt/powerpc64/crtn.s -index a7a9f4a0..5e71ae66 100644 --- a/crt/powerpc64/crtn.s +++ b/crt/powerpc64/crtn.s @@ -1,3 +1,4 @@ @@ -223,8 +183,6 @@ index a7a9f4a0..5e71ae66 100644 .section .init .align 2 addi 1, 1, 32 -diff --git a/crt/s390x/crti.s b/crt/s390x/crti.s -index f453205b..3da3c5e1 100644 --- a/crt/s390x/crti.s +++ b/crt/s390x/crti.s @@ -1,3 +1,4 @@ @@ -232,8 +190,6 @@ index f453205b..3da3c5e1 100644 .section .init .align 2 .global _init -diff --git a/crt/s390x/crtn.s b/crt/s390x/crtn.s -index 06066dc9..bfd55caf 100644 --- a/crt/s390x/crtn.s +++ b/crt/s390x/crtn.s @@ -1,3 +1,4 @@ @@ -241,8 +197,6 @@ index 06066dc9..bfd55caf 100644 .section .init .align 2 lmg %r14, %r15, 272(%r15) -diff --git a/crt/sh/crti.s b/crt/sh/crti.s -index d99bfd5c..77d61c51 100644 --- a/crt/sh/crti.s +++ b/crt/sh/crti.s @@ -1,3 +1,4 @@ @@ -250,8 +204,6 @@ index d99bfd5c..77d61c51 100644 .section .init .global _init .type _init, @function -diff --git a/crt/sh/crtn.s b/crt/sh/crtn.s -index 958ce951..29deb5be 100644 --- a/crt/sh/crtn.s +++ b/crt/sh/crtn.s @@ -1,3 +1,4 @@ @@ -259,8 +211,6 @@ index 958ce951..29deb5be 100644 .section .init lds.l @r15+, pr mov.l @r15+, r14 -diff --git a/crt/x32/crti.s b/crt/x32/crti.s -index 4788968b..8668b7c7 100644 --- a/crt/x32/crti.s +++ b/crt/x32/crti.s @@ -1,3 +1,4 @@ @@ -268,8 +218,6 @@ index 4788968b..8668b7c7 100644 .section .init .global _init _init: -diff --git a/crt/x32/crtn.s b/crt/x32/crtn.s -index 29198b77..ef73d295 100644 --- a/crt/x32/crtn.s +++ b/crt/x32/crtn.s @@ -1,3 +1,4 @@ @@ -277,8 +225,6 @@ index 29198b77..ef73d295 100644 .section .init pop %rax ret -diff --git a/crt/x86_64/crti.s b/crt/x86_64/crti.s -index 4788968b..8668b7c7 100644 --- a/crt/x86_64/crti.s +++ b/crt/x86_64/crti.s @@ -1,3 +1,4 @@ @@ -286,8 +232,6 @@ index 4788968b..8668b7c7 100644 .section .init .global _init _init: -diff --git a/crt/x86_64/crtn.s b/crt/x86_64/crtn.s -index 29198b77..ef73d295 100644 --- a/crt/x86_64/crtn.s +++ b/crt/x86_64/crtn.s @@ -1,3 +1,4 @@ @@ -295,6 +239,3 @@ index 29198b77..ef73d295 100644 .section .init pop %rax ret --- -2.29.1 - diff --git a/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch index f57aae5f3c..0aeb5eb5c2 100644 --- a/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +++ b/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch @@ -34,16 +34,16 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) --- a/ldso/dynlink.c +++ b/ldso/dynlink.c -@@ -24,6 +24,8 @@ - #include "libc.h" - #include "dynlink.h" +@@ -29,6 +29,8 @@ + #define realloc __libc_realloc + #define free __libc_free +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR + static void error(const char *, ...); #define MAXP2(a,b) (-(-(a)&-(b))) -@@ -1071,7 +1073,7 @@ static struct dso *load_library(const ch +@@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch sys_path = ""; } } diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index 23c2072ea3..d4e75f9185 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "d91a6cf6e369a79587c5665fce9635e5634ca201" +SRCREV = "1e4204d522670a1d8b8ab85f1cfefa960547e8af" BASEVER = "1.2.1" diff --git a/poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch new file mode 100644 index 0000000000..1eb17767a0 --- /dev/null +++ b/poky/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch @@ -0,0 +1,29 @@ +From 3b3e87934bb6d8511261d7c3d6e39b4f71849272 Mon Sep 17 00:00:00 2001 +From: Nathan Rossi <nathan@nathanrossi.com> +Date: Mon, 14 Dec 2020 13:39:02 +1000 +Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc + files + +Including the LDFLAGS in the pkgconfig output is problematic as OE +includes build host specific paths and options (e.g. uninative and +'-Wl,--dynamic-linker='). + +Upstream-Status: Inappropriate [OE Specific] +Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> +--- + misc/gen-pkgconfig.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in +index 8f00b824b9..009d215663 100644 +--- a/misc/gen-pkgconfig.in ++++ b/misc/gen-pkgconfig.in +@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then + fi + + lib_flags= +-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ ++for opt in -L$libdir @LIBS@ + do + case $opt in + -l*) # LIBS is handled specially below diff --git a/poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc index 4b61889668..fe4e8a5d6e 100644 --- a/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/poky/meta/recipes-core/ncurses/ncurses.inc @@ -312,7 +312,7 @@ FILES_${PN}-tools = "\ " # 'reset' is a symlink to 'tset' which is in the 'ncurses' package -RDEPENDS_${PN}-tools = "${PN}" +RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base" FILES_${PN}-terminfo = "\ ${datadir}/terminfo \ diff --git a/poky/meta/recipes-core/ncurses/ncurses_6.2.bb b/poky/meta/recipes-core/ncurses/ncurses_6.2.bb index f3c84c2877..e7d7396a20 100644 --- a/poky/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/poky/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -2,6 +2,7 @@ require ncurses.inc SRC_URI += "file://0001-tic-hang.patch \ file://0002-configure-reproducible.patch \ + file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ " # commit id corresponds to the revision in package version SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" diff --git a/poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb index 04c4449ec2..d785ff6700 100644 --- a/poky/meta/recipes-core/ovmf/ovmf_git.bb +++ b/poky/meta/recipes-core/ovmf/ovmf_git.bb @@ -17,10 +17,10 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-enable-long-path-file.patch \ file://0004-ovmf-Update-to-latest.patch \ - " + " -PV = "edk2-stable202008" -SRCREV = "06dc822d045c2bb42e497487935485302486e151" +PV = "edk2-stable202011" +SRCREV = "872f953262d68a11da7bc2fb3ded16df234b8700" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" inherit deploy diff --git a/poky/meta/recipes-core/psplash/files/psplash-init b/poky/meta/recipes-core/psplash/files/psplash-init index f58e043733..e0f80bcdc0 100755 --- a/poky/meta/recipes-core/psplash/files/psplash-init +++ b/poky/meta/recipes-core/psplash/files/psplash-init @@ -7,6 +7,9 @@ # Default-Stop: ### END INIT INFO +. /etc/default/rcS +export PSPLASH_FIFO_DIR + if [ ! -e /dev/fb0 ]; then echo "Framebuffer /dev/fb0 not detected" echo "Boot splashscreen disabled" @@ -23,7 +26,6 @@ for x in $CMDLINE; do esac done -export PSPLASH_FIFO_DIR=/mnt/.psplash [ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR if ! mountpoint -q $PSPLASH_FIFO_DIR; then mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k diff --git a/poky/meta/recipes-core/psplash/psplash_git.bb b/poky/meta/recipes-core/psplash/psplash_git.bb index 44f0007daf..59e1e3f194 100644 --- a/poky/meta/recipes-core/psplash/psplash_git.bb +++ b/poky/meta/recipes-core/psplash/psplash_git.bb @@ -102,6 +102,10 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + + # make fifo for psplash + install -d ${D}/mnt + mkfifo ${D}/mnt/psplash_fifo fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then @@ -122,3 +126,5 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'pspl INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." + +FILES_${PN} += "/mnt" diff --git a/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch b/poky/meta/recipes-core/readline/readline-8.1/configure-fix.patch index ef3104f8a6..ef3104f8a6 100644 --- a/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch +++ b/poky/meta/recipes-core/readline/readline-8.1/configure-fix.patch diff --git a/poky/meta/recipes-core/readline/readline-8.0/norpath.patch b/poky/meta/recipes-core/readline/readline-8.1/norpath.patch index 5d71582b70..5d71582b70 100644 --- a/poky/meta/recipes-core/readline/readline-8.0/norpath.patch +++ b/poky/meta/recipes-core/readline/readline-8.1/norpath.patch diff --git a/poky/meta/recipes-core/readline/readline-8.0/rl-native.map b/poky/meta/recipes-core/readline/readline-8.1/rl-native.map index 5e7d49cdd2..5e7d49cdd2 100644 --- a/poky/meta/recipes-core/readline/readline-8.0/rl-native.map +++ b/poky/meta/recipes-core/readline/readline-8.1/rl-native.map diff --git a/poky/meta/recipes-core/readline/readline_8.0.bb b/poky/meta/recipes-core/readline/readline_8.0.bb deleted file mode 100644 index 99d022a32f..0000000000 --- a/poky/meta/recipes-core/readline/readline_8.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require readline.inc - -SRC_URI += "file://configure-fix.patch \ - file://norpath.patch" - -SRC_URI[archive.md5sum] = "7e6c1f16aee3244a69aba6e438295ca3" -SRC_URI[archive.sha256sum] = "e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" diff --git a/poky/meta/recipes-core/readline/readline_8.1.bb b/poky/meta/recipes-core/readline/readline_8.1.bb new file mode 100644 index 0000000000..0786a08163 --- /dev/null +++ b/poky/meta/recipes-core/readline/readline_8.1.bb @@ -0,0 +1,7 @@ +require readline.inc + +SRC_URI += "file://configure-fix.patch \ + file://norpath.patch" + +SRC_URI[archive.md5sum] = "e9557dd5b1409f5d7b37ef717c64518e" +SRC_URI[archive.sha256sum] = "f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" diff --git a/poky/meta/recipes-core/systemd/systemd-boot_246.6.bb b/poky/meta/recipes-core/systemd/systemd-boot_247.2.bb index f92c639810..249e620f4e 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_246.6.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_247.2.bb @@ -47,16 +47,14 @@ RDEPENDS_${PN} += "virtual/systemd-bootconf" # Imported from the old gummiboot recipe TUNE_CCARGS_remove = "-mfpmath=sse" -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" + +COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" COMPATIBLE_HOST_x86-x32 = "null" do_compile() { - SYSTEMD_BOOT_EFI_ARCH="ia32" - if [ "${TARGET_ARCH}" = "x86_64" ]; then - SYSTEMD_BOOT_EFI_ARCH="x64" - fi - - ninja src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} + ninja \ + src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} \ + src/boot/efi/linux${EFI_ARCH}.efi.stub } do_install() { @@ -66,5 +64,7 @@ do_install() { do_deploy () { install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR} + install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR} } + addtask deploy before do_build after do_compile diff --git a/poky/meta/recipes-core/systemd/systemd-conf_246.1.bb b/poky/meta/recipes-core/systemd/systemd-conf_247.2.bb index 944b56ff82..944b56ff82 100644 --- a/poky/meta/recipes-core/systemd/systemd-conf_246.1.bb +++ b/poky/meta/recipes-core/systemd/systemd-conf_247.2.bb diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index 1733565fc0..cb7d782b76 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "2ee1c57c4ff4fd3349cf03c2e89fbd18ca0b3a4a" -SRCBRANCH = "v246-stable" +SRCREV = "937118a5b2f27a7913c421ad76893cdda01c5566" +SRCBRANCH = "v247-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 2676c144f2..8dd22eeb7b 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -29,7 +29,7 @@ Index: systemd-stable/units/meson.build =================================================================== --- systemd-stable.orig/units/meson.build +++ systemd-stable/units/meson.build -@@ -54,8 +54,7 @@ units = [ +@@ -55,8 +55,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''], @@ -38,8 +38,8 @@ Index: systemd-stable/units/meson.build + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'], ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', - (with_runlevels ? 'runlevel6.target ctrl-alt-del.target' : 'ctrl-alt-del.target')], -@@ -162,8 +161,7 @@ in_units = [ + 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], +@@ -166,8 +165,7 @@ in_units = [ ['rc-local.service', 'HAVE_SYSV_COMPAT'], ['rescue.service', ''], ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], @@ -64,7 +64,7 @@ Index: systemd-stable/units/systemd-binfmt.service.in =================================================================== --- systemd-stable.orig/units/systemd-binfmt.service.in +++ systemd-stable/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target diff --git a/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch b/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch index 622a4108bb..e49e06672e 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch +++ b/poky/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch @@ -14,8 +14,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in -@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_di - tmpfiles_dir=${prefix}/lib/tmpfiles.d +@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} + tmpfiles_dir=/usr/lib/tmpfiles.d tmpfilesdir=${tmpfiles_dir} -sysusers_dir=${rootprefix}/lib/sysusers.d @@ -34,4 +34,4 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +modules_load_dir=${prefix}/lib/modules-load.d modulesloaddir=${modules_load_dir} - catalog_dir=${prefix}/lib/systemd/catalog + catalog_dir=/usr/lib/systemd/catalog diff --git a/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index 30fe9a14df..d856bcb583 100644 --- a/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 3eb12a6ba0bce149717eaabeb1505d379b3d705a Mon Sep 17 00:00:00 2001 +From 66ece0b870b3a34fdabc48b88437e6cc354e9fce Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH] don't use glibc-specific qsort_r +Subject: [PATCH 02/26] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,18 +10,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [Rebased for v242] Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- src/basic/sort-util.h | 14 ------------ src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- src/shared/format-table.c | 36 ++++++++++++++++++++---------- 3 files changed, 38 insertions(+), 31 deletions(-) -Index: systemd-stable/src/basic/sort-util.h -=================================================================== ---- systemd-stable.orig/src/basic/sort-util.h -+++ systemd-stable/src/basic/sort-util.h -@@ -54,17 +54,3 @@ static inline void _qsort_safe(void *bas +diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h +index 1d194a1f04..3394c9eb72 100644 +--- a/src/basic/sort-util.h ++++ b/src/basic/sort-util.h +@@ -54,17 +54,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ }) @@ -39,11 +40,11 @@ Index: systemd-stable/src/basic/sort-util.h - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) -Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-hwdb/hwdb-util.c -+++ systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c -@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) +diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c +index 4c94ba9c88..95495dba6d 100644 +--- a/src/libsystemd/sd-hwdb/hwdb-util.c ++++ b/src/libsystemd/sd-hwdb/hwdb-util.c +@@ -126,9 +126,13 @@ static void trie_free(struct trie *trie) { DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); @@ -60,7 +61,7 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c } static int trie_node_add_value(struct trie *trie, struct trie_node *node, -@@ -158,7 +162,10 @@ static int trie_node_add_value(struct tr +@@ -156,7 +160,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .value_off = v, }; @@ -72,7 +73,7 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c if (val) { /* At this point we have 2 identical properties on the same match-string. * Since we process files in order, we just replace the previous value. */ -@@ -184,7 +191,9 @@ static int trie_node_add_value(struct tr +@@ -182,7 +189,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .line_number = line_number, }; node->values_count++; @@ -83,11 +84,11 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c return 0; } -Index: systemd-stable/src/shared/format-table.c -=================================================================== ---- systemd-stable.orig/src/shared/format-table.c -+++ systemd-stable/src/shared/format-table.c -@@ -1246,31 +1246,33 @@ static int cell_data_compare(TableData * +diff --git a/src/shared/format-table.c b/src/shared/format-table.c +index a13a198b7a..bce10bc607 100644 +--- a/src/shared/format-table.c ++++ b/src/shared/format-table.c +@@ -1243,30 +1243,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -95,7 +96,6 @@ Index: systemd-stable/src/shared/format-table.c +static Table *user_table; +static int table_data_compare(const void *x, const void *y) { + const size_t *a = x, *b=y; - size_t i; int r; - assert(t); @@ -115,8 +115,8 @@ Index: systemd-stable/src/shared/format-table.c return 1; /* Order other lines by the sorting map */ -- for (i = 0; i < t->n_sort_map; i++) { -+ for (i = 0; i < user_table->n_sort_map; i++) { +- for (size_t i = 0; i < t->n_sort_map; i++) { ++ for (size_t i = 0; i < user_table->n_sort_map; i++) { TableData *d, *dd; - d = t->data[*a + t->sort_map[i]]; @@ -131,8 +131,8 @@ Index: systemd-stable/src/shared/format-table.c } /* Order identical lines by the order there were originally added in */ -@@ -1798,7 +1800,12 @@ int table_print(Table *t, FILE *f) { - for (i = 0; i < n_rows; i++) +@@ -1844,7 +1846,12 @@ int table_print(Table *t, FILE *f) { + for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); @@ -145,8 +145,8 @@ Index: systemd-stable/src/shared/format-table.c } if (t->display_map) -@@ -2375,7 +2382,12 @@ int table_to_json(Table *t, JsonVariant - for (i = 0; i < n_rows; i++) +@@ -2440,7 +2447,12 @@ int table_to_json(Table *t, JsonVariant **ret) { + for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); @@ -159,3 +159,6 @@ Index: systemd-stable/src/shared/format-table.c } if (t->display_map) +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 1404895143..f43a22aa8b 100644 --- a/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,7 +1,7 @@ -From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 +From 9f0d5996bbb2db3679a4075fa8301750b786c03b Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH 03/26] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. @@ -13,7 +13,6 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [Rebased for v242] Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - --- src/basic/missing_type.h | 9 +++++++++ src/basic/sort-util.h | 1 + @@ -22,7 +21,7 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 4 files changed, 12 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b46..c487e65e7bde 100644 +index f6233090a9..aeaf6ad5ec 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -39,7 +38,7 @@ index bf8a6caa1b46..c487e65e7bde 100644 +typedef int (*__compar_fn_t)(const void *, const void *); +#endif diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index 27d68b341cf3..307ea4ac0e8e 100644 +index 3394c9eb72..d9cb2aecb6 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ @@ -51,7 +50,7 @@ index 27d68b341cf3..307ea4ac0e8e 100644 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *arg); diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index 128674327362..09ccd613e32c 100644 +index 8a7f82812a..a56f12f47f 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -10,6 +10,7 @@ @@ -63,7 +62,7 @@ index 128674327362..09ccd613e32c 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 70b2c8b46c4e..d574a64586f1 100644 +index 0f6ad8a29e..4e1077ade4 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -28,6 +28,7 @@ @@ -74,3 +73,6 @@ index 70b2c8b46c4e..d574a64586f1 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index e65c543614..bdd64a0252 100644 --- a/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 8af168cefca01f8f2da336f1c82620c284dc74f2 Mon Sep 17 00:00:00 2001 +From f3dbe29f7620a063af4d8eb3ea7c48ecd410200d Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH] add fallback parse_printf_format implementation +Subject: [PATCH 04/26] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,7 +10,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- meson.build | 1 + src/basic/meson.build | 5 + @@ -22,11 +21,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> create mode 100644 src/basic/parse-printf-format.c create mode 100644 src/basic/parse-printf-format.h -Index: systemd-stable/meson.build -=================================================================== ---- systemd-stable.orig/meson.build -+++ systemd-stable/meson.build -@@ -638,6 +638,7 @@ endif +diff --git a/meson.build b/meson.build +index f406d595e6..6aa47fc755 100644 +--- a/meson.build ++++ b/meson.build +@@ -646,6 +646,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,11 +33,11 @@ Index: systemd-stable/meson.build 'sys/auxv.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', -Index: systemd-stable/src/basic/meson.build -=================================================================== ---- systemd-stable.orig/src/basic/meson.build -+++ systemd-stable/src/basic/meson.build -@@ -317,6 +317,11 @@ foreach item : [['af', af_list_txt, +diff --git a/src/basic/meson.build b/src/basic/meson.build +index 1183ea83ad..aa5c958850 100644 +--- a/src/basic/meson.build ++++ b/src/basic/meson.build +@@ -322,6 +322,11 @@ foreach item : [['af', af_list_txt, 'af', ''], endforeach basic_sources += generated_gperf_headers @@ -50,10 +49,11 @@ Index: systemd-stable/src/basic/meson.build basic_gcrypt_sources = files( 'gcrypt-util.c', 'gcrypt-util.h') -Index: systemd-stable/src/basic/parse-printf-format.c -=================================================================== +diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c +new file mode 100644 +index 0000000000..49437e5445 --- /dev/null -+++ systemd-stable/src/basic/parse-printf-format.c ++++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -328,10 +328,11 @@ Index: systemd-stable/src/basic/parse-printf-format.c + + return last; +} -Index: systemd-stable/src/basic/parse-printf-format.h -=================================================================== +diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h +new file mode 100644 +index 0000000000..47be7522d7 --- /dev/null -+++ systemd-stable/src/basic/parse-printf-format.h ++++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -390,12 +391,12 @@ Index: systemd-stable/src/basic/parse-printf-format.h +size_t parse_printf_format(const char *fmt, size_t n, int *types); + +#endif /* HAVE_PRINTF_H */ -Index: systemd-stable/src/basic/stdio-util.h -=================================================================== ---- systemd-stable.orig/src/basic/stdio-util.h -+++ systemd-stable/src/basic/stdio-util.h +diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h +index 6dc1e72312..cea76b36cf 100644 +--- a/src/basic/stdio-util.h ++++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include <printf.h> @@ -409,10 +410,10 @@ Index: systemd-stable/src/basic/stdio-util.h #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) -Index: systemd-stable/src/journal/journal-send.c -=================================================================== ---- systemd-stable.orig/src/journal/journal-send.c -+++ systemd-stable/src/journal/journal-send.c +diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c +index fd3fd7ef9c..e8e6ad555b 100644 +--- a/src/journal/journal-send.c ++++ b/src/journal/journal-send.c @@ -2,7 +2,6 @@ #include <errno.h> @@ -429,3 +430,6 @@ Index: systemd-stable/src/journal/journal-send.c #define SNDBUF_SIZE (8*1024*1024) +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 8e7a2fb6e4..154e57b540 100644 --- a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 7e771de87cf728a8678f1f28f391bba3589e2496 Mon Sep 17 00:00:00 2001 +From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH] src/basic/missing.h: check for missing strndupa +Subject: [PATCH 05/26] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -15,7 +15,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> [rebased for systemd 244] - +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- meson.build | 1 + src/backlight/backlight.c | 1 + @@ -70,31 +71,31 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 50 files changed, 61 insertions(+) diff --git a/meson.build b/meson.build -index 9187439bdd..bea9935a91 100644 +index 6aa47fc755..0d0fa4963c 100644 --- a/meson.build +++ b/meson.build -@@ -527,6 +527,7 @@ foreach ident : [ - #include <unistd.h> - #include <signal.h> +@@ -535,6 +535,7 @@ foreach ident : [ #include <sys/wait.h>'''], + ['mallinfo', '''#include <malloc.h>'''], + ['close_range', '''#include <unistd.h>'''], + ['strndupa' , '''#include <string.h>'''], ] have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index 3a644363e1..73946a829b 100644 +index d1b6a81e33..38b7008371 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c -@@ -17,6 +17,7 @@ +@@ -19,6 +19,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" +#include "missing_stdlib.h" - static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { - const char *subsystem, *sysname, *value; + static int help(void) { + _cleanup_free_ char *link = NULL; diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index e94fcfad02..856a7068b0 100644 +index f28bf1866a..bb960f183c 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -106,7 +107,7 @@ index e94fcfad02..856a7068b0 100644 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index b8dc98915f..5049b37594 100644 +index a84863ff22..d4f5d57231 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -15,6 +15,7 @@ @@ -115,13 +116,13 @@ index b8dc98915f..5049b37594 100644 #include "utf8.h" +#include "missing_stdlib.h" - #define VALID_CHARS_ENV_NAME \ - DIGITS LETTERS \ + /* We follow bash for the character set. Different shells have different rules. */ + #define VALID_BASH_ENV_NAME_CHARS \ diff --git a/src/basic/log.c b/src/basic/log.c -index c6fe203808..b7ef932d28 100644 +index d4054cf46a..b608863e45 100644 --- a/src/basic/log.c +++ b/src/basic/log.c -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include "terminal-util.h" #include "time-util.h" #include "utf8.h" @@ -130,7 +131,7 @@ index c6fe203808..b7ef932d28 100644 #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 +index 8c76f93eb2..9068bfb4f0 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -150,10 +151,10 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6ebc2b95fd..88f4359bab 100644 +index f91f8f7a08..fb31596216 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -13,6 +13,7 @@ +@@ -14,6 +14,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" @@ -162,10 +163,10 @@ index 6ebc2b95fd..88f4359bab 100644 int mkdir_safe_internal( const char *path, diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 44f0438cf4..54b4133343 100644 +index 5d4dafe3a5..70749750d4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -19,6 +19,7 @@ +@@ -22,6 +22,7 @@ #include "stat-util.h" #include "string-util.h" #include "strv.h" @@ -174,7 +175,7 @@ index 44f0438cf4..54b4133343 100644 int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 52968dee34..2f4f7e3dcd 100644 +index 96b82170d0..71342b46af 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -15,6 +15,7 @@ @@ -186,7 +187,7 @@ index 52968dee34..2f4f7e3dcd 100644 int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index ba47ca5812..8baf728fde 100644 +index 0b6fb137bd..e8e8c7b270 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ @@ -198,7 +199,7 @@ index ba47ca5812..8baf728fde 100644 int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..da7e836f14 100644 +index ccab71f7d2..8f9eee8d36 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ @@ -210,7 +211,7 @@ index 7aaf95bfce..da7e836f14 100644 int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c -index c94ee26bd9..14e35b4653 100644 +index 4989f4f37c..ca00bf99d8 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -27,6 +27,7 @@ @@ -222,10 +223,10 @@ index c94ee26bd9..14e35b4653 100644 #if HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 15cc1b8851..02bb3f01f9 100644 +index 5318d6378d..23c2f77675 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" @@ -234,7 +235,7 @@ index 15cc1b8851..02bb3f01f9 100644 static clockid_t map_clock_id(clockid_t c) { diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c -index b96e1f927f..cba979baca 100644 +index cd34f88bb9..3a77b6f2ca 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -18,6 +18,7 @@ @@ -246,10 +247,10 @@ index b96e1f927f..cba979baca 100644 static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index b7d2e32639..fdbc1df95e 100644 +index 37c581fb22..e02789d689 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c -@@ -15,6 +15,7 @@ +@@ -16,6 +16,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" @@ -258,7 +259,7 @@ index b7d2e32639..fdbc1df95e 100644 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 50f7ada8ce..5c760ee487 100644 +index abe009c395..0451e58d1c 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -41,6 +41,7 @@ @@ -270,7 +271,7 @@ index 50f7ada8ce..5c760ee487 100644 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 951450e53d..50d134e9a1 100644 +index d6223db305..3654c344ee 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ @@ -282,10 +283,10 @@ index 951450e53d..50d134e9a1 100644 int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c -index 2a4840a3a9..d3f1e0e0f8 100644 +index c992b8d5d3..89632e0582 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -89,6 +89,7 @@ +@@ -96,6 +96,7 @@ #include "unit.h" #include "user-util.h" #include "utmp-wtmp.h" @@ -294,7 +295,7 @@ index 2a4840a3a9..d3f1e0e0f8 100644 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index 09ccd613e3..f4e64fa283 100644 +index a56f12f47f..6b8729ef67 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ @@ -306,7 +307,7 @@ index 09ccd613e3..f4e64fa283 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 00e61945ba..1ecab28354 100644 +index d7bdeb7cca..bfd483b2c0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -41,6 +41,7 @@ @@ -318,7 +319,7 @@ index 00e61945ba..1ecab28354 100644 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c -index 35885dfb47..bb9f0660a6 100644 +index 30c67ffe7c..595bc30726 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -16,6 +16,7 @@ @@ -330,7 +331,7 @@ index 35885dfb47..bb9f0660a6 100644 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index 77dfdefd64..e21ecbeff8 100644 +index d2aa1815c2..a851aa203f 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -22,6 +22,7 @@ @@ -342,10 +343,10 @@ index 77dfdefd64..e21ecbeff8 100644 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 8d4897b942..15476b3c83 100644 +index bcf2e01d5c..5394d1dc01 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -69,6 +69,7 @@ +@@ -73,6 +73,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" @@ -354,7 +355,7 @@ index 8d4897b942..15476b3c83 100644 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 6fb0abb419..2d94d9938e 100644 +index cb1ab88ca5..7f35759540 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -40,6 +40,7 @@ @@ -366,7 +367,7 @@ index 6fb0abb419..2d94d9938e 100644 #define JOURNAL_FILES_MAX 7168 diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index 55e35cd902..0ed98f9224 100644 +index 86ff5bdfa2..3fd053a358 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ @@ -378,7 +379,7 @@ index 55e35cd902..0ed98f9224 100644 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index 6abac8822c..c74c9cd7fa 100644 +index 275c4318a1..5ffee59d17 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ @@ -390,7 +391,7 @@ index 6abac8822c..c74c9cd7fa 100644 static int node_vtable_get_userdata( sd_bus *bus, diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index fc7e8e844a..7af4dd2712 100644 +index 4881fd0d32..c865f1133b 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -28,6 +28,7 @@ @@ -402,7 +403,7 @@ index fc7e8e844a..7af4dd2712 100644 #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c -index 9de5e454a6..fe86c93c63 100644 +index b8d4dc8d95..a8bac2665d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -41,6 +41,7 @@ @@ -414,7 +415,7 @@ index 9de5e454a6..fe86c93c63 100644 #define log_debug_bus_message(m) \ do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..58044b6ba9 100644 +index 8c6711797a..fac178823a 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ @@ -426,7 +427,7 @@ index 8de0a859ee..58044b6ba9 100644 #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index 233d081300..40a32b9700 100644 +index cb8153f4fe..d52a56019d 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -21,6 +21,7 @@ @@ -438,7 +439,7 @@ index 233d081300..40a32b9700 100644 static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 16f4289585..6c5e438b36 100644 +index 8e7a94db55..b5c368c6d1 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -31,6 +31,7 @@ @@ -450,7 +451,7 @@ index 16f4289585..6c5e438b36 100644 #include "parse-util.h" #include "path-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index bed1e42697..e4847c2bee 100644 +index 2fa21a067a..2e9995aa62 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ @@ -462,7 +463,7 @@ index bed1e42697..e4847c2bee 100644 /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index d341fa25aa..91646bc2c2 100644 +index 92bb5120ab..eeca905c75 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ @@ -474,7 +475,7 @@ index d341fa25aa..91646bc2c2 100644 Settings *settings_new(void) { Settings *s; diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c -index 5db0dcef76..681f8677e4 100644 +index 53f0492116..c71941fdd7 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -19,6 +19,7 @@ @@ -486,7 +487,7 @@ index 5db0dcef76..681f8677e4 100644 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); NSS_GETPW_PROTOTYPES(mymachines); diff --git a/src/portable/portable.c b/src/portable/portable.c -index 3a1367ec2b..f29336cb1e 100644 +index ed7eac0291..78986977f8 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -31,6 +31,7 @@ @@ -498,31 +499,31 @@ index 3a1367ec2b..f29336cb1e 100644 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c -index 3072b984e5..c46ae374bf 100644 +index b479335769..212d0bed20 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c -@@ -36,6 +36,7 @@ - #include "strv.h" +@@ -37,6 +37,7 @@ #include "terminal-util.h" + #include "utf8.h" #include "verbs.h" +#include "missing_stdlib.h" static int arg_family = AF_UNSPEC; static int arg_ifindex = 0; diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c -index 8ad4694046..da5082c02a 100644 +index 32f68d5e6a..bda1e1ef4f 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c -@@ -3,6 +3,7 @@ - #include "bus-get-properties.h" +@@ -4,6 +4,7 @@ #include "rlimit-util.h" + #include "stdio-util.h" #include "string-util.h" +#include "missing_stdlib.h" int bus_property_get_bool( sd_bus *bus, diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c -index b21fe39326..af2640005c 100644 +index 3e97be9671..2b8ca838f7 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -10,6 +10,7 @@ @@ -534,10 +535,10 @@ index b21fe39326..af2640005c 100644 struct CGroupInfo { char *cgroup_path; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index f2652ed9a5..eb019fc89f 100644 +index 2bab2299fb..62afdc7973 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c -@@ -39,6 +39,7 @@ +@@ -44,6 +44,7 @@ #include "unit-def.h" #include "user-util.h" #include "utf8.h" @@ -546,22 +547,22 @@ index f2652ed9a5..eb019fc89f 100644 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c -index 77c1c62182..5cd31f3c15 100644 +index fbda218b3b..aae0be75c6 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ + #include "path-util.h" #include "socket-util.h" #include "stdio-util.h" - /* #include "string-util.h" */ +#include "missing_stdlib.h" static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index b812665315..8e68f7f8fc 100644 +index 8bd1e3a6ac..f8d6eab9bd 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -23,6 +23,7 @@ +@@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" @@ -570,7 +571,7 @@ index b812665315..8e68f7f8fc 100644 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..3fbaf5a639 100644 +index e95b638f4d..a1bf15baa8 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ @@ -582,7 +583,7 @@ index 7c4fc7021d..3fbaf5a639 100644 enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index 899e894ab7..628854ac9c 100644 +index bf574d32a5..a09c79d2fb 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -594,10 +595,10 @@ index 899e894ab7..628854ac9c 100644 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/pager.c b/src/shared/pager.c -index e03be6d23b..50e3d1f75c 100644 +index f689d9f28f..aae3957c2f 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -23,6 +23,7 @@ +@@ -26,6 +26,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" @@ -606,7 +607,7 @@ index e03be6d23b..50e3d1f75c 100644 static pid_t pager_pid = 0; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8e7d7f9e7c 100644 +index 5d5bf7f21d..f1002ffa6c 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ @@ -618,7 +619,7 @@ index 7cb7d8a477..8e7d7f9e7c 100644 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index b461aead60..9941695ed9 100644 +index 4391d9f1f5..9b73cd0aeb 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -26,6 +26,7 @@ @@ -630,7 +631,7 @@ index b461aead60..9941695ed9 100644 #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..70708dedf3 100644 +index f0f9679769..128fc164da 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ @@ -642,7 +643,7 @@ index 52217429b1..70708dedf3 100644 static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 6c020ac0ed..10723ec46c 100644 +index 0da59e2c75..66da3741ee 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -22,6 +22,7 @@ @@ -654,7 +655,7 @@ index 6c020ac0ed..10723ec46c 100644 _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index e1c2baf7f2..62d4086802 100644 +index 5159d19a38..0ed5b65844 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -34,6 +34,7 @@ @@ -666,7 +667,7 @@ index e1c2baf7f2..62d4086802 100644 typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index c36f032f66..36970813d8 100644 +index ef6a0c112c..422fc19127 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -30,6 +30,7 @@ @@ -677,3 +678,6 @@ index c36f032f66..36970813d8 100644 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index abc438e4ba..b689cf1297 100644 --- a/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,7 +1,7 @@ -From 47818052121d135632f5e46c369e3e4706a0f9e0 Mon Sep 17 00:00:00 2001 +From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 26 Oct 2017 22:10:42 -0700 -Subject: [PATCH] Include netinet/if_ether.h +Subject: [PATCH 06/26] Include netinet/if_ether.h Fixes /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' @@ -29,7 +29,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> - +[rebased for systemd 247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-netlink/netlink-types.c | 1 + @@ -52,10 +53,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> src/udev/udev-builtin-net_setup_link.c | 1 + 19 files changed, 18 insertions(+), 4 deletions(-) -Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c -=================================================================== ---- systemd-stable.orig/src/libsystemd-network/sd-dhcp6-client.c -+++ systemd-stable/src/libsystemd-network/sd-dhcp6-client.c +diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c +index 30ac526fc9..126077e13c 100644 +--- a/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,6 @@ #include <errno.h> @@ -64,10 +65,10 @@ Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c #include <linux/if_infiniband.h> #include "sd-dhcp6-client.h" -Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-netlink/netlink-types.c -+++ systemd-stable/src/libsystemd/sd-netlink/netlink-types.c +diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c +index 6fb6c147d9..8eda02d202 100644 +--- a/src/libsystemd/sd-netlink/netlink-types.c ++++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ #include <netinet/in.h> #include <stdint.h> @@ -76,10 +77,10 @@ Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c #include <linux/can/vxcan.h> #include <linux/netlink.h> #include <linux/rtnetlink.h> -Index: systemd-stable/src/machine/machine-dbus.c -=================================================================== ---- systemd-stable.orig/src/machine/machine-dbus.c -+++ systemd-stable/src/machine/machine-dbus.c +diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c +index bb67beb665..f5780f1aec 100644 +--- a/src/machine/machine-dbus.c ++++ b/src/machine/machine-dbus.c @@ -3,6 +3,7 @@ #include <errno.h> #include <sys/mount.h> @@ -88,66 +89,66 @@ Index: systemd-stable/src/machine/machine-dbus.c /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX -Index: systemd-stable/src/network/netdev/bond.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/bond.c -+++ systemd-stable/src/network/netdev/bond.c +diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c +index e27f36067b..8868f1da5d 100644 +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include "alloc-util.h" #include "bond.h" #include "bond-util.h" -Index: systemd-stable/src/network/netdev/bridge.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/bridge.c -+++ systemd-stable/src/network/netdev/bridge.c +diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c +index 1f59cd8b42..5fdbae7e99 100644 +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <net/if.h> #include "bridge.h" -Index: systemd-stable/src/network/netdev/macsec.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/macsec.c -+++ systemd-stable/src/network/netdev/macsec.c +diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c +index 82e71c3920..fbae86e216 100644 +--- a/src/network/netdev/macsec.c ++++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <netinet/in.h> #include <linux/if_ether.h> #include <linux/if_macsec.h> -Index: systemd-stable/src/network/netdev/netdev-gperf.gperf -=================================================================== ---- systemd-stable.orig/src/network/netdev/netdev-gperf.gperf -+++ systemd-stable/src/network/netdev/netdev-gperf.gperf +diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf +index 4e89761f2c..91251fa6ec 100644 +--- a/src/network/netdev/netdev-gperf.gperf ++++ b/src/network/netdev/netdev-gperf.gperf @@ -2,6 +2,7 @@ #if __GNUC__ >= 7 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") #endif +#include <netinet/if_ether.h> #include <stddef.h> + #include "bareudp.h" #include "bond.h" - #include "bridge.h" -Index: systemd-stable/src/network/netdev/netdev.c -=================================================================== ---- systemd-stable.orig/src/network/netdev/netdev.c -+++ systemd-stable/src/network/netdev/netdev.c +diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c +index 9f390b5781..62aeafb1e4 100644 +--- a/src/network/netdev/netdev.c ++++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <net/if.h> #include <netinet/in.h> #include <unistd.h> -Index: systemd-stable/src/network/networkd-brvlan.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-brvlan.c -+++ systemd-stable/src/network/networkd-brvlan.c +diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c +index e53c73c30c..9bf0771b84 100644 +--- a/src/network/networkd-brvlan.c ++++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ ***/ @@ -156,24 +157,49 @@ Index: systemd-stable/src/network/networkd-brvlan.c #include <linux/if_bridge.h> #include <stdbool.h> -Index: systemd-stable/src/network/networkd-dhcp-common.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-dhcp-common.c -+++ systemd-stable/src/network/networkd-dhcp-common.c -@@ -5,6 +5,7 @@ - #include "escape.h" - #include "in-addr-util.h" +diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c +index c338c775a7..ab35d65c53 100644 +--- a/src/network/networkd-dhcp-common.c ++++ b/src/network/networkd-dhcp-common.c +@@ -1,7 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> ++#include <net/if_arp.h> ++#include <net/if.h> + + #include "dhcp-internal.h" + #include "dhcp6-internal.h" +@@ -10,6 +10,7 @@ #include "networkd-dhcp-common.h" + #include "networkd-link.h" + #include "networkd-manager.h" +#include <netinet/if_ether.h> #include "networkd-network.h" #include "parse-util.h" - #include "string-table.h" -Index: systemd-stable/src/network/networkd-dhcp4.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-dhcp4.c -+++ systemd-stable/src/network/networkd-dhcp4.c + #include "socket-util.h" +diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c +index cf279c640d..bae541029b 100644 +--- a/src/network/networkd-dhcp-server.c ++++ b/src/network/networkd-dhcp-server.c +@@ -1,8 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <netinet/in.h> +-#include <linux/if_arp.h> +-#include <linux/if.h> ++#include <net/if_arp.h> ++#include <net/if.h> + + #include "sd-dhcp-server.h" + +diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c +index 02d33841b6..a30d8dd82c 100644 +--- a/src/network/networkd-dhcp4.c ++++ b/src/network/networkd-dhcp4.c @@ -1,9 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <netinet/in.h> @@ -183,10 +209,10 @@ Index: systemd-stable/src/network/networkd-dhcp4.c #include "escape.h" #include "alloc-util.h" -Index: systemd-stable/src/network/networkd-dhcp6.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-dhcp6.c -+++ systemd-stable/src/network/networkd-dhcp6.c +diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c +index d4d4182ee5..635d08f7d5 100644 +--- a/src/network/networkd-dhcp6.c ++++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ Copyright © 2014 Intel Corporation. All rights reserved. ***/ @@ -198,12 +224,12 @@ Index: systemd-stable/src/network/networkd-dhcp6.c #include "sd-dhcp6-client.h" -Index: systemd-stable/src/network/networkd-link.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-link.c -+++ systemd-stable/src/network/networkd-link.c +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c +index ced18de425..07b43770de 100644 +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <netinet/in.h> @@ -212,41 +238,59 @@ Index: systemd-stable/src/network/networkd-link.c #include <linux/if_link.h> #include <unistd.h> -Index: systemd-stable/src/network/networkd-network.c -=================================================================== ---- systemd-stable.orig/src/network/networkd-network.c -+++ systemd-stable/src/network/networkd-network.c +diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c +index 3254641461..f0ada419fd 100644 +--- a/src/network/networkd-network.c ++++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <net/if.h> #include <netinet/in.h> #include <linux/netdevice.h> -Index: systemd-stable/src/network/test-network-tables.c -=================================================================== ---- systemd-stable.orig/src/network/test-network-tables.c -+++ systemd-stable/src/network/test-network-tables.c -@@ -1,3 +1,4 @@ +diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c +index 10f30c1a7e..579885726c 100644 +--- a/src/network/networkd-route.c ++++ b/src/network/networkd-route.c +@@ -1,7 +1,10 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include <linux/icmpv6.h> +-#include <linux/ipv6_route.h> ++/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ ++#ifndef IP6_RT_PRIO_USER ++#define IP6_RT_PRIO_USER 1024 ++#endif + + #include "alloc-util.h" + #include "netlink-util.h" +diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c +index 475cac7527..9bae6eda16 100644 +--- a/src/network/test-network-tables.c ++++ b/src/network/test-network-tables.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +#include <netinet/if_ether.h> #include "bond.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" -Index: systemd-stable/src/shared/ethtool-util.c -=================================================================== ---- systemd-stable.orig/src/shared/ethtool-util.c -+++ systemd-stable/src/shared/ethtool-util.c +diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c +index e6fab262f2..41dd3d7df7 100644 +--- a/src/shared/ethtool-util.c ++++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <net/if.h> #include <sys/ioctl.h> #include <linux/ethtool.h> -Index: systemd-stable/src/shared/ethtool-util.h -=================================================================== ---- systemd-stable.orig/src/shared/ethtool-util.h -+++ systemd-stable/src/shared/ethtool-util.h +diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h +index f94b3e15bf..08a7e4fa09 100644 +--- a/src/shared/ethtool-util.h ++++ b/src/shared/ethtool-util.h @@ -3,6 +3,7 @@ #include <macro.h> @@ -255,25 +299,28 @@ Index: systemd-stable/src/shared/ethtool-util.h #include <linux/ethtool.h> #include "conf-parser.h" -Index: systemd-stable/src/udev/net/link-config.c -=================================================================== ---- systemd-stable.orig/src/udev/net/link-config.c -+++ systemd-stable/src/udev/net/link-config.c +diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c +index d12fd0e299..636806dc23 100644 +--- a/src/udev/net/link-config.c ++++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include <linux/netdevice.h> #include <netinet/ether.h> #include <unistd.h> -Index: systemd-stable/src/udev/udev-builtin-net_setup_link.c -=================================================================== ---- systemd-stable.orig/src/udev/udev-builtin-net_setup_link.c -+++ systemd-stable/src/udev/udev-builtin-net_setup_link.c +diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c +index cb12b943fe..5a28c8b563 100644 +--- a/src/udev/udev-builtin-net_setup_link.c ++++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <netinet/if_ether.h> #include "device-util.h" #include "alloc-util.h" #include "link-config.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index dd6ecebeb4..6865421586 100644 --- a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -1,7 +1,8 @@ -From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 +From 87a14dde13c8fa68239a4ab62914a093062b3b29 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined +Subject: [PATCH 07/26] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not + defined If the standard library doesn't provide brace expansion users just won't get it. @@ -16,17 +17,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- src/basic/glob-util.c | 12 ++++++++++++ src/test/test-glob-util.c | 16 ++++++++++++++++ src/tmpfiles/tmpfiles.c | 10 ++++++++++ 3 files changed, 38 insertions(+) -Index: systemd-stable/src/basic/glob-util.c -=================================================================== ---- systemd-stable.orig/src/basic/glob-util.c -+++ systemd-stable/src/basic/glob-util.c +diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c +index bc0278e57f..c973f82e54 100644 +--- a/src/basic/glob-util.c ++++ b/src/basic/glob-util.c @@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" @@ -48,7 +48,7 @@ Index: systemd-stable/src/basic/glob-util.c /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); -@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag +@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; @@ -63,10 +63,10 @@ Index: systemd-stable/src/basic/glob-util.c if (k == GLOB_NOMATCH) return -ENOENT; if (k == GLOB_NOSPACE) -Index: systemd-stable/src/test/test-glob-util.c -=================================================================== ---- systemd-stable.orig/src/test/test-glob-util.c -+++ systemd-stable/src/test/test-glob-util.c +diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c +index df6444c433..79a692046e 100644 +--- a/src/test/test-glob-util.c ++++ b/src/test/test-glob-util.c @@ -12,6 +12,12 @@ #include "rm-rf.h" #include "tmpfile-util.h" @@ -114,11 +114,11 @@ Index: systemd-stable/src/test/test-glob-util.c assert_se(r == GLOB_NOMATCH); (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); -Index: systemd-stable/src/tmpfiles/tmpfiles.c -=================================================================== ---- systemd-stable.orig/src/tmpfiles/tmpfiles.c -+++ systemd-stable/src/tmpfiles/tmpfiles.c -@@ -59,6 +59,12 @@ +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 9906c70eef..5eb63b1d57 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -63,6 +63,12 @@ #include "umask-util.h" #include "user-util.h" @@ -131,7 +131,7 @@ Index: systemd-stable/src/tmpfiles/tmpfiles.c /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1867,7 +1873,9 @@ finish: +@@ -1936,7 +1942,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +141,7 @@ Index: systemd-stable/src/tmpfiles/tmpfiles.c }; int r = 0, k; char **fn; -@@ -1887,7 +1895,9 @@ static int glob_item(Item *i, action_t a +@@ -1956,7 +1964,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { @@ -151,3 +151,6 @@ Index: systemd-stable/src/tmpfiles/tmpfiles.c }; int r = 0, k; char **fn; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 1f618932ea..94cdc2efde 100644 --- a/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 +From 8caea3fe87d55fd16de7d1b8266239fa954cb498 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH] add missing FTW_ macros for musl +Subject: [PATCH 08/26] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,13 +10,12 @@ This is to avoid build failures like below for musl. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/basic/missing_type.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index c487e65e7bde..23602ebbd533 100644 +index aeaf6ad5ec..3df1084ef2 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); @@ -43,3 +42,6 @@ index c487e65e7bde..23602ebbd533 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 15055161fc..76cc75cf6a 100644 --- a/poky/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,20 +1,19 @@ -From eed7427db98cc01db7e9b3479655d68b044bc85b Mon Sep 17 00:00:00 2001 +From d8e4f0aa1760e4c7bb8476beecd35025c9cbb95a Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:03:47 +0800 -Subject: [PATCH] fix missing of __register_atfork for non-glibc builds +Subject: [PATCH 09/26] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/basic/process-util.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: systemd-stable/src/basic/process-util.c -=================================================================== ---- systemd-stable.orig/src/basic/process-util.c -+++ systemd-stable/src/basic/process-util.c +diff --git a/src/basic/process-util.c b/src/basic/process-util.c +index 0851613fc9..4417101569 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c @@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include <valgrind/valgrind.h> @@ -41,3 +40,6 @@ Index: systemd-stable/src/basic/process-util.c pid_t getpid_cached(void) { static bool installed = false; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch index a6fcd2f5da..aeacd865ae 100644 --- a/poky/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From 4aa91347ae975051dbe4dd2f98a1f4f459f2604f Mon Sep 17 00:00:00 2001 +From e45bb02174812e4935214f42a18725be320770d5 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH] Use uintmax_t for handling rlim_t +Subject: [PATCH 10/26] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -20,18 +20,17 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] Signed-off-by: Khem Raj <raj.khem@gmail.com> [Rebased for v241] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/basic/format-util.h | 8 +------- src/basic/rlimit-util.c | 10 +++++----- src/core/execute.c | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) -Index: systemd-stable/src/basic/format-util.h -=================================================================== ---- systemd-stable.orig/src/basic/format-util.h -+++ systemd-stable/src/basic/format-util.h -@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 +diff --git a/src/basic/format-util.h b/src/basic/format-util.h +index b7e18768e3..3195ab205d 100644 +--- a/src/basic/format-util.h ++++ b/src/basic/format-util.h +@@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); # define PRI_TIMEX "li" #endif @@ -46,11 +45,11 @@ Index: systemd-stable/src/basic/format-util.h #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 -Index: systemd-stable/src/basic/rlimit-util.c -=================================================================== ---- systemd-stable.orig/src/basic/rlimit-util.c -+++ systemd-stable/src/basic/rlimit-util.c -@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *r +diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c +index 880976312c..9e1b61cd4a 100644 +--- a/src/basic/rlimit-util.c ++++ b/src/basic/rlimit-util.c +@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) s = strdup("infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) @@ -77,12 +76,12 @@ Index: systemd-stable/src/basic/rlimit-util.c return 1; } -Index: systemd-stable/src/core/execute.c -=================================================================== ---- systemd-stable.orig/src/core/execute.c -+++ systemd-stable/src/core/execute.c -@@ -4686,9 +4686,9 @@ void exec_context_dump(const ExecContext - for (i = 0; i < RLIM_NLIMITS; i++) +diff --git a/src/core/execute.c b/src/core/execute.c +index 89632e0582..335283776c 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -5288,9 +5288,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { + for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); @@ -93,3 +92,6 @@ Index: systemd-stable/src/core/execute.c } if (c->ioprio_set) { +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 049096d2a9..6d7fdbcb64 100644 --- a/poky/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,22 +1,22 @@ -From 62fac5e3ff0fccd329cdc49605258b6d0e573a3e Mon Sep 17 00:00:00 2001 +From d1db531ddd3bbf94d5e764b7917bcc8684ff6357 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 28 Feb 2018 21:25:22 -0800 -Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl +Subject: [PATCH 11/26] test-sizeof.c: Disable tests for missing typedefs in + musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/test/test-sizeof.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 1020e0cb3153..c65062d2562c 100644 +index 3c9dc180fa..e1a59d408c 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c -@@ -44,8 +44,10 @@ int main(void) { +@@ -55,8 +55,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); @@ -27,7 +27,7 @@ index 1020e0cb3153..c65062d2562c 100644 info(float); info(double); -@@ -63,7 +65,9 @@ int main(void) { +@@ -74,7 +76,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); @@ -37,3 +37,6 @@ index 1020e0cb3153..c65062d2562c 100644 info(pid_t); info(uid_t); info(gid_t); +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 0a7594c068..c15b6e7d82 100644 --- a/poky/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 +From 03e89da266edf70121a19ffc32a78cc3b97585ef Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH 12/26] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -25,17 +25,16 @@ just historical and not actually necessary or desired behaviour? Upstream-Status: Inappropriate [musl specific] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> - --- src/basic/fs-util.h | 22 +++++++++++++++++++++- src/shared/base-filesystem.c | 6 +++--- 2 files changed, 24 insertions(+), 4 deletions(-) -Index: systemd-stable/src/basic/fs-util.h -=================================================================== ---- systemd-stable.orig/src/basic/fs-util.h -+++ systemd-stable/src/basic/fs-util.h -@@ -42,7 +42,27 @@ int fchmod_opath(int fd, mode_t m); +diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h +index 5dc8853eac..0491b3dae2 100644 +--- a/src/basic/fs-util.h ++++ b/src/basic/fs-util.h +@@ -43,7 +43,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); int fd_warn_permissions(const char *path, int fd); int stat_warn_permissions(const char *path, const struct stat *st); @@ -64,11 +63,11 @@ Index: systemd-stable/src/basic/fs-util.h int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); -Index: systemd-stable/src/shared/base-filesystem.c -=================================================================== ---- systemd-stable.orig/src/shared/base-filesystem.c -+++ systemd-stable/src/shared/base-filesystem.c -@@ -54,7 +54,7 @@ int base_filesystem_create(const char *r +diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c +index 1d05409086..1ed06c31ab 100644 +--- a/src/shared/base-filesystem.c ++++ b/src/shared/base-filesystem.c +@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); for (i = 0; i < ELEMENTSOF(table); i ++) { @@ -77,7 +76,7 @@ Index: systemd-stable/src/shared/base-filesystem.c continue; if (table[i].target) { -@@ -62,7 +62,7 @@ int base_filesystem_create(const char *r +@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -86,7 +85,7 @@ Index: systemd-stable/src/shared/base-filesystem.c continue; /* check if a specific file exists at the target path */ -@@ -73,7 +73,7 @@ int base_filesystem_create(const char *r +@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); @@ -95,3 +94,6 @@ Index: systemd-stable/src/shared/base-filesystem.c continue; } +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 67d5041917..89736bcfde 100644 --- a/poky/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,7 +1,8 @@ -From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 +From dd134880e9a16595ab473934577e873c748e9c7a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH] Define glibc compatible basename() for non-glibc systems +Subject: [PATCH 13/26] Define glibc compatible basename() for non-glibc + systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -9,15 +10,14 @@ using non-posix basename implementation, we have a way out Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- src/machine/machine-dbus.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: systemd-stable/src/machine/machine-dbus.c -=================================================================== ---- systemd-stable.orig/src/machine/machine-dbus.c -+++ systemd-stable/src/machine/machine-dbus.c +diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c +index f5780f1aec..aec5825b3e 100644 +--- a/src/machine/machine-dbus.c ++++ b/src/machine/machine-dbus.c @@ -11,6 +11,11 @@ #include <libgen.h> #undef basename @@ -30,3 +30,6 @@ Index: systemd-stable/src/machine/machine-dbus.c #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-get-properties.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 3d456ec83a..e95d2ae078 100644 --- a/poky/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From bb28a9c870bb47dcdb1ccebaa8e3a5a86730a244 Mon Sep 17 00:00:00 2001 +From 55af446156da863b5b36a1109845858956a4c274 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH 14/26] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -19,15 +19,14 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- src/basic/process-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: systemd-stable/src/basic/process-util.c -=================================================================== ---- systemd-stable.orig/src/basic/process-util.c -+++ systemd-stable/src/basic/process-util.c +diff --git a/src/basic/process-util.c b/src/basic/process-util.c +index 4417101569..556dab8ebf 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c @@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); @@ -37,3 +36,6 @@ Index: systemd-stable/src/basic/process-util.c } int pidfd_get_pid(int fd, pid_t *ret) { +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 48fd007e11..5cdcf84dc1 100644 --- a/poky/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 +From e382845aed90cfe4496a8351d57d4466dd2e9a9c Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH 15/26] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -18,17 +18,16 @@ assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/journal/journal-send.c | 5 +++++ src/libsystemd/sd-bus/bus-error.c | 5 +++++ 2 files changed, 10 insertions(+) -Index: systemd-stable/src/journal/journal-send.c -=================================================================== ---- systemd-stable.orig/src/journal/journal-send.c -+++ systemd-stable/src/journal/journal-send.c -@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(co +diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c +index e8e6ad555b..8ca5271d02 100644 +--- a/src/journal/journal-send.c ++++ b/src/journal/journal-send.c +@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; @@ -41,11 +40,11 @@ Index: systemd-stable/src/journal/journal-send.c if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; -Index: systemd-stable/src/libsystemd/sd-bus/bus-error.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-bus/bus-error.c -+++ systemd-stable/src/libsystemd/sd-bus/bus-error.c -@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_er +diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c +index 8da2024a50..9605a9b869 100644 +--- a/src/libsystemd/sd-bus/bus-error.c ++++ b/src/libsystemd/sd-bus/bus-error.c +@@ -392,7 +392,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0; @@ -58,3 +57,6 @@ Index: systemd-stable/src/libsystemd/sd-bus/bus-error.c if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 3b8064677f..9a125de638 100644 --- a/poky/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,7 +1,7 @@ -From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 +From 0c7af5f288231a8c0545e169e01ba5ee173cafe7 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP +Subject: [PATCH 16/26] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP for currently unknown reasons they get exported to the shared libries even without being listed in the sym file @@ -11,16 +11,15 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> [Rebased for v241] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/libsystemd/sd-bus/bus-error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 28a5159c4480..962a4de10c56 100644 +index 9605a9b869..38b6cf90c3 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { +@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { }; /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ @@ -31,3 +30,6 @@ index 28a5159c4480..962a4de10c56 100644 /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch index db4041bbb1..31747c6b40 100644 --- a/poky/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,7 +1,7 @@ -From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 +From 32dd7a47b87793cd836ab4bb776d1524f24c2d58 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition +Subject: [PATCH 17/26] missing_type.h: add __compar_d_fn_t definition Fix the following compile failure: src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? @@ -9,13 +9,12 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/basic/missing_type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 23602ebbd533..917d314a81bf 100644 +index 3df1084ef2..697aa7f58a 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -13,6 +13,7 @@ @@ -26,3 +25,6 @@ index 23602ebbd533..917d314a81bf 100644 #endif #ifndef __COMPAR_FN_T +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch index 7dacc36837..56d361a213 100644 --- a/poky/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 +From bfc3416edeb69082ac9b9c9e844f12d7b45bb006 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH] avoid redefinition of prctl_mm_map structure +Subject: [PATCH 18/26] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -9,17 +9,16 @@ error: redefinition of 'struct prctl_mm_map' Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/basic/missing_prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index f80cd17f346b..47e489354053 100644 +index ab851306ba..5547cad875 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#ifdef __GLIBC__ @@ -28,3 +27,6 @@ index f80cd17f346b..47e489354053 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch b/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch index 67d9162c08..6ca196489b 100644 --- a/poky/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch +++ b/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch @@ -1,7 +1,7 @@ -From 190854c2114dc6e74c8859dc251e3737e3c0f353 Mon Sep 17 00:00:00 2001 +From e427f03de2c56e868bb0f24aa231315b2dae1b71 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Fri, 7 Aug 2020 15:19:27 +0000 -Subject: [PATCH] Handle missing LOCK_EX +Subject: [PATCH 19/26] Handle missing LOCK_EX Upstream-Status: Inappropriate [musl specific] Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> @@ -10,10 +10,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 1 file changed, 1 insertion(+) diff --git a/src/partition/makefs.c b/src/partition/makefs.c -index 97f50c9033..7f55acd229 100644 +index fd924d2231..b97580fdcc 100644 --- a/src/partition/makefs.c +++ b/src/partition/makefs.c -@@ -5,6 +5,7 @@ +@@ -6,6 +6,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> @@ -21,3 +21,6 @@ index 97f50c9033..7f55acd229 100644 #include "alloc-util.h" #include "blockdev-util.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch index d57ca1fd39..f74de43849 100644 --- a/poky/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ b/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch @@ -1,7 +1,7 @@ -From 328c39fae2631deb5737dd56f46159dd6b4cdbed Mon Sep 17 00:00:00 2001 +From 9abbc5e69e21aef0d4d4567e69302fa660b76c53 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Fri, 7 Aug 2020 15:20:17 +0000 -Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * +Subject: [PATCH 20/26] Fix incompatible pointer type struct sockaddr_un * | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] @@ -23,10 +23,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 0450c9f795..7305db04ef 100644 +index 0842731c18..3528b7ff14 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -4890,7 +4890,7 @@ static int cant_be_in_netns(void) { +@@ -5084,7 +5084,7 @@ static int cant_be_in_netns(void) { if (fd < 0) return log_error_errno(errno, "Failed to allocate udev control socket: %m"); @@ -35,3 +35,6 @@ index 0450c9f795..7305db04ef 100644 if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch index 80beada3d3..fa6652a5bf 100644 --- a/poky/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch @@ -1,7 +1,7 @@ -From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 +From 1f5bc54bed0b365e7e448c26f6c792dbe8b3b198 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 16:53:06 +0800 -Subject: [PATCH] test-json.c: define M_PIl +Subject: [PATCH 21/26] test-json.c: define M_PIl Fix the following compile failure: src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? @@ -9,16 +9,15 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- src/test/test-json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-json.c b/src/test/test-json.c -index a6613043b924..ca823ea79f05 100644 +index 1d4b11945e..572c8cf9d0 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c -@@ -12,6 +12,10 @@ +@@ -13,6 +13,10 @@ #include "tests.h" #include "util.h" @@ -29,3 +28,6 @@ index a6613043b924..ca823ea79f05 100644 static void test_tokenizer(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch index 39a975319b..675fd20f11 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch @@ -1,7 +1,7 @@ -From f92fd7e77ed5aab2dda01a20e6891c37f09415d3 Mon Sep 17 00:00:00 2001 +From 564dba5ad0cd884e3f69fa19ca64095413578ea5 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Fri, 1 Mar 2019 15:22:15 +0800 -Subject: [PATCH] do not disable buffer in writing files +Subject: [PATCH 22/26] do not disable buffer in writing files Do not disable buffer in writing files, otherwise we get failure at boot for musl like below. @@ -18,7 +18,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Andrej Valek <andrej.valek@siemens.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- @@ -40,11 +39,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> src/vconsole/vconsole-setup.c | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) -Index: systemd-stable/src/basic/cgroup-util.c -=================================================================== ---- systemd-stable.orig/src/basic/cgroup-util.c -+++ systemd-stable/src/basic/cgroup-util.c -@@ -769,7 +769,7 @@ int cg_install_release_agent(const char +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index bb960f183c..cb804c5f4b 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -759,7 +759,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -53,7 +52,7 @@ Index: systemd-stable/src/basic/cgroup-util.c if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -787,7 +787,7 @@ int cg_install_release_agent(const char +@@ -777,7 +777,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -62,7 +61,7 @@ Index: systemd-stable/src/basic/cgroup-util.c if (r < 0) return r; -@@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const cha +@@ -804,7 +804,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -71,7 +70,7 @@ Index: systemd-stable/src/basic/cgroup-util.c if (r < 0) return r; -@@ -824,7 +824,7 @@ int cg_uninstall_release_agent(const cha +@@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -80,7 +79,7 @@ Index: systemd-stable/src/basic/cgroup-util.c if (r < 0) return r; -@@ -1656,7 +1656,7 @@ int cg_set_attribute(const char *control +@@ -1646,7 +1646,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -89,11 +88,11 @@ Index: systemd-stable/src/basic/cgroup-util.c } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -Index: systemd-stable/src/basic/procfs-util.c -=================================================================== ---- systemd-stable.orig/src/basic/procfs-util.c -+++ systemd-stable/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index 8f9eee8d36..480f8cc0b4 100644 +--- a/src/basic/procfs-util.c ++++ b/src/basic/procfs-util.c +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -109,11 +108,11 @@ Index: systemd-stable/src/basic/procfs-util.c if (r < 0) { uint64_t threads_max; -Index: systemd-stable/src/basic/smack-util.c -=================================================================== ---- systemd-stable.orig/src/basic/smack-util.c -+++ systemd-stable/src/basic/smack-util.c -@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index 3362ee3924..80c0f2a52e 100644 +--- a/src/basic/smack-util.c ++++ b/src/basic/smack-util.c +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -122,10 +121,10 @@ Index: systemd-stable/src/basic/smack-util.c if (r < 0) return r; -Index: systemd-stable/src/basic/util.c -=================================================================== ---- systemd-stable.orig/src/basic/util.c -+++ systemd-stable/src/basic/util.c +diff --git a/src/basic/util.c b/src/basic/util.c +index f98ecf3858..13e0f7431f 100644 +--- a/src/basic/util.c ++++ b/src/basic/util.c @@ -267,7 +267,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; @@ -135,11 +134,11 @@ Index: systemd-stable/src/basic/util.c if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -Index: systemd-stable/src/binfmt/binfmt.c -=================================================================== ---- systemd-stable.orig/src/binfmt/binfmt.c -+++ systemd-stable/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) +diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c +index 43ed2f385b..37a6f578f7 100644 +--- a/src/binfmt/binfmt.c ++++ b/src/binfmt/binfmt.c +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); @@ -148,7 +147,7 @@ Index: systemd-stable/src/binfmt/binfmt.c } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); @@ -166,11 +165,11 @@ Index: systemd-stable/src/binfmt/binfmt.c STRV_FOREACH(f, files) { k = apply_file(*f, true); -Index: systemd-stable/src/core/main.c -=================================================================== ---- systemd-stable.orig/src/core/main.c -+++ systemd-stable/src/core/main.c -@@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void +diff --git a/src/core/main.c b/src/core/main.c +index a280b756ff..334532cd42 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -179,7 +178,7 @@ Index: systemd-stable/src/core/main.c if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1668,7 +1668,7 @@ static void initialize_core_pattern(bool +@@ -1666,7 +1666,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -188,11 +187,11 @@ Index: systemd-stable/src/core/main.c if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -Index: systemd-stable/src/core/smack-setup.c -=================================================================== ---- systemd-stable.orig/src/core/smack-setup.c -+++ systemd-stable/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) +diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c +index 1fe592af70..603942a000 100644 +--- a/src/core/smack-setup.c ++++ b/src/core/smack-setup.c +@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL @@ -214,10 +213,10 @@ Index: systemd-stable/src/core/smack-setup.c if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -Index: systemd-stable/src/hibernate-resume/hibernate-resume.c -=================================================================== ---- systemd-stable.orig/src/hibernate-resume/hibernate-resume.c -+++ systemd-stable/src/hibernate-resume/hibernate-resume.c +diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c +index d8f91f4e66..a088e6e2d8 100644 +--- a/src/hibernate-resume/hibernate-resume.c ++++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } @@ -227,11 +226,11 @@ Index: systemd-stable/src/hibernate-resume/hibernate-resume.c if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -Index: systemd-stable/src/libsystemd/sd-device/sd-device.c -=================================================================== ---- systemd-stable.orig/src/libsystemd/sd-device/sd-device.c -+++ systemd-stable/src/libsystemd/sd-device/sd-device.c -@@ -1877,7 +1877,7 @@ _public_ int sd_device_set_sysattr_value +diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c +index d06f90ce1d..43d0a58750 100644 +--- a/src/libsystemd/sd-device/sd-device.c ++++ b/src/libsystemd/sd-device/sd-device.c +@@ -1976,7 +1976,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -240,11 +239,11 @@ Index: systemd-stable/src/libsystemd/sd-device/sd-device.c if (r < 0) { if (r == -ELOOP) return -EINVAL; -Index: systemd-stable/src/login/logind-dbus.c -=================================================================== ---- systemd-stable.orig/src/login/logind-dbus.c -+++ systemd-stable/src/login/logind-dbus.c -@@ -1341,7 +1341,7 @@ static int trigger_device(Manager *m, sd +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 7d757aa286..a5d9da5b7e 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -1330,7 +1330,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; @@ -253,11 +252,11 @@ Index: systemd-stable/src/login/logind-dbus.c } return 0; -Index: systemd-stable/src/nspawn/nspawn-cgroup.c -=================================================================== ---- systemd-stable.orig/src/nspawn/nspawn-cgroup.c -+++ systemd-stable/src/nspawn/nspawn-cgroup.c -@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified +diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c +index cb01b25bc6..e92051268b 100644 +--- a/src/nspawn/nspawn-cgroup.c ++++ b/src/nspawn/nspawn-cgroup.c +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -266,11 +265,11 @@ Index: systemd-stable/src/nspawn/nspawn-cgroup.c if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -Index: systemd-stable/src/nspawn/nspawn.c -=================================================================== ---- systemd-stable.orig/src/nspawn/nspawn.c -+++ systemd-stable/src/nspawn/nspawn.c -@@ -2493,7 +2493,7 @@ static int reset_audit_loginuid(void) { +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 3528b7ff14..11b0c20f95 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -2667,7 +2667,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -279,7 +278,7 @@ Index: systemd-stable/src/nspawn/nspawn.c if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3726,13 +3726,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3920,13 +3920,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -295,11 +294,11 @@ Index: systemd-stable/src/nspawn/nspawn.c if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -Index: systemd-stable/src/shared/cgroup-setup.c -=================================================================== ---- systemd-stable.orig/src/shared/cgroup-setup.c -+++ systemd-stable/src/shared/cgroup-setup.c -@@ -267,7 +267,7 @@ int cg_attach(const char *controller, co +diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c +index f197f715c7..077f893177 100644 +--- a/src/shared/cgroup-setup.c ++++ b/src/shared/cgroup-setup.c +@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { xsprintf(c, PID_FMT "\n", pid); @@ -308,7 +307,7 @@ Index: systemd-stable/src/shared/cgroup-setup.c if (r < 0) return r; -@@ -817,7 +817,7 @@ int cg_enable_everywhere( +@@ -799,7 +799,7 @@ int cg_enable_everywhere( return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); } @@ -317,11 +316,11 @@ Index: systemd-stable/src/shared/cgroup-setup.c if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -Index: systemd-stable/src/shared/sysctl-util.c -=================================================================== ---- systemd-stable.orig/src/shared/sysctl-util.c -+++ systemd-stable/src/shared/sysctl-util.c -@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, con +diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c +index 670c33108b..7c7c3dcfb6 100644 +--- a/src/shared/sysctl-util.c ++++ b/src/shared/sysctl-util.c +@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c log_debug("Setting '%s' to '%s'", p, value); @@ -330,11 +329,11 @@ Index: systemd-stable/src/shared/sysctl-util.c } int sysctl_read(const char *property, char **content) { -Index: systemd-stable/src/sleep/sleep.c -=================================================================== ---- systemd-stable.orig/src/sleep/sleep.c -+++ systemd-stable/src/sleep/sleep.c -@@ -48,7 +48,7 @@ static int write_hibernate_location_info +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index 39ab554290..d0e566645d 100644 +--- a/src/sleep/sleep.c ++++ b/src/sleep/sleep.c +@@ -48,7 +48,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca assert(hibernate_location->swap); xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); @@ -343,7 +342,7 @@ Index: systemd-stable/src/sleep/sleep.c if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", hibernate_location->swap->device, resume_str); -@@ -75,7 +75,7 @@ static int write_hibernate_location_info +@@ -75,7 +75,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca } xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); @@ -361,7 +360,7 @@ Index: systemd-stable/src/sleep/sleep.c if (k >= 0) return 0; -@@ -114,7 +114,7 @@ static int write_state(FILE **f, char ** +@@ -114,7 +114,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; @@ -370,24 +369,24 @@ Index: systemd-stable/src/sleep/sleep.c if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -Index: systemd-stable/src/udev/udevadm-trigger.c -=================================================================== ---- systemd-stable.orig/src/udev/udevadm-trigger.c -+++ systemd-stable/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato +diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c +index 5c74184c33..65f528314e 100644 +--- a/src/udev/udevadm-trigger.c ++++ b/src/udev/udevadm-trigger.c +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set **settle_s if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + bool ignore = IN_SET(r, -ENOENT, -ENODEV); -Index: systemd-stable/src/udev/udevd.c -=================================================================== ---- systemd-stable.orig/src/udev/udevd.c -+++ systemd-stable/src/udev/udevd.c -@@ -1153,7 +1153,7 @@ static int synthesize_change_one(sd_devi +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index d24b8d4398..d123a43904 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -1192,7 +1192,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -396,11 +395,11 @@ Index: systemd-stable/src/udev/udevd.c if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -Index: systemd-stable/src/vconsole/vconsole-setup.c -=================================================================== ---- systemd-stable.orig/src/vconsole/vconsole-setup.c -+++ systemd-stable/src/vconsole/vconsole-setup.c -@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *na +diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c +index b28e2853e1..115b7233a0 100644 +--- a/src/vconsole/vconsole-setup.c ++++ b/src/vconsole/vconsole-setup.c +@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; @@ -409,3 +408,6 @@ Index: systemd-stable/src/vconsole/vconsole-setup.c if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch index ba7424d876..ea4a024b82 100644 --- a/poky/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ b/poky/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch @@ -1,7 +1,7 @@ -From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001 +From 359e7a38824a906b0a24f5775f41a2ae3358bf06 Mon Sep 17 00:00:00 2001 From: Scott Murray <scott.murray@konsulko.com> Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH] Include sys/wait.h +Subject: [PATCH 23/26] Include sys/wait.h Fixes: src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? @@ -11,19 +11,21 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- src/login/logind-brightness.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index 3f4b65e1fdf1..5af7e3d5ce3f 100644 +index a6a1603396..54848ce209 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <sys/wait.h> #include "bus-util.h" #include "device-util.h" #include "hash-funcs.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch index 538a99c7d7..2820d7b322 100644 --- a/poky/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ b/poky/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch @@ -1,7 +1,7 @@ -From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001 +From 0592da08e16a17ceef0949ec9901397d8ec5af92 Mon Sep 17 00:00:00 2001 From: Scott Murray <scott.murray@konsulko.com> Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH] Include signal.h +Subject: [PATCH 24/26] Include signal.h Fixes several signal set related errors: src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] @@ -12,13 +12,12 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [ Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- src/basic/copy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/copy.c b/src/basic/copy.c -index 9028868f696d..5168586fa522 100644 +index 6a9c3a396f..8948bb4013 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -8,6 +8,7 @@ @@ -29,3 +28,6 @@ index 9028868f696d..5168586fa522 100644 #include "alloc-util.h" #include "btrfs-util.h" +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch index d394444c1c..1cc3985d12 100644 --- a/poky/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch @@ -1,7 +1,7 @@ -From dbe8b3ee45580defeefcac929b897c5437ffc50b Mon Sep 17 00:00:00 2001 +From bbda4a48a34662393117fc677c3a678d4ce4c2ec Mon Sep 17 00:00:00 2001 From: Scott Murray <scott.murray@konsulko.com> Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH] Handle __cpu_mask usage +Subject: [PATCH 25/26] Handle __cpu_mask usage Fixes errors: @@ -18,14 +18,13 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Scott Murray <scott.murray@konsulko.com> - --- src/shared/cpu-set-util.h | 2 ++ src/test/test-sizeof.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 27812dfd5923..0ab40731ea93 100644 +index 3c63a58826..4c2d4347fc 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -38,11 +37,11 @@ index 27812dfd5923..0ab40731ea93 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index c65062d2562c..8b6eefa9cdae 100644 +index e1a59d408c..c269ea6e8c 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include <sched.h> #include <stdio.h> @@ -56,3 +55,6 @@ index c65062d2562c..8b6eefa9cdae 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch b/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch index c5960a0d60..4180afb08e 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch +++ b/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch @@ -1,22 +1,26 @@ -From ef9580ea1e2f1e57af3c7dcb0ec392ba8dbb5c8d Mon Sep 17 00:00:00 2001 +From 47bf88f74717b417e4adbcc04256334b2335c873 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Tue, 10 Mar 2020 11:05:20 +0000 -Subject: [PATCH] Handle missing gshadow +Subject: [PATCH 26/26] Handle missing gshadow gshadow usage is now present in the userdb code. Mask all uses of it to allow compilation on musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +[Rebased for v247] +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- - src/shared/group-record-nss.c | 20 ++++++++++++++++++++ - src/shared/group-record-nss.h | 4 ++++ - src/shared/userdb.c | 6 ++++++ + src/shared/user-record-nss.c | 20 ++++++++++++++++++++ + src/shared/user-record-nss.h | 4 ++++ + src/shared/userdb.c | 6 ++++++ 3 files changed, 30 insertions(+) ---- a/src/shared/group-record-nss.c -+++ b/src/shared/group-record-nss.c -@@ -19,8 +19,10 @@ int nss_group_to_group_record( +diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c +index 88b8fc2f8f..a819d41bac 100644 +--- a/src/shared/user-record-nss.c ++++ b/src/shared/user-record-nss.c +@@ -331,8 +331,10 @@ int nss_group_to_group_record( if (isempty(grp->gr_name)) return -EINVAL; @@ -27,23 +31,23 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> g = group_record_new(); if (!g) -@@ -36,6 +38,7 @@ int nss_group_to_group_record( +@@ -348,6 +350,7 @@ int nss_group_to_group_record( g->gid = grp->gr_gid; +#if ENABLE_GSHADOW if (sgrp) { - if (looks_like_hashed_password(sgrp->sg_passwd)) { + if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) { g->hashed_password = strv_new(sgrp->sg_passwd); -@@ -51,6 +54,7 @@ int nss_group_to_group_record( - if (!g->administrators) - return -ENOMEM; +@@ -363,6 +366,7 @@ int nss_group_to_group_record( + if (r < 0) + return r; } +#endif r = json_build(&g->json, JSON_BUILD_OBJECT( JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), -@@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct grou +@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re assert(ret_sgrp); assert(ret_buffer); @@ -51,7 +55,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> for (;;) { _cleanup_free_ char *buf = NULL; struct sgrp sgrp, *result; -@@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct grou +@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re buflen *= 2; buf = mfree(buf); } @@ -61,7 +65,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> } int nss_group_record_by_name( -@@ -115,7 +123,9 @@ int nss_group_record_by_name( +@@ -427,7 +435,9 @@ int nss_group_record_by_name( struct group grp, *result; bool incomplete = false; size_t buflen = 4096; @@ -71,7 +75,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> int r; assert(name); -@@ -145,6 +155,7 @@ int nss_group_record_by_name( +@@ -457,6 +467,7 @@ int nss_group_record_by_name( buf = mfree(buf); } @@ -79,7 +83,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> if (with_shadow) { r = nss_sgrp_for_group(result, &sgrp, &sbuf); if (r < 0) { -@@ -156,6 +167,9 @@ int nss_group_record_by_name( +@@ -468,6 +479,9 @@ int nss_group_record_by_name( incomplete = true; r = nss_group_to_group_record(result, sresult, ret); @@ -89,7 +93,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> if (r < 0) return r; -@@ -172,7 +186,9 @@ int nss_group_record_by_gid( +@@ -484,7 +498,9 @@ int nss_group_record_by_gid( struct group grp, *result; bool incomplete = false; size_t buflen = 4096; @@ -99,7 +103,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> int r; assert(ret); -@@ -200,6 +216,7 @@ int nss_group_record_by_gid( +@@ -512,6 +528,7 @@ int nss_group_record_by_gid( buf = mfree(buf); } @@ -107,7 +111,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> if (with_shadow) { r = nss_sgrp_for_group(result, &sgrp, &sbuf); if (r < 0) { -@@ -211,6 +228,9 @@ int nss_group_record_by_gid( +@@ -523,6 +540,9 @@ int nss_group_record_by_gid( incomplete = true; r = nss_group_to_group_record(result, sresult, ret); @@ -117,8 +121,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> if (r < 0) return r; ---- a/src/shared/group-record-nss.h -+++ b/src/shared/group-record-nss.h +diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h +index 22ab04d6ee..4e52e7a911 100644 +--- a/src/shared/user-record-nss.h ++++ b/src/shared/user-record-nss.h @@ -2,7 +2,11 @@ #pragma once @@ -128,12 +134,14 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +#else +struct sgrp; +#endif + #include <pwd.h> + #include <shadow.h> - #include "group-record.h" - +diff --git a/src/shared/userdb.c b/src/shared/userdb.c +index 2d480283d1..0d19764f2e 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c -@@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator +@@ -929,13 +929,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { if (gr) { _cleanup_free_ char *buffer = NULL; bool incomplete = false; @@ -150,7 +158,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> r = nss_sgrp_for_group(gr, &sgrp, &buffer); if (r < 0) { log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); -@@ -944,6 +947,9 @@ int groupdb_iterator_get(UserDBIterator +@@ -943,6 +946,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { } r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); @@ -160,3 +168,6 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> if (r < 0) return r; +-- +2.27.0 + diff --git a/poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch b/poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch deleted file mode 100644 index b1c92ed713..0000000000 --- a/poky/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 92b555aaabf710e0a672a7244e8c0e3963075133 Mon Sep 17 00:00:00 2001 -From: Purushottam choudhary <purushottam.choudhary@kpit.com> -Date: Wed, 28 Oct 2020 22:11:49 +0530 -Subject: [PATCH] network: selinux hook handling to enumerate nexthop - -When selinux is enabled, the call of -manager_rtnl_enumerate_nexthop() fails. - -This fix is to facilitate selinux hook handling for enumerating -nexthop. - -In manager_rtnl_enumerate_nexthop() there is a check -if "Not supported" is returned by the send_netlink() call. - -This check expects that -EOPNOTSUPP is returned, -the selinux hook seems to return -EINVAL instead. - -This happens in kernel older than 5.3 -(more specificallytorvalds/linux@65ee00a) as it does not support -nexthop handling through netlink. - -And if SELinux is enforced in the order kernel, callingRTM_GETNEXTHOP -returns -EINVAL. - -Thus adding a call in the manager_rtnl_enumerate_nexthop for the -extra return -EINVAL. - -Upstream-Status: Backport -https://github.com/systemd/systemd/commit/92b555aaabf710e0a672a7244e8c0e3963075133 ---- - src/network/networkd-manager.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c -index a6c1a39..2a9be85 100644 ---- a/src/network/networkd-manager.c -+++ b/src/network/networkd-manager.c -@@ -2121,7 +2121,7 @@ int manager_rtnl_enumerate_nexthop(Manager *m) { - - r = sd_netlink_call(m->rtnl, req, 0, &reply); - if (r < 0) { -- if (r == -EOPNOTSUPP) { -+ if (r == -EOPNOTSUPP || r == -EINVAL) { - log_debug("Nexthop are not supported by the kernel. Ignoring."); - return 0; - } diff --git a/poky/meta/recipes-core/systemd/systemd_246.6.bb b/poky/meta/recipes-core/systemd/systemd_247.2.bb index d9e7b1a00c..5eea78eff3 100644 --- a/poky/meta/recipes-core/systemd/systemd_246.6.bb +++ b/poky/meta/recipes-core/systemd/systemd_247.2.bb @@ -22,7 +22,6 @@ SRC_URI += "file://touchscreen.rules \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ - file://selinux-hook-handling-to-enumerate-nexthop.patch \ file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ " @@ -34,26 +33,26 @@ SRC_URI_MUSL = "\ file://0004-add-fallback-parse_printf_format-implementation.patch \ file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ file://0006-Include-netinet-if_ether.h.patch \ - file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \ + file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ file://0008-add-missing-FTW_-macros-for-musl.patch \ - file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ - file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ - file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ - file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ - file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ - file://0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ - file://0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ - file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ - file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ - file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0021-Handle-missing-LOCK_EX.patch \ - file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ - file://0024-test-json.c-define-M_PIl.patch \ - file://0001-do-not-disable-buffer-in-writing-files.patch \ - file://0002-src-login-brightness.c-include-sys-wait.h.patch \ - file://0003-src-basic-copy.c-include-signal.h.patch \ - file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ - file://0001-Handle-missing-gshadow.patch \ + file://0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ + file://0010-Use-uintmax_t-for-handling-rlim_t.patch \ + file://0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ + file://0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ + file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ + file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ + file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ + file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ + file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \ + file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ + file://0019-Handle-missing-LOCK_EX.patch \ + file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ + file://0021-test-json.c-define-M_PIl.patch \ + file://0022-do-not-disable-buffer-in-writing-files.patch \ + file://0023-Include-sys-wait.h.patch \ + file://0024-Include-signal.h.patch \ + file://0025-Handle-__cpu_mask-usage.patch \ + file://0026-Handle-missing-gshadow.patch \ " PAM_PLUGINS = " \ @@ -111,6 +110,9 @@ PACKAGECONFIG_remove_libc-musl = " \ CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " +# Some of the dependencies are weak-style recommends - if not available at runtime, +# systemd won't fail but the library-related feature will be skipped with a warning. + # Use the upstream systemd serial-getty@.service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. @@ -123,7 +125,7 @@ PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid" PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" -PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup" +PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup" PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi" @@ -144,8 +146,8 @@ PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables" PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" -PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn" -PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2" +PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn,,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2,,libidn2" PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" @@ -157,12 +159,13 @@ PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false" +PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false" PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl" PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}" PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2" PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" -PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode" +PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false" @@ -209,6 +212,11 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ -Drootlibdir=${rootlibdir} \ -Drootprefix=${rootprefix} \ -Ddefault-locale=C \ + -Dmode=release \ + -Dsystem-alloc-uid-min=101 \ + -Dsystem-uid-max=999 \ + -Dsystem-alloc-gid-min=101 \ + -Dsystem-gid-max=999 \ " # Hardcode target binary paths to avoid using paths from sysroot @@ -470,6 +478,7 @@ FILES_${PN}-extra-utils = "\ ${base_bindir}/systemd-escape \ ${base_bindir}/systemd-inhibit \ ${bindir}/systemd-detect-virt \ + ${bindir}/systemd-dissect \ ${bindir}/systemd-path \ ${bindir}/systemd-run \ ${bindir}/systemd-cat \ @@ -553,6 +562,8 @@ FILES_${PN} = " ${base_bindir}/* \ ${sysconfdir}/resolv-conf.systemd \ ${sysconfdir}/X11/xinit/xinitrc.d/* \ ${rootlibexecdir}/systemd/* \ + ${libdir}/pam.d \ + ${nonarch_libdir}/pam.d \ ${systemd_unitdir}/* \ ${base_libdir}/security/*.so \ /cgroup \ @@ -564,6 +575,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${bindir}/resolvectl \ ${bindir}/timedatectl \ ${bindir}/bootctl \ + ${bindir}/oomctl \ ${exec_prefix}/lib/tmpfiles.d/*.conf \ ${exec_prefix}/lib/systemd \ ${exec_prefix}/lib/modules-load.d \ @@ -581,6 +593,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \ ${datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf \ ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \ + ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ " FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" diff --git a/poky/meta/recipes-core/sysvinit/sysvinit/rc b/poky/meta/recipes-core/sysvinit/sysvinit/rc index d0d3149821..41196ec90b 100755 --- a/poky/meta/recipes-core/sysvinit/sysvinit/rc +++ b/poky/meta/recipes-core/sysvinit/sysvinit/rc @@ -17,6 +17,7 @@ . /etc/default/rcS export VERBOSE +export PSPLASH_FIFO_DIR startup_progress() { step=$(($step + $step_change)) @@ -27,7 +28,7 @@ startup_progress() { fi #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" if type psplash-write >/dev/null 2>&1; then - PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true + psplash-write "PROGRESS $progress" || true fi } @@ -159,6 +160,9 @@ startup() { # [ -f $previous_start ] && [ ! -f $stop ] && continue fi + if [ x"${PSPLASH_TEXT_UPDATES}" = x"yes" ]; then + psplash-write "MSG $(basename $i .sh | cut -c 4-)" || true + fi case "$runlevel" in 0|6) startup $i stop @@ -173,7 +177,6 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then if type psplash-write >/dev/null 2>&1; then - PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true - umount -l /mnt/.psplash + psplash-write "QUIT" || true fi fi diff --git a/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default index 709cdf6ec5..f7c4a2f841 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default +++ b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default @@ -27,3 +27,10 @@ VOLATILE_ENABLE_CACHE=yes # Setting ROOTFS_READ_ONLY to yes and rebooting will give you a read-only rootfs. # Normally you should not change this value. ROOTFS_READ_ONLY=no +# rcS is also used when using busybox init and shares initscripts, some initscripts +# need to have specific behavior depending on init system +INIT_SYSTEM=sysvinit +# set the psplash fifo directory +PSPLASH_FIFO_DIR=/mnt +# psplash textual updates knob +PSPLASH_TEXT_UPDATES=#PSPLASH_TEXT# diff --git a/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb index 98916f7f19..41009bc180 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb +++ b/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb @@ -21,7 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://bootlogd.init \ file://01_bootlogd \ " -SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110" +SRC_URI[sha256sum] = "7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc" S = "${WORKDIR}/sysvinit-${PV}" @@ -29,6 +29,8 @@ inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" +PACKAGECONFIG[psplash-text-updates] = ",," + REQUIRED_DISTRO_FEATURES = "sysvinit" ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" @@ -91,7 +93,10 @@ do_install () { install -d ${D}${sysconfdir}/rc$level.d done - install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS + sed -e \ + 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ + ${WORKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS + chmod 0644 ${D}${sysconfdir}/default/rcS install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch new file mode 100644 index 0000000000..f3ae5ef948 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch @@ -0,0 +1,52 @@ +From 5547316c85cd45c0ea29c4c7c48eecd616783cd5 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Tue, 17 Nov 2020 11:27:48 +0100 +Subject: [PATCH] build-sys: do not build plymouth-ctrl.c w/ disabled plymouth + +Do not build plymouth-ctrl.c in agetty and sulogin in case the plymouth +support is disabled. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/5547316c85cd45c0ea29c4c7c48eecd616783cd5] +Signed-off-by: Pino Toscano <toscano.pino@tiscali.it> +--- + login-utils/Makemodule.am | 6 ++++-- + term-utils/Makemodule.am | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am +index 4f52cea3c..8bc3ee37e 100644 +--- a/login-utils/Makemodule.am ++++ b/login-utils/Makemodule.am +@@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8 + sulogin_SOURCES = \ + login-utils/sulogin.c \ + login-utils/sulogin-consoles.c \ +- login-utils/sulogin-consoles.h \ +- lib/plymouth-ctrl.c ++ login-utils/sulogin-consoles.h ++if USE_PLYMOUTH_SUPPORT ++sulogin_SOURCES += lib/plymouth-ctrl.c ++endif + sulogin_LDADD = $(LDADD) libcommon.la + + if HAVE_LIBCRYPT +diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am +index 92df7dbc8..c424dbdf8 100644 +--- a/term-utils/Makemodule.am ++++ b/term-utils/Makemodule.am +@@ -42,8 +42,10 @@ endif # BUILD_SCRIPTLIVE + if BUILD_AGETTY + sbin_PROGRAMS += agetty + dist_man_MANS += term-utils/agetty.8 +-agetty_SOURCES = term-utils/agetty.c \ +- lib/plymouth-ctrl.c ++agetty_SOURCES = term-utils/agetty.c ++if USE_PLYMOUTH_SUPPORT ++agetty_SOURCES += lib/plymouth-ctrl.c ++endif + agetty_LDADD = $(LDADD) libcommon.la + if BSD + agetty_LDADD += -lutil +-- +2.29.2 + diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch new file mode 100644 index 0000000000..3e818470fe --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch @@ -0,0 +1,30 @@ +From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Tue, 17 Nov 2020 11:32:45 +0100 +Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32 + +Check that __NR_settimeofday_time32 exists before trying to use it as +syscall number. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/367972fae13d170675768d63678577cae1890143] +Signed-off-by: Pino Toscano <toscano.pino@tiscali.it> +--- + sys-utils/hwclock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index 1f7ef3317..db448687d 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -678,7 +678,7 @@ display_time(struct timeval hwctime) + #ifndef SYS_settimeofday + # ifdef __NR_settimeofday + # define SYS_settimeofday __NR_settimeofday +-# else ++# elif defined(__NR_settimeofday_time32) + # define SYS_settimeofday __NR_settimeofday_time32 + # endif + #endif +-- +2.29.2 + diff --git a/poky/meta/recipes-core/util-linux/util-linux_2.36.bb b/poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb index 474f1e188c..bf46922271 100644 --- a/poky/meta/recipes-core/util-linux/util-linux_2.36.bb +++ b/poky/meta/recipes-core/util-linux/util-linux_2.36.1.bb @@ -39,8 +39,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ + file://0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch \ + file://0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch \ " -SRC_URI[sha256sum] = "9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1" +SRC_URI[sha256sum] = "09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed" PACKAGES =+ "${PN}-swaponoff" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.35.bb b/poky/meta/recipes-devtools/binutils/binutils_2.35.bb index 2e645e1ed8..976e49765a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.35.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.35.bb @@ -52,9 +52,11 @@ do_install_class-native () { rmdir ${D}/${libdir}64 || : } -# Split out libbfd-*.so so including perf doesn't include extra stuff -PACKAGE_BEFORE_PN += "libbfd" +# Split out libbfd-*.so and libopcodes-*.so so including perf doesn't include +# extra stuff +PACKAGE_BEFORE_PN += "libbfd libopcodes" FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" +FILES_libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " diff --git a/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch b/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch new file mode 100644 index 0000000000..12d4ebc4bc --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache/0001-Improve-SIMD-detection-735.patch @@ -0,0 +1,121 @@ +From 05d290165a3b61da09b715e6c8e62cebebab57cc Mon Sep 17 00:00:00 2001 +From: Erik Flodin <erik@ejohansson.se> +Date: Mon, 7 Dec 2020 19:20:31 +0100 +Subject: [PATCH 1/2] Improve SIMD detection (#735) + +* Try to compile code to detect SSE/AVX support. Just checking if the compiler + supports the flag isn't enough as e.g. Clang on Apple's new ARM silicon seems + to accept the flag but then fails when building. +* Try to detect and enable BLAKE3's Neon support. +* Improve detection of AVX2 target attribute support and remove the explicit + compiler version check that hopefully shouldn't be needed. + +Fixes #734. +Upstream-Status: Backport [https://github.com/ccache/ccache/commit/b438f50388dd00285083260f60450e6237b7d58f] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/GenerateConfigurationFile.cmake | 25 +++++++++--------- + src/third_party/blake3/CMakeLists.txt | 38 ++++++++++++++++++++------- + 2 files changed, 42 insertions(+), 21 deletions(-) + +diff --git a/cmake/GenerateConfigurationFile.cmake b/cmake/GenerateConfigurationFile.cmake +index a21861f4..836ff9bb 100644 +--- a/cmake/GenerateConfigurationFile.cmake ++++ b/cmake/GenerateConfigurationFile.cmake +@@ -67,18 +67,19 @@ check_struct_has_member("struct stat" st_mtim sys/stat.h + check_struct_has_member("struct statfs" f_fstypename sys/mount.h + HAVE_STRUCT_STATFS_F_FSTYPENAME) + +-include(CheckCXXCompilerFlag) +- +-# Old GCC versions don't have the required header support. +-# Old Apple Clang versions seem to support -mavx2 but not the target +-# attribute that's used to enable AVX2 for a certain function. +-if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) +- OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)) +- message(STATUS "Detected unsupported compiler for HAVE_AVX2 - disabled") +- set(HAVE_AVX2 FALSE) +-else() +- check_cxx_compiler_flag(-mavx2 HAVE_AVX2) +-endif() ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles( ++ [=[ ++ #include <immintrin.h> ++ void func() __attribute__((target("avx2"))); ++ void func() { _mm256_abs_epi8(_mm256_set1_epi32(42)); } ++ int main() ++ { ++ func(); ++ return 0; ++ } ++ ]=] ++ HAVE_AVX2) + + list(APPEND CMAKE_REQUIRED_LIBRARIES ws2_32) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ws2_32) +diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt +index a75e5611..cc24253c 100644 +--- a/src/third_party/blake3/CMakeLists.txt ++++ b/src/third_party/blake3/CMakeLists.txt +@@ -13,9 +13,9 @@ else() + endif() + + include(CheckAsmCompilerFlag) +-include(CheckCCompilerFlag) ++include(CheckCSourceCompiles) + +-function(add_source_if_enabled feature compile_flags) ++function(add_source_if_enabled feature compile_flags intrinsic) + string(TOUPPER "have_${blake_source_type}_${feature}" have_feature) + + # AVX512 support fails to compile with old Apple Clang versions even though +@@ -28,7 +28,14 @@ function(add_source_if_enabled feature compile_flags) + elseif(${blake_source_type} STREQUAL "asm") + check_asm_compiler_flag(${compile_flags} ${have_feature}) + else() +- check_c_compiler_flag(${compile_flags} ${have_feature}) ++ set(CMAKE_REQUIRED_FLAGS ${compile_flags}) ++ check_c_source_compiles( ++ [=[ ++ #include <immintrin.h> ++ int main() { ${intrinsic}; return 0; } ++ ]=] ++ ${have_feature}) ++ unset(CMAKE_REQUIRED_FLAGS) + endif() + + if(${have_feature}) +@@ -42,10 +49,23 @@ function(add_source_if_enabled feature compile_flags) + endif() + endfunction() + +-add_source_if_enabled(sse2 "-msse2") +-add_source_if_enabled(sse41 "-msse4.1") +-add_source_if_enabled(avx2 "-mavx2") +-add_source_if_enabled(avx512 "-mavx512f -mavx512vl") ++# https://software.intel.com/sites/landingpage/IntrinsicsGuide/ ++add_source_if_enabled(sse2 "-msse2" "_mm_set1_epi32(42)") ++add_source_if_enabled(sse41 "-msse4.1" "_mm_test_all_ones(_mm_set1_epi32(42))") ++add_source_if_enabled(avx2 "-mavx2" "_mm256_abs_epi8(_mm256_set1_epi32(42))") ++add_source_if_enabled(avx512 "-mavx512f -mavx512vl" "_mm256_abs_epi64(_mm256_set1_epi32(42))") + +-# TODO: how to detect ARM NEON support? +-# If NEON, define BLAKE3_USE_NEON and build blake3_neon.c ++# Neon is always available on AArch64 ++if(CMAKE_SIZEOF_VOID_P EQUAL 8) ++ # https://developer.arm.com/architectures/instruction-sets/simd-isas/neon/intrinsics ++ check_c_source_compiles( ++ [=[ ++ #include <arm_neon.h> ++ int main() { vdupq_n_s32(42); return 0; } ++ ]=] ++ HAVE_NEON) ++ if(HAVE_NEON) ++ target_sources(blake3 PRIVATE blake3_neon.c) ++ target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON) ++ endif() ++endif() +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch b/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch new file mode 100644 index 0000000000..bdabb381aa --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache/0001-blake3-Remove-asm-checks-for-sse-avx.patch @@ -0,0 +1,35 @@ +From 0448eddcf2863ebf911e7dd445bca1c7eee2a239 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 5 Jan 2021 13:55:34 -0800 +Subject: [PATCH] blake3: Remove asm checks for sse/avx + +This ends up passing on clang/linux wrongly when building for aarch64 +the check in else part is good to detect the feature support and this +check can be removed, it was setting + +HAVE_ASM_AVX* and HAVE_ASM_SSE* macros which are not used in the build +anyway + +Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/768] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/third_party/blake3/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/third_party/blake3/CMakeLists.txt b/src/third_party/blake3/CMakeLists.txt +index cc24253c..856b5721 100644 +--- a/src/third_party/blake3/CMakeLists.txt ++++ b/src/third_party/blake3/CMakeLists.txt +@@ -25,8 +25,6 @@ function(add_source_if_enabled feature compile_flags intrinsic) + AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) + message(STATUS "Detected unsupported compiler for ${have_feature} - disabled") + set(${have_feature} FALSE) +- elseif(${blake_source_type} STREQUAL "asm") +- check_asm_compiler_flag(${compile_flags} ${have_feature}) + else() + set(CMAKE_REQUIRED_FLAGS ${compile_flags}) + check_c_source_compiles( +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch b/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch new file mode 100644 index 0000000000..85ce2b762d --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache/0002-Always-use-64bit-to-print-time_t.patch @@ -0,0 +1,33 @@ +From fa360ca8a457dafcae1d22df2b342d3ee291e8af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 31 Dec 2020 14:28:39 -0800 +Subject: [PATCH 2/2] Always use 64bit to print time_t + +some 32bit architectures e.g. RISCV32 use 64bit time_t from beginning +which does not fit into long int size on LP32 systems + +Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/762] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Logging.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/Logging.cpp b/src/Logging.cpp +index 9a5d99b7..1a6e6264 100644 +--- a/src/Logging.cpp ++++ b/src/Logging.cpp +@@ -88,7 +88,10 @@ do_log(string_view message, bool bulk) + if (tm) { + strftime(timestamp, sizeof(timestamp), "%Y-%m-%dT%H:%M:%S", &*tm); + } else { +- snprintf(timestamp, sizeof(timestamp), "%lu", tv.tv_sec); ++ snprintf(timestamp, ++ sizeof(timestamp), ++ "%llu", ++ (long long unsigned int)tv.tv_sec); + } + snprintf(prefix, + sizeof(prefix), +-- +2.30.0 + diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb b/poky/meta/recipes-devtools/ccache/ccache_4.1.bb index fd004f4c9b..6bd46b1017 100644 --- a/poky/meta/recipes-devtools/ccache/ccache_3.7.11.bb +++ b/poky/meta/recipes-devtools/ccache/ccache_4.1.bb @@ -7,26 +7,21 @@ HOMEPAGE = "http://ccache.samba.org" SECTION = "devel" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=a66c581f855c1c408730fe5d171e3013" -DEPENDS = "zlib" +DEPENDS = "zstd" -SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "34309a59d4b6b6b33756366aa9d3144a4655587be9f914476b4c0e2d36365f01" +SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-Improve-SIMD-detection-735.patch \ + file://0002-Always-use-64bit-to-print-time_t.patch \ + file://0001-blake3-Remove-asm-checks-for-sse-avx.patch \ + " +SRC_URI[sha256sum] = "cdeefb827b3eef3b42b5454858123881a4a90abbd46cc72cf8c20b3bd039deb7" UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" -inherit autotools +inherit cmake -# Remove ccache-native's dependencies, so that it can be used widely by -# other native recipes. -DEPENDS_class-native = "" -EXTRA_OECONF_class-native = "--with-bundled-zlib" -INHIBIT_AUTOTOOLS_DEPS_class-native = "1" PATCHTOOL = "patch" -BBCLASSEXTEND = "native" - -do_configure_class-native() { - oe_runconf -} +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb index d91e42ef9a..d91e42ef9a 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index e840e884cf..db03819b66 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -11,7 +11,7 @@ BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ - file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \ + file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" @@ -20,9 +20,10 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ + file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \ " -SRC_URI[sha256sum] = "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77" +SRC_URI[sha256sum] = "e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch index c4f81b27b5..8181510324 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch @@ -1,4 +1,4 @@ -From dd0fe8d54def4684d360b3e9b10e963ef0208202 Mon Sep 17 00:00:00 2001 +From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default @@ -25,10 +25,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index f3ec4da..bb05656 100644 +index bae270d..5bb6bc0 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake -@@ -81,6 +81,13 @@ else() +@@ -111,6 +111,13 @@ else() endif() endif() diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch new file mode 100644 index 0000000000..4483bbce18 --- /dev/null +++ b/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch @@ -0,0 +1,26 @@ +From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sun, 27 Dec 2020 23:18:10 +0100 +Subject: [PATCH] cm_cxx_features.cmake: do not try to run the test binary + +This causes errors when cross compiling cmake. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/Checks/cm_cxx_features.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake +index 663d89a..e8dca3b 100644 +--- a/Source/Checks/cm_cxx_features.cmake ++++ b/Source/Checks/cm_cxx_features.cmake +@@ -81,7 +81,7 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE) + endif() + cm_check_cxx_feature(unique_ptr) + if (NOT CMAKE_CXX_STANDARD LESS "17") +- cm_check_cxx_feature(filesystem TRY_RUN) ++ cm_check_cxx_feature(filesystem) + else() + set(CMake_HAVE_CXX_FILESYSTEM FALSE) + endif() diff --git a/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch b/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch index 162bfe5783..33db07ccf0 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch @@ -1,4 +1,4 @@ -From 106cf5134d22db889e4ddf2f98ec302d5f4b9ca7 Mon Sep 17 00:00:00 2001 +From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <otavio@ossystems.com.br> Date: Wed, 17 Jan 2018 10:02:14 -0200 Subject: [PATCH] cmake: Prevent the detection of Qt5 @@ -25,23 +25,23 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt -index 98dd0e2..252302b 100644 +index 452a303..d0a9fb4 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -3,7 +3,7 @@ project(QtDialog) CMake_OPTIONAL_COMPONENT(cmake-gui) --find_package(Qt5Widgets QUIET) -+#find_package(Qt5Widgets QUIET) - if (Qt5Widgets_FOUND) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - add_definitions(${Qt5Widgets_DEFINITONS}) +-find_package(Qt5Widgets REQUIRED) ++#find_package(Qt5Widgets REQUIRED) + + set(CMake_QT_EXTRA_LIBRARIES) + diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index db6dbf3..5b26879 100644 +index 1fb47cb..e022229 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -215,7 +215,7 @@ if(BUILD_TESTING) +@@ -251,7 +251,7 @@ if(BUILD_TESTING) set(CMake_TEST_Qt5 1) endif() if(CMake_TEST_Qt5) @@ -96,10 +96,10 @@ index c08efc4..87e25d9 100644 set(CMAKE_CXX_STANDARD 11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt -index 10e66c3..ecc4eeb 100644 +index 370dd76..6bacbff 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt -@@ -440,7 +440,7 @@ if(NOT WIN32) +@@ -473,7 +473,7 @@ if(NOT WIN32) endif () find_package(Qt4 QUIET) diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb b/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb index 64c92b89f2..64c92b89f2 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb diff --git a/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb b/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb index 61b2ea5dc2..863f924b22 100644 --- a/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb +++ b/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb @@ -5,7 +5,7 @@ reviewing large, complex patch files." HOMEPAGE = "http://invisible-island.net/diffstat/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" +LIC_FILES_CHKSUM = "file://COPYING;md5=a3d0bb117493e804b0c1a868ddf23321" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://run-ptest \ @@ -16,8 +16,6 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ SRC_URI[md5sum] = "b9272ec8af6257103261ec3622692991" SRC_URI[sha256sum] = "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f" -S = "${WORKDIR}/diffstat-${PV}" - inherit autotools gettext ptest EXTRA_AUTORECONF += "--exclude=aclocal" diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb b/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb index dff6fe6c25..e1b0e1a132 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.4.0.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.5.2.bb @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0001-dnf-write-the-log-lock-to-root.patch \ " -SRCREV = "b9b7623892f551da201bffd03187d703242b00e9" +SRCREV = "36a3ffaee4db76a7efe7d40f4e42ce679b6a6920" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/gcc/gcc-10.2.inc b/poky/meta/recipes-devtools/gcc/gcc-10.2.inc index e88f2ade6d..1e69c91311 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-10.2.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-10.2.inc @@ -69,6 +69,7 @@ SRC_URI = "\ file://0002-aarch64-Introduce-SLS-mitigation-for-RET-and-BR-inst.patch \ file://0003-aarch64-Mitigate-SLS-for-BLR-instruction.patch \ file://0001-aarch64-Fix-up-__aarch64_cas16_acq_rel-fallback.patch \ + file://0001-lib-Remove-i-86-march-overrides.patch \ " SRC_URI[sha256sum] = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c" diff --git a/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch b/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch new file mode 100644 index 0000000000..3f04e121ba --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc/0001-lib-Remove-i-86-march-overrides.patch @@ -0,0 +1,113 @@ +From 3776789cde95916f95deef48acf9532b0ebf91ae Mon Sep 17 00:00:00 2001 +From: Nathan Rossi <nathan@nathanrossi.com> +Date: Tue, 15 Dec 2020 11:43:36 +1000 +Subject: [PATCH] lib*: Remove i*86 march overrides + +OE does not pass the '--with-arch' option to gccs configure, as such +some gcc-runtime libraries try to override the value of '-march' and +'-mtune' which OE already provides. This causes conflicts with other +i*86 instruction/architecture flags (e.g. -msse* and -mfpmath=*). +Additionally this caused the following libraries to be built with less +optimized tune configurations. + +Upstream suggests that this should be detecting or otherwise checking if +the target supports the desired functionality before overriding. + + https://gcc.gnu.org/legacy-ml/gcc-patches/2016-04/msg01344.html + +libatomic also overrides the '-march' specifically for IFUNC objects. +OE already supplies the correct march flag, so remove setting. + +Upstream-Status: Inappropriate [OE Specific] +Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> +--- + libatomic/Makefile.am | 1 - + libatomic/Makefile.in | 1 - + libatomic/configure.tgt | 9 --------- + libgomp/configure.tgt | 8 -------- + libitm/configure.tgt | 9 --------- + 5 files changed, 28 deletions(-) + +diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am +index ac1ca64587..5aa16e0699 100644 +--- a/libatomic/Makefile.am ++++ b/libatomic/Makefile.am +@@ -133,7 +133,6 @@ libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)) + libatomic_la_LIBADD += $(addsuffix _8_2_.lo,$(SIZEOBJS)) + endif + if ARCH_I386 +-IFUNC_OPTIONS = -march=i586 + libatomic_la_LIBADD += $(addsuffix _8_1_.lo,$(SIZEOBJS)) + endif + if ARCH_X86_64 +diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in +index 97df2d7ff0..82c511d420 100644 +--- a/libatomic/Makefile.in ++++ b/libatomic/Makefile.in +@@ -432,7 +432,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ + _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) + @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 +-@ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 + @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 + libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES) + libatomic_convenience_la_LIBADD = $(libatomic_la_LIBADD) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index 5dd0926d20..3cc41773c3 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -82,15 +82,6 @@ case "${target_cpu}" in + ;; + + i[3456]86) +- case " ${CC} ${CFLAGS} " in +- *" -m64 "*|*" -mx32 "*) +- ;; +- *) +- if test -z "$with_arch"; then +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" +- XCFLAGS="${XCFLAGS} -fomit-frame-pointer" +- fi +- esac + ARCH=x86 + # ??? Detect when -march=i686 is already enabled. + try_ifunc=yes +diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt +index 4790a31e39..46c4c958e6 100644 +--- a/libgomp/configure.tgt ++++ b/libgomp/configure.tgt +@@ -72,14 +72,6 @@ if test x$enable_linux_futex = xyes; then + # Note that bare i386 is not included here. We need cmpxchg. + i[456]86-*-linux*) + config_path="linux/x86 linux posix" +- case " ${CC} ${CFLAGS} " in +- *" -m64 "*|*" -mx32 "*) +- ;; +- *) +- if test -z "$with_arch"; then +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" +- fi +- esac + ;; + + # Similar jiggery-pokery for x86_64 multilibs, except here we +diff --git a/libitm/configure.tgt b/libitm/configure.tgt +index 04109160e9..3d78ea609d 100644 +--- a/libitm/configure.tgt ++++ b/libitm/configure.tgt +@@ -59,15 +59,6 @@ case "${target_cpu}" in + arm*) ARCH=arm ;; + + i[3456]86) +- case " ${CC} ${CFLAGS} " in +- *" -m64 "*|*" -mx32 "*) +- ;; +- *) +- if test -z "$with_arch"; then +- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}" +- XCFLAGS="${XCFLAGS} -fomit-frame-pointer" +- fi +- esac + XCFLAGS="${XCFLAGS} -mrtm" + ARCH=x86 + ;; diff --git a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 980ed63415..32c1499a30 100644 --- a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "664b772118739dac69ef8c39abea7e02973ff316" -PV = "20201018+git${SRCPV}" +SRCREV = "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f" +PV = "20201227+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" diff --git a/poky/meta/recipes-devtools/go/go-1.15.inc b/poky/meta/recipes-devtools/go/go-1.15.inc index ccfb0c5987..abe74e5eb7 100644 --- a/poky/meta/recipes-devtools/go/go-1.15.inc +++ b/poky/meta/recipes-devtools/go/go-1.15.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.15" -PV = "1.15.5" +PV = "1.15.6" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -15,6 +15,5 @@ SRC_URI += "\ file://0006-cmd-dist-separate-host-and-target-builds.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ - file://0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch \ " -SRC_URI[main.sha256sum] = "c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1" +SRC_URI[main.sha256sum] = "890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817" diff --git a/poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch b/poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch deleted file mode 100644 index b57041f1db..0000000000 --- a/poky/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 4759221d46b1666de96b8047cec3160bfe4d3d5d Mon Sep 17 00:00:00 2001 -From: Ian Lance Taylor <iant@golang.org> -Date: Fri, 13 Nov 2020 11:05:37 -0800 -Subject: [PATCH] cmd/go: permit CGO_LDFLAGS to appear in //go:ldflag - -Fixes #42565 - -Upstream-Status: Backport [https://github.com/golang/go/commit/782cf560db4c919790fdb476d1bbe18e5ddf5ffd] -Change-Id: If7cf39905d124dbd54dfac6a53ee38270498efed -Reviewed-on: https://go-review.googlesource.com/c/go/+/269818 -Trust: Ian Lance Taylor <iant@golang.org> -Run-TryBot: Ian Lance Taylor <iant@golang.org> -TryBot-Result: Go Bot <gobot@golang.org> -Reviewed-by: Jay Conrod <jayconrod@google.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/cmd/go/internal/work/exec.go | 15 +++++++++ - src/cmd/go/testdata/script/ldflag.txt | 44 +++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+) - create mode 100644 src/cmd/go/testdata/script/ldflag.txt - -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 575a2df..9209e3d 100644 ---- a/src/cmd/go/internal/work/exec.go -+++ b/src/cmd/go/internal/work/exec.go -@@ -2821,6 +2821,21 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo - idx = bytes.Index(src, []byte(cgoLdflag)) - } - } -+ -+ // We expect to find the contents of cgoLDFLAGS in flags. -+ if len(cgoLDFLAGS) > 0 { -+ outer: -+ for i := range flags { -+ for j, f := range cgoLDFLAGS { -+ if f != flags[i+j] { -+ continue outer -+ } -+ } -+ flags = append(flags[:i], flags[i+len(cgoLDFLAGS):]...) -+ break -+ } -+ } -+ - if err := checkLinkerFlags("LDFLAGS", "go:cgo_ldflag", flags); err != nil { - return nil, nil, err - } -diff --git a/src/cmd/go/testdata/script/ldflag.txt b/src/cmd/go/testdata/script/ldflag.txt -new file mode 100644 -index 0000000..6ceb33b ---- /dev/null -+++ b/src/cmd/go/testdata/script/ldflag.txt -@@ -0,0 +1,44 @@ -+# Issue #42565 -+ -+[!cgo] skip -+ -+# We can't build package bad, which uses #cgo LDFLAGS. -+cd bad -+! go build -+stderr no-such-warning -+ -+# We can build package ok with the same flags in CGO_LDFLAGS. -+env CGO_LDFLAGS=-Wno-such-warning -Wno-unknown-warning-option -+cd ../ok -+go build -+ -+# Build a main program that actually uses LDFLAGS. -+cd .. -+go build -ldflags=-v -+ -+# Because we passed -v the Go linker should print the external linker -+# command which should include the flag we passed in CGO_LDFLAGS. -+stderr no-such-warning -+ -+-- go.mod -- -+module ldflag -+ -+-- bad/bad.go -- -+package bad -+ -+// #cgo LDFLAGS: -Wno-such-warning -Wno-unknown-warning -+import "C" -+ -+func F() {} -+-- ok/ok.go -- -+package ok -+ -+import "C" -+ -+func F() {} -+-- main.go -- -+package main -+ -+import _ "ldflag/ok" -+ -+func main() {} --- -2.29.2 - diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.15.5.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb index 1fb11b0435..622557ad2b 100644 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.15.5.bb +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.15.6.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "9a58494e8da722c3aef248c9227b0e9c528c7318309827780f16220998180a0d" -SRC_URI[go_linux_arm64.sha256sum] = "a72a0b036beb4193a0214bca3fca4c5d68a38a4ccf098c909f7ce8bf08567c48" +SRC_URI[go_linux_amd64.sha256sum] = "3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844" +SRC_URI[go_linux_arm64.sha256sum] = "f87515b9744154ffe31182da9341d0a61eb0795551173d242c8cad209239e492" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb index 07b3df40d3..e22255f831 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.0.bb +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://enable_test_data_dir_set.patch \ " -SRCREV = "3f8981c9c5066e5243b695c904031b90f8d57d4a" +SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index 10204acf23..b9a64f00e7 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -6,8 +6,8 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch= file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ " -PV = "2.9.4" -SRCREV = "c7254db07b21495fc9bd247c5b17ee20149c05e3" +PV = "2.11.1" +SRCREV = "0ead09d0a35b9095e1a01afd540abd7217b31fba" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 4705890157..f187487096 100644 --- a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,4 +1,4 @@ -From c61a3df892ba88d9f3f84c1844481457a04b051f Mon Sep 17 00:00:00 2001 +From 9590860ba35cbd524cec51bdd009f0c63a7dd417 Mon Sep 17 00:00:00 2001 From: Ed Bartosh <ed.bartosh@linux.intel.com> Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs. @@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index 46af755..5ed9114 100644 +index 415755f..b61a49d 100644 --- a/config.c +++ b/config.c -@@ -737,14 +737,6 @@ void read_config(void) +@@ -774,14 +774,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); diff --git a/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch index 8ceb0af136..6ae91d6cb9 100644 --- a/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +++ b/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch @@ -1,9 +1,48 @@ +From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz <hrw@openedhand.com> +Date: Fri, 8 Jun 2007 08:35:12 +0000 +Subject: [PATCH] mtools: imported from OE + Upstream-Status: Inappropriate [licensing] -Index: mtools-4.0.18/configure.in -=================================================================== ---- mtools-4.0.18.orig/configure.in -+++ mtools-4.0.18/configure.in +--- + Makefile.in | 11 ++++++----- + configure.in | 27 +++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 616d59f..85b5b1d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -26,10 +26,11 @@ USERCFLAGS = + USERLDFLAGS = + USERLDLIBS = + +-MAKEINFO = makeinfo +-TEXI2DVI = texi2dvi +-TEXI2PDF = texi2pdf +-TEXI2HTML = texi2html ++MAKEINFO = @MAKEINFO@ ++TEXI2DVI = @TEXI2DVI@ ++TEXI2PDF = @TEXI2PDF@ ++TEXI2HTML = @TEXI2HTML@ ++DVI2PS = @DVI2PS@ + + + # do not edit below this line +@@ -199,7 +200,7 @@ dvi: mtools.dvi + + ps: mtools.ps + %.ps: %.dvi +- dvips -f < $< > $@ ++ $(DVI2PS) -f < $< > $@ + + pdf: mtools.pdf + %.pdf: %.texi sysconfdir.texi +diff --git a/configure.in b/configure.in +index 5ff75c1..c0f7440 100644 +--- a/configure.in ++++ b/configure.in @@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM AC_C_CONST AC_C_INLINE @@ -35,35 +74,6 @@ Index: mtools-4.0.18/configure.in +AC_SUBST(TEXI2HTML) +AC_SUBST(DVI2PS) + - dnl Check for configuration options dnl Enable OS/2 extended density format disks -Index: mtools-4.0.18/Makefile.in -=================================================================== ---- mtools-4.0.18.orig/Makefile.in -+++ mtools-4.0.18/Makefile.in -@@ -26,10 +26,11 @@ USERCFLAGS = - USERLDFLAGS = - USERLDLIBS = - --MAKEINFO = makeinfo --TEXI2DVI = texi2dvi --TEXI2PDF = texi2pdf --TEXI2HTML = texi2html -+MAKEINFO = @MAKEINFO@ -+TEXI2DVI = @TEXI2DVI@ -+TEXI2PDF = @TEXI2PDF@ -+TEXI2HTML = @TEXI2HTML@ -+DVI2PS = @DVI2PS@ - - - # do not edit below this line -@@ -198,7 +199,7 @@ dvi: mtools.dvi - - ps: mtools.ps - %.ps: %.dvi -- dvips -f < $< > $@ -+ $(DVI2PS) -f < $< > $@ - - pdf: mtools.pdf - %.pdf: %.texi sysconfdir.texi + AC_ARG_ENABLE(xdf, diff --git a/poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb b/poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb index bca33a28ee..4938713065 100644 --- a/poky/meta/recipes-devtools/mtools/mtools_4.0.25.bb +++ b/poky/meta/recipes-devtools/mtools/mtools_4.0.26.bb @@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "fd161eec3bb7a93d13936db67725ad3e17f2d5f4e6fa8f7667fbc7ac728e2c15" +SRC_URI[sha256sum] = "539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \ diff --git a/poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb index ecb0566f37..88ff843409 100644 --- a/poky/meta/recipes-devtools/ninja/ninja_1.10.1.bb +++ b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "a1f879b29c9aafe6a2bc0ba885701f8f4f19f772" +SRCREV = "e72d1d581c945c158ed68d9bc48911063022a2c6" SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" diff --git a/poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch b/poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch new file mode 100644 index 0000000000..33b7280e5a --- /dev/null +++ b/poky/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch @@ -0,0 +1,43 @@ +From 4acda6d01c5abd33f1a1a3275fd695363f59473f Mon Sep 17 00:00:00 2001 +From: Alex Stewart <alex.stewart@ni.com> +Date: Tue, 15 Dec 2020 15:17:54 -0600 +Subject: [opkg][opkg-0.4.4 PATCH] tests: let the OS negotiate relative package + dirs + +In cases where a regression test requires that a package be installed to +a subdirectory in the test feed, the opk.py module will attempt to +resolve the subdirectory and rebase it to the root of the test feed. + +This is unnecessary, since all operations which make use of the +subdirectory path do so from the perspective of the test feed already. +Further, the rebase implementation breaks in cases where the test feed +is beyond a symlink. + +Remove the resolve-and-rebase logic, and allow the OS to negotiate the +relative path. + +Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/dE1o7_OVQSY] + +Signed-off-by: Alex Stewart <alex.stewart@ni.com> +--- + tests/opk.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/tests/opk.py b/tests/opk.py +index 692339567f72441766c8e658edc5bdf6a339f77d..711abacaeb328283e31524f6a49305fc7d39696a 100644 +--- a/tests/opk.py ++++ b/tests/opk.py +@@ -58,9 +58,7 @@ class Opk: + if 'Version' not in control.keys(): + control['Version'] = '1.0' + if subdirectory is not None: +- subdir = Path(subdirectory).resolve() +- opkdir = Path(cfg.opkdir) +- self._relative_dir = subdir.relative_to(opkdir) ++ self._relative_dir = Path(subdirectory) + else: + self._relative_dir = None + self.control = control +-- +2.29.2 + diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb index 46b7aa2523..f8034ca5fa 100644 --- a/poky/meta/recipes-devtools/opkg/opkg_0.4.3.bb +++ b/poky/meta/recipes-devtools/opkg/opkg_0.4.4.bb @@ -14,11 +14,12 @@ PE = "1" SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://0001-tests-let-the-OS-negotiate-relative-package-dirs.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "86ec5eee9362aca0990994a402e077e9" -SRC_URI[sha256sum] = "dda452854bc0cd1334f7ba18a66003d1c12a98600c894111b56919b1ea434718" +SRC_URI[md5sum] = "345900c1d4747d58455867f9fe88ca43" +SRC_URI[sha256sum] = "2217acc58b8eb31300631ebae75e222ebc700c9c1cf6408088705d19a472c839" # This needs to be before ptest inherit, otherwise all ptest files end packaged # in libopkg package if OPKGLIBDIR == libdir, because default diff --git a/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch b/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch new file mode 100644 index 0000000000..03988a179c --- /dev/null +++ b/poky/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch @@ -0,0 +1,31 @@ +From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Mon, 15 Jul 2019 19:10:02 +0200 +Subject: Avoid invalid memory access in context format diffs + +* src/pch.c (another_hunk): Avoid invalid memory access in context format +diffs. + +CVE: CVE-2019-20633 +Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48] +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +--- + src/pch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pch.c b/src/pch.c +index a500ad9..cb54e03 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev) + ptrn_prefix_context = context; + ptrn_suffix_context = context; + if (repl_beginning ++ || p_end <= 0 + || (p_end + != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n'))) + { +-- +cgit v1.2.1 + diff --git a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb index b5897b357a..1997af0c25 100644 --- a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -10,6 +10,7 @@ SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \ file://0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch \ file://0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch \ + file://CVE-2019-20633.patch \ " SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" diff --git a/poky/meta/recipes-devtools/perl/perl_5.32.0.bb b/poky/meta/recipes-devtools/perl/perl_5.32.0.bb index bba8263b90..3815dd44b1 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.32.0.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.32.0.bb @@ -137,8 +137,9 @@ do_install() { install lib/ExtUtils/typemap ${D}${libdir}/perl5/${PV}/ExtUtils/ # Fix up shared library - rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so - ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so + dir=$(echo ${D}/${libdir}/perl5/${PV}/*/CORE) + rm $dir/libperl.so + ln -sf ../../../../libperl.so.${PERL_LIB_VER} $dir/libperl.so # Try to catch Bug #13946 if [ -e ${D}/${libdir}/perl5/${PV}/Storable.pm ]; then diff --git a/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch b/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch deleted file mode 100644 index e4a5356f5c..0000000000 --- a/poky/meta/recipes-devtools/pseudo/files/0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 28c760542eecd7c5b35ea88aa2b14d62afbda961 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <pkj@axis.com> -Date: Sat, 21 Nov 2020 17:22:38 +0100 -Subject: [PATCH] pseudo_client: Lessen indentation of - pseudo_client_ignore_path_chroot() - -Change-Id: I739b18efb7a95ce2d2d907d0faf7df539ab9af1c ---- - pseudo_client.c | 45 +++++++++++++++++++++++++-------------------- - 1 file changed, 25 insertions(+), 20 deletions(-) - -diff --git a/pseudo_client.c b/pseudo_client.c -index 116d926..a8bc3dc 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -1527,28 +1527,33 @@ int pseudo_client_ignore_fd(int fd) { - - int pseudo_client_ignore_path_chroot(const char *path, int ignore_chroot) { - char *env; -- if (path) { -- if (ignore_chroot && pseudo_chroot && strncmp(path, pseudo_chroot, pseudo_chroot_len) == 0) -- return 0; -- env = pseudo_get_value("PSEUDO_IGNORE_PATHS"); -- if (env) { -- char *p = env; -- while (*p) { -- char *next = strchr(p, ','); -- if (!next) -- next = strchr(p, '\0'); -- if ((next - p) && !strncmp(path, p, next - p)) { -- pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -- return 1; -- } -- if (next && *next != '\0') -- p = next+1; -- else -- break; -- } -- free(env); -+ -+ if (!path) -+ return 0; -+ -+ if (ignore_chroot && pseudo_chroot && strncmp(path, pseudo_chroot, pseudo_chroot_len) == 0) -+ return 0; -+ -+ env = pseudo_get_value("PSEUDO_IGNORE_PATHS"); -+ if (!env) -+ return 0; -+ -+ char *p = env; -+ while (*p) { -+ char *next = strchr(p, ','); -+ if (!next) -+ next = strchr(p, '\0'); -+ if ((next - p) && !strncmp(path, p, next - p)) { -+ pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -+ return 1; - } -+ if (next && *next != '\0') -+ p = next+1; -+ else -+ break; - } -+ free(env); -+ - return 0; - } - diff --git a/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch b/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch deleted file mode 100644 index a657a27f28..0000000000 --- a/poky/meta/recipes-devtools/pseudo/files/0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a1d61d68777373a50ae23b9dd83b428abe2f748d Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <pkj@axis.com> -Date: Sat, 21 Nov 2020 17:30:33 +0100 -Subject: [PATCH] pseudo_client: Simplify pseudo_client_ignore_path_chroot() - -This also plugs a memory leak by making sure env is freed. - -Change-Id: Ia8635fd2c6b1e85919e4743713a85e0b52c28fac ---- - pseudo_client.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/pseudo_client.c b/pseudo_client.c -index a8bc3dc..7dc0345 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -1538,23 +1538,22 @@ int pseudo_client_ignore_path_chroot(const char *path, int ignore_chroot) { - if (!env) - return 0; - -+ int ret = 0; - char *p = env; -- while (*p) { -+ while (p) { - char *next = strchr(p, ','); -- if (!next) -- next = strchr(p, '\0'); -- if ((next - p) && !strncmp(path, p, next - p)) { -- pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -- return 1; -- } -- if (next && *next != '\0') -- p = next+1; -- else -+ if (next) -+ *next++ = '\0'; -+ if (*p && !strncmp(path, p, strlen(p))) { -+ pseudo_debug(PDBGF_PATH | PDBGF_VERBOSE, "ignoring path: '%s'\n", path); -+ ret = 1; - break; -+ } -+ p = next; - } - free(env); - -- return 0; -+ return ret; - } - - int pseudo_client_ignore_path(const char *path) { diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index a9f7aa966a..7fa11a54e7 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -4,11 +4,9 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://0001-configure-Prune-PIE-flags.patch \ file://fallback-passwd \ file://fallback-group \ - file://0002-pseudo_client-Lessen-indentation-of-pseudo_client_ig.patch \ - file://0003-pseudo_client-Simplify-pseudo_client_ignore_path_chr.patch \ " -SRCREV = "69f205c41902e17933b81b1450636848e8da2126" +SRCREV = "1ee9a1e05e200f189f6644411ba9304e8a479b0b" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_5.41.4.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb index 416acc8d72..4d93cba868 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_5.41.4.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_5.43.3.bb @@ -7,8 +7,8 @@ PYPI_PACKAGE = "hypothesis" inherit pypi setuptools3 -SRC_URI[sha256sum] = "7ef22dd2ae4a906ef1e237dcd6806aa7f97e30c37f924a0e6d595f4639350b53" +SRC_URI[sha256sum] = "d97ba7ae2cfe7096b0c045fdb611ee9850ccdd6050a9b36cb96812242062c2cc" -RDEPENDS_${PN} += "python3-core" +RDEPENDS_${PN} += "python3-attrs python3-core python3-sortedcontainers" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.1.0.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb index d89621bedd..23f2e2dbaf 100644 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_3.3.0.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" inherit pypi setuptools3 -SRC_URI = "https://files.pythonhosted.org/packages/7d/d4/dbc58eed92be61bae65a7d80a7604d35bf6ded3e3c53c14f2d45b4a28831/importlib_metadata-3.1.0.tar.gz" -SRC_URI[sha256sum] = "d9b8a46a0885337627a6430db287176970fff18ad421becec1d64cfc763c2099" +PYPI_PACKAGE = "importlib_metadata" +UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" + +SRC_URI[sha256sum] = "5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed" S = "${WORKDIR}/importlib_metadata-${PV}" diff --git a/poky/meta/recipes-devtools/python/python3-packaging_20.4.bb b/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb index c75707e69c..658c3d1f33 100644 --- a/poky/meta/recipes-devtools/python/python3-packaging_20.4.bb +++ b/poky/meta/recipes-devtools/python/python3-packaging_20.8.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/pypa/packaging" LICENSE = "Apache-2.0 & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" -SRC_URI[md5sum] = "3208229da731c5d8e29d4d8941e75005" -SRC_URI[sha256sum] = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8" +SRC_URI[sha256sum] = "78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-py_1.9.0.bb b/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb index 794ec2a87e..4e16ad1743 100644 --- a/poky/meta/recipes-devtools/python/python3-py_1.9.0.bb +++ b/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb @@ -3,8 +3,7 @@ HOMEPAGE = "http://py.readthedocs.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" -SRC_URI[md5sum] = "b80db4e61eef724f49feb4d20b649e62" -SRC_URI[sha256sum] = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342" +SRC_URI[sha256sum] = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/python/python3-pygments_2.7.2.bb b/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb index 00e5dc6e30..379d85dbd7 100644 --- a/poky/meta/recipes-devtools/python/python3-pygments_2.7.2.bb +++ b/poky/meta/recipes-devtools/python/python3-pygments_2.7.3.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1f5d0c4cf38dfc8122c00d6f1a97a0cc" inherit setuptools3 -SRC_URI[sha256sum] = "381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0" +SRC_URI[sha256sum] = "ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716" DEPENDS += "\ ${PYTHON_PN} \ diff --git a/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch index 8c5c17247e..1abd531c62 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ b/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch @@ -1,8 +1,7 @@ -From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 +From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> Date: Wed, 28 Aug 2019 16:12:27 +0900 -Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for - setuptools-scm +Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm The setup_requires argument forces the download of the egg file for setuptools-scm during the do_compile phase. This download is incompatible with the typical fetch @@ -18,22 +17,20 @@ Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> Rebase for pytest 6.1.0. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg -index 60f6564..c4d1471 100644 +index 6ed0792..0137090 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -55,7 +55,6 @@ package_dir = +@@ -53,7 +53,6 @@ package_dir = =src setup_requires = - setuptools>=40.0 -- setuptools-scm + setuptools>=>=42.0 +- setuptools-scm>=3.4 zip_safe = no [options.entry_points] --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/python/python3-pytest_6.1.2.bb b/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb index 6fc3b6f328..6843b4da25 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest_6.1.2.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest_6.2.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " -SRC_URI[sha256sum] = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e" +SRC_URI[sha256sum] = "66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306" inherit update-alternatives pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb b/poky/meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb index 48bad2b99f..406404ec69 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools-scm_5.0.1.bb @@ -2,8 +2,7 @@ SUMMARY = "the blessed package to manage your versions by scm tags" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "e6c9fad17c90516d640868eb833d5150" -SRC_URI[sha256sum] = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8" +SRC_URI[sha256sum] = "c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a" PYPI_PACKAGE = "setuptools_scm" inherit pypi setuptools3 @@ -15,9 +14,11 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-json \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-toml \ " RDEPENDS_${PN}_class-native = "\ ${PYTHON_PN}-setuptools-native \ + ${PYTHON_PN}-toml-native \ " BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_50.3.2.bb b/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb index 4480d56775..6ee935f8f7 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_50.3.2.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_51.0.0.bb @@ -12,7 +12,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[sha256sum] = "ed0519d27a243843b05d82a5e9d01b0b083d9934eaa3d02779a23da18077bd3c" +SRC_URI[sha256sum] = "029c49fd713e9230f6a41c0298e6e1f5839f2cde7104c0ad5e053a37777e7688" DEPENDS += "${PYTHON_PN}" diff --git a/poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch b/poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch deleted file mode 100644 index b2053e7a47..0000000000 --- a/poky/meta/recipes-devtools/python/python3/CVE-2020-27619.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b664a1df4ee71d3760ab937653b10997081b1794 Mon Sep 17 00:00:00 2001 -From: "Miss Skeleton (bot)" <31488909+miss-islington@users.noreply.github.com> -Date: Tue, 6 Oct 2020 05:37:36 -0700 -Subject: [PATCH] bpo-41944: No longer call eval() on content received via HTTP - in the CJK codec tests (GH-22566) - -(cherry picked from commit 2ef5caa58febc8968e670e39e3d37cf8eef3cab8) - -Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> - -Upstream-Status: Backport [https://github.com/python/cpython/commit/b664a1df4ee71d3760ab937653b10997081b1794] -CVE: CVE-2020-27619 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> - ---- - Lib/test/multibytecodec_support.py | 22 +++++++------------ - .../2020-10-05-17-43-46.bpo-41944.rf1dYb.rst | 1 + - 2 files changed, 9 insertions(+), 14 deletions(-) - create mode 100644 Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst - -diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py -index cca8af67d6d1d..f76c0153f5ecf 100644 ---- a/Lib/test/multibytecodec_support.py -+++ b/Lib/test/multibytecodec_support.py -@@ -305,29 +305,23 @@ def test_mapping_file(self): - self._test_mapping_file_plain() - - def _test_mapping_file_plain(self): -- unichrs = lambda s: ''.join(map(chr, map(eval, s.split('+')))) -+ def unichrs(s): -+ return ''.join(chr(int(x, 16)) for x in s.split('+')) -+ - urt_wa = {} - - with self.open_mapping_file() as f: - for line in f: - if not line: - break -- data = line.split('#')[0].strip().split() -+ data = line.split('#')[0].split() - if len(data) != 2: - continue - -- csetval = eval(data[0]) -- if csetval <= 0x7F: -- csetch = bytes([csetval & 0xff]) -- elif csetval >= 0x1000000: -- csetch = bytes([(csetval >> 24), ((csetval >> 16) & 0xff), -- ((csetval >> 8) & 0xff), (csetval & 0xff)]) -- elif csetval >= 0x10000: -- csetch = bytes([(csetval >> 16), ((csetval >> 8) & 0xff), -- (csetval & 0xff)]) -- elif csetval >= 0x100: -- csetch = bytes([(csetval >> 8), (csetval & 0xff)]) -- else: -+ if data[0][:2] != '0x': -+ self.fail(f"Invalid line: {line!r}") -+ csetch = bytes.fromhex(data[0][2:]) -+ if len(csetch) == 1 and 0x80 <= csetch[0]: - continue - - unich = unichrs(data[1]) -diff --git a/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst -new file mode 100644 -index 0000000000000..4f9782f1c85af ---- /dev/null -+++ b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst -@@ -0,0 +1 @@ -+Tests for CJK codecs no longer call ``eval()`` on content received via HTTP. diff --git a/poky/meta/recipes-devtools/python/python3_3.9.0.bb b/poky/meta/recipes-devtools/python/python3_3.9.1.bb index 19a8950f15..17d0c032f7 100644 --- a/poky/meta/recipes-devtools/python/python3_3.9.0.bb +++ b/poky/meta/recipes-devtools/python/python3_3.9.1.bb @@ -29,7 +29,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ - file://CVE-2020-27619.patch \ " SRC_URI_append_class-native = " \ @@ -37,8 +36,7 @@ SRC_URI_append_class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " - -SRC_URI[sha256sum] = "9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854" +SRC_URI[sha256sum] = "991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 274c855d35..4864d7e93c 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -35,6 +35,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-24352.patch \ file://CVE-2020-29129-CVE-2020-29130.patch \ file://CVE-2020-25624.patch \ + file://CVE-2020-25723.patch \ + file://CVE-2020-28916.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" @@ -188,6 +190,7 @@ PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph" PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,," PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" INSANE_SKIP_${PN} = "arch" diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch new file mode 100644 index 0000000000..90b3a2f41c --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-25723.patch @@ -0,0 +1,51 @@ +From 2fdb42d840400d58f2e706ecca82c142b97bcbd6 Mon Sep 17 00:00:00 2001 +From: Li Qiang <liq3ea@163.com> +Date: Wed, 12 Aug 2020 09:17:27 -0700 +Subject: [PATCH] hw: ehci: check return value of 'usb_packet_map' + +If 'usb_packet_map' fails, we should stop to process the usb +request. + +Signed-off-by: Li Qiang <liq3ea@163.com> +Message-Id: <20200812161727.29412-1-liq3ea@163.com> +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> + +Upstream-Status: Backport +CVE: CVE-2020-25723 +[https://git.qemu.org/?p=qemu.git;a=commit;h=2fdb42d840400d58f2e706ecca82c142b97bcbd6] +Signed-off-by: Li Wang <li.wang@windriver.com> +--- + hw/usb/hcd-ehci.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c +index 1495e8f..1fbb02a 100644 +--- a/hw/usb/hcd-ehci.c ++++ b/hw/usb/hcd-ehci.c +@@ -1373,7 +1373,10 @@ static int ehci_execute(EHCIPacket *p, const char *action) + spd = (p->pid == USB_TOKEN_IN && NLPTR_TBIT(p->qtd.altnext) == 0); + usb_packet_setup(&p->packet, p->pid, ep, 0, p->qtdaddr, spd, + (p->qtd.token & QTD_TOKEN_IOC) != 0); +- usb_packet_map(&p->packet, &p->sgl); ++ if (usb_packet_map(&p->packet, &p->sgl)) { ++ qemu_sglist_destroy(&p->sgl); ++ return -1; ++ } + p->async = EHCI_ASYNC_INITIALIZED; + } + +@@ -1452,7 +1455,10 @@ static int ehci_process_itd(EHCIState *ehci, + if (ep && ep->type == USB_ENDPOINT_XFER_ISOC) { + usb_packet_setup(&ehci->ipacket, pid, ep, 0, addr, false, + (itd->transact[i] & ITD_XACT_IOC) != 0); +- usb_packet_map(&ehci->ipacket, &ehci->isgl); ++ if (usb_packet_map(&ehci->ipacket, &ehci->isgl)) { ++ qemu_sglist_destroy(&ehci->isgl); ++ return -1; ++ } + usb_handle_packet(dev, &ehci->ipacket); + usb_packet_unmap(&ehci->ipacket, &ehci->isgl); + } else { +-- +2.17.1 + diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch new file mode 100644 index 0000000000..5212196837 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/CVE-2020-28916.patch @@ -0,0 +1,49 @@ +From c2cb511634012344e3d0fe49a037a33b12d8a98a Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit <pjp@fedoraproject.org> +Date: Wed, 11 Nov 2020 18:36:36 +0530 +Subject: [PATCH] hw/net/e1000e: advance desc_offset in case of null +descriptor + +While receiving packets via e1000e_write_packet_to_guest() routine, +'desc_offset' is advanced only when RX descriptor is processed. And +RX descriptor is not processed if it has NULL buffer address. +This may lead to an infinite loop condition. Increament 'desc_offset' +to process next descriptor in the ring to avoid infinite loop. + +Reported-by: Cheol-woo Myung <330cjfdn@gmail.com> +Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> +Signed-off-by: Jason Wang <jasowang@redhat.com> + +Upstream-Status: Backport +CVE: CVE-2020-28916 +[https://git.qemu.org/?p=qemu.git;a=commit;h=c2cb511634012344e3d0fe49a037a33b12d8a98a] +Signed-off-by: Li Wang <li.wang@windriver.com> +--- + hw/net/e1000e_core.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c +index bcd186c..d3e3cdc 100644 +--- a/hw/net/e1000e_core.c ++++ b/hw/net/e1000e_core.c +@@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, + (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); + } + } +- desc_offset += desc_size; +- if (desc_offset >= total_size) { +- is_last = true; +- } + } else { /* as per intel docs; skip descriptors with null buf addr */ + trace_e1000e_rx_null_descriptor(); + } ++ desc_offset += desc_size; ++ if (desc_offset >= total_size) { ++ is_last = true; ++ } + + e1000e_write_rx_descr(core, desc, is_last ? core->rx_pkt : NULL, + rss_info, do_ps ? ps_hdr_len : 0, &bastate.written); +-- +2.17.1 + diff --git a/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 30975faeaf..38d755205c 100644 --- a/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch @@ -1,4 +1,4 @@ -From 4fd37bc9d8d0777aa038777dd81a76b64f536efd Mon Sep 17 00:00:00 2001 +From 9bbe3f8564705aafcdcc5f2f033f9241a97f47c6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 186e4aeec..5df252085 100644 +index 6c78568e4..76b1d40e4 100644 --- a/configure.ac +++ b/configure.ac -@@ -944,7 +944,7 @@ else +@@ -966,7 +966,7 @@ else usrprefix=$prefix fi @@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index b46c6b7da..02d5c7a0a 100644 +index cd40a16be..e6941e09f 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@ @@ -55,4 +55,4 @@ index b46c6b7da..02d5c7a0a 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 10:0:1 + rpm_version_info = 10:2:1 diff --git a/poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch b/poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch deleted file mode 100644 index c7ae158f8d..0000000000 --- a/poky/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9de15c7e1f4ca23a10edb9a3b657f06b2b13e841 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 20 Oct 2020 22:16:39 +0200 -Subject: [PATCH] rpmdb.c: add a missing include - -This addressed build failures on non-glibc systems. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - lib/rpmdb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/rpmdb.c b/lib/rpmdb.c -index 4c101569f..73187630b 100644 ---- a/lib/rpmdb.c -+++ b/lib/rpmdb.c -@@ -8,6 +8,7 @@ - #include <utime.h> - #include <errno.h> - #include <dirent.h> -+#include <fcntl.h> - - #ifndef DYING /* XXX already in "system.h" */ - #include <fnmatch.h> diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb b/poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb index 4125f3f9d0..9195d66dd1 100644 --- a/poky/meta/recipes-devtools/rpm/rpm_4.16.0.bb +++ b/poky/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb @@ -39,12 +39,11 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ - file://0001-rpmdb.c-add-a-missing-include.patch \ file://0001-tools-Add-error.h-for-non-glibc-case.patch \ " PE = "1" -SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0" +SRCREV = "278883a704ea36c97974d0f2d65d41abe78b0e2a" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index a38b3fe624..7b6d4edc61 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "\ file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " -DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" +DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" diff --git a/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch b/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch deleted file mode 100644 index cd53f33f60..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 387d3b6fba95cb47c4dacc6bcd330148a9168850 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 7 Oct 2020 12:54:03 -0700 -Subject: [PATCH] xlat: Mark IPPROTO_MAX last in IPPROTO_* constants - -* xlat/inet_protocols.in (IPPROTO_MAX): It should be the last entry - after adding IPPROTO_MPTCP this should have new value as - IPPROTO_MPTCP + 1. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2020-October/010253.html] ---- - xlat/inet_protocols.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/xlat/inet_protocols.in -+++ b/xlat/inet_protocols.in -@@ -32,5 +32,5 @@ IPPROTO_UDPLITE 136 - IPPROTO_MPLS 137 - IPPROTO_ETHERNET 143 - IPPROTO_RAW 255 --IPPROTO_MAX 256 - IPPROTO_MPTCP 262 -+IPPROTO_MAX 263 ---- a/xlat/inet_protocols.h -+++ b/xlat/inet_protocols.h -@@ -234,19 +234,19 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else - # define IPPROTO_RAW 255 - #endif --#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX) -+#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256"); -+static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define IPPROTO_MAX 256 -+# define IPPROTO_MPTCP 262 - #endif --#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP) -+#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262"); -+static_assert((IPPROTO_MAX) == (263), "IPPROTO_MAX != 263"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define IPPROTO_MPTCP 262 -+# define IPPROTO_MAX 263 - #endif - - #ifndef XLAT_MACROS_ONLY -@@ -353,12 +353,12 @@ static const struct xlat_data inet_proto - XLAT(IPPROTO_RAW), - #define XLAT_VAL_32 ((unsigned) (IPPROTO_RAW)) - #define XLAT_STR_32 STRINGIFY(IPPROTO_RAW) -- XLAT(IPPROTO_MAX), -- #define XLAT_VAL_33 ((unsigned) (IPPROTO_MAX)) -- #define XLAT_STR_33 STRINGIFY(IPPROTO_MAX) - XLAT(IPPROTO_MPTCP), -- #define XLAT_VAL_34 ((unsigned) (IPPROTO_MPTCP)) -- #define XLAT_STR_34 STRINGIFY(IPPROTO_MPTCP) -+ #define XLAT_VAL_33 ((unsigned) (IPPROTO_MPTCP)) -+ #define XLAT_STR_33 STRINGIFY(IPPROTO_MPTCP) -+ XLAT(IPPROTO_MAX), -+ #define XLAT_VAL_34 ((unsigned) (IPPROTO_MAX)) -+ #define XLAT_STR_34 STRINGIFY(IPPROTO_MAX) - }; - const struct xlat inet_protocols[1] = { { - .data = inet_protocols_xdata, diff --git a/poky/meta/recipes-devtools/strace/strace_5.9.bb b/poky/meta/recipes-devtools/strace/strace_5.10.bb index bee2616a44..22572fb935 100644 --- a/poky/meta/recipes-devtools/strace/strace_5.9.bb +++ b/poky/meta/recipes-devtools/strace/strace_5.10.bb @@ -14,9 +14,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ - file://0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch \ " -SRC_URI[sha256sum] = "39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9" +SRC_URI[sha256sum] = "fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c" inherit autotools ptest @@ -47,10 +46,14 @@ do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} install -m 755 ${S}/test-driver ${D}${PTEST_PATH} install -m 644 ${B}/config.h ${D}${PTEST_PATH} - sed -i -e '/^src/s/strace.*[1-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile + sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" +RDEPENDS_${PN}-ptest_append_libc-glibc = "\ + locale-base-en-us.iso-8859-1 \ +" + BBCLASSEXTEND = "native" TOOLCHAIN = "gcc" diff --git a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index 3e7eef3a75..1b0b45f2fa 100644 --- a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -4,10 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://README;beginline=35;endline=41;md5=558f2c71cb1fb9ba511ccd4858e48e8a" -# If you really want to run syslinux, you need mtools. We just want the -# ldlinux.* stuff for now, so skip mtools-native DEPENDS = "nasm-native util-linux e2fsprogs" -PV = "6.04-pre2" SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz \ file://syslinux-remove-clean-script.patch \ @@ -27,64 +24,77 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94" +RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken" UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/" UPSTREAM_CHECK_REGEX = "syslinux-(?P<pver>.+)\.tar" UPSTREAM_VERSION_UNKNOWN = "1" -COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' +# We can build the native parts anywhere, but the target has to be x86 +COMPATIBLE_HOST_class-target = '(x86_64|i.86).*-(linux|freebsd.*)' + # Don't let the sanity checker trip on the 32 bit real mode BIOS binaries INSANE_SKIP_${PN}-misc = "arch" INSANE_SKIP_${PN}-chain = "arch" +# When building the installer, CC is used to link. When building the bootloader, +# LD is used. However, these variables assume that GCC is used and break the +# build, so unset them. +TARGET_LDFLAGS = "" +SECURITY_LDFLAGS = "" +LDFLAGS_SECTION_REMOVAL = "" + EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \ + CC="${CC} ${CFLAGS} ${LDFLAGS}" \ + LD="${LD} ${LDFLAGS}" \ + OBJDUMP="${OBJDUMP}" \ + OBJCOPY="${OBJCOPY}" \ + AR="${AR}" \ + STRIP="${STRIP}" \ + NM="${NM}" \ + RANLIB="${RANLIB}" \ " +# +# Tasks for native/nativesdk which just build the installer. +# do_configure() { - # drop win32 targets or build fails - sed -e 's,win32/\S*,,g' -i Makefile - - # clean installer executables included in source tarball - oe_runmake clean firmware="efi32" EFIINC="${includedir}" - # NOTE: There is a temporary work around above to specify - # the efi32 as the firmware else the pre-built bios - # files get erased contrary to the doc/distib.txt - # In the future this should be "bios" and not "efi32". + oe_runmake firmware="bios" clean } do_compile() { - # Make sure the recompile is OK. - # Though the ${B} should always exist, still check it before find and rm. - [ -d "${B}" ] && find ${B} -name '.*.d' -type f -exec rm -f {} \; - - # Rebuild only the installer; keep precompiled bootloaders - # as per author's request (doc/distrib.txt) - oe_runmake CC="${CC} ${CFLAGS}" \ - LD="${LD}" LDFLAGS="${LDFLAGS}" \ - OBJDUMP="${OBJDUMP}" \ - OBJCOPY="${OBJCOPY}" \ - AR="${AR}" \ - STRIP="${STRIP}" \ - NM="${NM}" \ - RANLIB="${RANLIB}" \ - firmware="bios" installer + oe_runmake firmware="bios" installer } do_install() { - oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" \ - OBJDUMP="${OBJDUMP}" \ - OBJCOPY="${OBJCOPY}" \ - AR="${AR}" \ - STRIP="${STRIP}" \ - NM="${NM}" \ - RANLIB="${RANLIB}" \ - firmware="bios" install INSTALLROOT="${D}" + install -d ${D}${bindir} + install \ + ${B}/bios/mtools/syslinux \ + ${B}/bios/extlinux/extlinux \ + ${B}/bios/utils/isohybrid \ + ${D}${bindir} +} + +# +# Tasks for target which ship the precompiled bootloader and installer +# +do_configure_class-target() { + # No need to do anything as we're mostly shipping the precompiled binaries + : +} + +do_compile_class-target() { + # No need to do anything as we're mostly shipping the precompiled binaries + : +} + +do_install_class-target() { + oe_runmake firmware="bios" install INSTALLROOT="${D}" install -d ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/ - install -m 755 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/ } PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb index a7a1f0ff1a..4c857c3fd0 100644 --- a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb @@ -14,9 +14,7 @@ SRC_URI_append_libc-musl = " \ " -# Modify these as desired -PV = "233+git${SRCPV}" -SRCREV = "fe1c5e41e6bdb78043dad8fa863fc2df66d1dadf" +SRCREV = "8183cfd9dad8beca5434d625cf6b2df87775e956" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/vala/vala_0.50.1.bb b/poky/meta/recipes-devtools/vala/vala_0.50.2.bb index cca7eef523..b5913fca8b 100644 --- a/poky/meta/recipes-devtools/vala/vala_0.50.1.bb +++ b/poky/meta/recipes-devtools/vala/vala_0.50.2.bb @@ -2,4 +2,4 @@ require ${BPN}.inc SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch" -SRC_URI[sha256sum] = "958d9f06c9c3d7d1b2145512a9bc2a7c6aefbbf0416a04c7a0ecf463f7138f6c" +SRC_URI[sha256sum] = "2c0d5dc6d65d070f724063075424c403765ab7935c9e6fbcb84981b94d07ceda" diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index a3a0c6e50f..93bfd45a4e 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -31,8 +31,6 @@ drd/tests/annotate_static drd/tests/annotate_trace_memory drd/tests/annotate_trace_memory_xml drd/tests/atomic_var -drd/tests/bar_bad -drd/tests/bar_bad_xml drd/tests/bar_trivial drd/tests/bug-235681 drd/tests/bug322621 diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all new file mode 100644 index 0000000000..d6a85c4735 --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all @@ -0,0 +1,2 @@ +drd/tests/bar_bad +drd/tests/bar_bad_xml diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest index 97b0a85dbf..7217dfca5d 100755 --- a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -17,6 +17,12 @@ EXP_TOOLS="exp-bbv exp-dhat exp-sgcheck" GDB_BIN=@bindir@/gdb cd ${VALGRIND_LIB}/ptest && ./gdbserver_tests/make_local_links ${GDB_BIN} +echo "Hide valgrind tests that are non-deterministic" +echo "Reported at https://bugs.kde.org/show_bug.cgi?id=430321" +for i in `cat remove-for-all`; do + mv $i.vgtest $i.IGNORE; +done + arch=`arch` if [ "$arch" = "aarch64" ]; then echo "Aarch64: Hide valgrind tests that result in defunct process and then out of memory" @@ -44,6 +50,10 @@ if [ "$arch" = "aarch64" ]; then done fi +echo "Restore valgrind tests that are non-deterministc" +for i in `cat remove-for-all`; do + mv $i.IGNORE $i.vgtest; +done passed=`grep PASS: ${LOG}|wc -l` failed=`grep FAIL: ${LOG}|wc -l` diff --git a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb index 5db181ac14..25fa58249c 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb @@ -16,6 +16,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ file://run-ptest \ file://remove-for-aarch64 \ + file://remove-for-all \ file://0004-Fix-out-of-tree-builds.patch \ file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ @@ -186,6 +187,7 @@ do_install_ptest() { # The scripts reference config.h so add it to the top ptest dir. cp ${B}/config.h ${D}${PTEST_PATH} install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} + install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} # Add an executable need by none/tests/bigcode mkdir ${D}${PTEST_PATH}/perf diff --git a/poky/meta/recipes-extended/acpica/acpica_20201113.bb b/poky/meta/recipes-extended/acpica/acpica_20201217.bb index f2d17ca54e..91bcd8a46d 100644 --- a/poky/meta/recipes-extended/acpica/acpica_20201113.bb +++ b/poky/meta/recipes-extended/acpica/acpica_20201217.bb @@ -17,7 +17,7 @@ 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[sha256sum] = "48c4e0c07b42581d017487cc9264470e6420605ddd24cbb5d16410d02a771461" +SRC_URI[sha256sum] = "df6bb667c60577c89df5abe3270539c1b9716b69409d1074d6a7fc5c2fea087b" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" diff --git a/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch index 7b2073201e..7b2073201e 100644 --- a/poky/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch +++ b/poky/meta/recipes-extended/bash/bash/CVE-2019-18276.patch diff --git a/poky/meta/recipes-extended/bash/bash_5.0.bb b/poky/meta/recipes-extended/bash/bash_5.0.bb index 257a03bd8b..53e05869ce 100644 --- a/poky/meta/recipes-extended/bash/bash_5.0.bb +++ b/poky/meta/recipes-extended/bash/bash_5.0.bb @@ -30,7 +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 \ + file://CVE-2019-18276.patch \ " SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" diff --git a/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am b/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am index d4498947e8..7338df03eb 100644 --- a/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am +++ b/poky/meta/recipes-extended/bzip2/bzip2/Makefile.am @@ -46,7 +46,7 @@ runtest: else echo "FAIL: sample2 decompress"; fi @if cmp sample3.tst sample3.ref; then echo "PASS: sample3 decompress";\ else echo "FAIL: sample3 decompress"; fi - ./bzip2-tests/run-tests.sh --tests-dir="$(PWD)/bzip2-tests" + ./bzip2-tests/run-tests.sh --without-valgrind --tests-dir="$(PWD)/bzip2-tests" install-ptest: sed -n '/^runtest:/,/^install-ptest:/{/^install-ptest:/!p}' \ diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index df8d4d284a..e7a704134c 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -20,6 +20,10 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" +# Issue only applies to MacOS +CVE_CHECK_WHITELIST += "CVE-2008-1033" +# Issue affects pdfdistiller plugin used with but not part of cups +CVE_CHECK_WHITELIST += "CVE-2009-0032" # This is an Ubuntu only issue. CVE_CHECK_WHITELIST += "CVE-2018-6553" diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 673b35033f..54aec01284 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 538bd5ec36d88f17803cb848cbbfe62ad51fc2f4 Mon Sep 17 00:00:00 2001 +From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0162155..6866e72 100644 +index 13c2bc0..0b6ca1d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.9, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.10, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.9.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.10.bb index 2d2f9b77f0..5c0df3acbc 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_5.9.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_5.10.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "f934a830554c46d7d60b1a9147f4cab15589b7e09344c4b79b1948b740f0a725" +SRC_URI[sha256sum] = "4b86adb3ed913c1ef14a276301981f696ab4ec360c19f0a5b68235c4756abae5" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" diff --git a/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb b/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb index 8c6411c867..ae897be62e 100644 --- a/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb +++ b/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb @@ -53,4 +53,8 @@ do_install_ptest() { RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest_append_libc-glibc = "\ + locale-base-en-us.iso-8859-1 \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/grep/grep_3.6.bb b/poky/meta/recipes-extended/grep/grep_3.6.bb index edf9b29c8f..cb009b9132 100644 --- a/poky/meta/recipes-extended/grep/grep_3.6.bb +++ b/poky/meta/recipes-extended/grep/grep_3.6.bb @@ -41,3 +41,5 @@ ALTERNATIVE_${PN} = "grep egrep fgrep" ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/groff/groff_1.22.4.bb b/poky/meta/recipes-extended/groff/groff_1.22.4.bb index e398478349..0867452ce7 100644 --- a/poky/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/poky/meta/recipes-extended/groff/groff_1.22.4.bb @@ -28,7 +28,7 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bind EXTRA_OECONF = "--without-x --without-doc" PARALLEL_MAKE = "" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no' PAGE=A4" do_install_append() { # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location diff --git a/poky/meta/recipes-extended/libaio/libaio/destdir.patch b/poky/meta/recipes-extended/libaio/libaio/destdir.patch deleted file mode 100644 index 0f90406bee..0000000000 --- a/poky/meta/recipes-extended/libaio/libaio/destdir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -from openembedded, added by Qing He <qing.he@intel.com> - -Index: libaio-0.3.110/Makefile -=================================================================== ---- libaio-0.3.110.orig/Makefile -+++ libaio-0.3.110/Makefile -@@ -15,7 +15,7 @@ all: - @$(MAKE) -C src - - install: -- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) -+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - check: - @$(MAKE) -C harness check diff --git a/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch b/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch index 0b1f475697..cc91ea99d9 100644 --- a/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch +++ b/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch @@ -12,26 +12,22 @@ undefined reference to `__stack_chk_fail_local' Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@intel.com> --- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index eadb336..56ab701 100644 +index 37ae219..22e0c9a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -3,10 +3,10 @@ includedir=$(prefix)/include - libdir=$(prefix)/lib - - CFLAGS ?= -g -fomit-frame-pointer -O2 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += -Wall -I. -fPIC +@@ -6,7 +6,7 @@ CFLAGS ?= -g -fomit-frame-pointer -O2 + CFLAGS += -Wall -I. -fPIC SO_CFLAGS=-shared $(CFLAGS) L_CFLAGS=$(CFLAGS) -LINK_FLAGS= +LINK_FLAGS=$(LDFLAGS) LINK_FLAGS+=$(LDFLAGS) + ENABLE_SHARED ?= 1 - soname=libaio.so.1 -- -2.1.4 +2.25.1 diff --git a/poky/meta/recipes-extended/libaio/libaio_0.3.111.bb b/poky/meta/recipes-extended/libaio/libaio_0.3.112.bb index 8e1cd349a0..b3606474a5 100644 --- a/poky/meta/recipes-extended/libaio/libaio_0.3.111.bb +++ b/poky/meta/recipes-extended/libaio/libaio_0.3.112.bb @@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "git://pagure.io/libaio.git;protocol=https \ file://00_arches.patch \ - file://destdir.patch \ file://libaio_fix_for_mips_syscalls.patch \ file://system-linkage.patch \ " -SRCREV = "f66be22ab0a59a39858900ab72a8c6a6e8b0b7ec" +SRCREV = "d025927efa75a0d1b46ca3a5ef331caa2f46ee0e" S = "${WORKDIR}/git" EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" diff --git a/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb b/poky/meta/recipes-extended/libtirpc/libtirpc_1.3.1.bb index 10a324c3b6..5792264250 100644 --- a/poky/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb +++ b/poky/meta/recipes-extended/libtirpc/libtirpc_1.3.1.bb @@ -12,8 +12,7 @@ PROVIDES = "virtual/librpc" 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] = "b25f9cc18bfad50f7c446c77f4ae00bb" -SRC_URI[sha256sum] = "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc" +SRC_URI[sha256sum] = "245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17" inherit autotools pkgconfig diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.56.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb index 97d3a2aabf..9a9cad68c8 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.56.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.57.bb @@ -19,8 +19,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "9d94f68c8106bfcdfe7aafa0a13f45a8" -SRC_URI[sha256sum] = "e4ce84cd79e8ae8ba193c7a7cc79c4afba9a076b443ef9f8d4bcd13a3354df77" +SRC_URI[sha256sum] = "52ca961b89c12f7ecbb2e4e0c5a9e79b2863c64e33c42832a165e7f894d6217f" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch b/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch new file mode 100644 index 0000000000..381ac417ca --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch @@ -0,0 +1,33 @@ +From 6c2085badea7b461245837c452a0d3d8a8c2afff Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 Dec 2020 22:09:28 -0800 +Subject: [PATCH] ltp-pan: Use long long int to print time_t + +Some newer 32bit architectures ( e.g. riscv32 ) uses 64bit time_t so +using %ld is not sufficient to print time_t, this also fixes a crash in +ltp-pan on riscv32 + +Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20201221061415.2540216-1-raj.khem@gmail.com/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pan/ltp-pan.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pan/ltp-pan.c b/pan/ltp-pan.c +index 8b9fbe5594..54b7cb8f26 100644 +--- a/pan/ltp-pan.c ++++ b/pan/ltp-pan.c +@@ -1389,8 +1389,8 @@ static void write_test_start(struct tag_pgrp *running, int no_kmsg) + if (!strcmp(reporttype, "rts")) { + + printf +- ("%s\ntag=%s stime=%ld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n", +- "<<<test_start>>>", running->cmd->name, running->mystime, ++ ("%s\ntag=%s stime=%lld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n", ++ "<<<test_start>>>", running->cmd->name, (long long)running->mystime, + running->cmd->cmdline, "", "exit", "<<<test_output>>>"); + } + fflush(stdout); +-- +2.29.2 + diff --git a/poky/meta/recipes-extended/ltp/ltp_20200930.bb b/poky/meta/recipes-extended/ltp/ltp_20200930.bb index 7acf15b360..e3c49fbf53 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20200930.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20200930.bb @@ -34,6 +34,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ + file://0001-ltp-pan-Use-long-long-int-to-print-time_t.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb b/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb index 0e6016a73c..e8da92bd19 100644 --- a/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb +++ b/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb @@ -11,6 +11,7 @@ SRC_URI[sha256sum] = "fa5aa11ab0692daf737e76947f45669225db310b2801a5911bceb7551c DEPENDS = "libpipeline gdbm groff-native base-passwd" RDEPENDS_${PN} += "base-passwd" +PACKAGE_WRITE_DEPS += "base-passwd" # | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' USE_NLS_libc-musl = "no" @@ -20,6 +21,11 @@ inherit gettext pkgconfig autotools systemd EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" EXTRA_AUTORECONF += "-I ${S}/gl/m4" +# Can be dropped when the output next changes, avoids failures after +# reproducibility issues +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + do_install() { autotools_do_install diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.09.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.10.bb index 00d6eb5c2e..8874516aa2 100644 --- a/poky/meta/recipes-extended/man-pages/man-pages_5.09.bb +++ b/poky/meta/recipes-extended/man-pages/man-pages_5.10.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "3bd9029b94520c730fe1a1fb78ed7d8d878236da0f725ca86ee71c1969de6c4f" +SRC_URI[sha256sum] = "f2ce94a7250c49910db91806996699e1deac656097d4d53bdf56bdab4b61f228" inherit manpages 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 c584b7589e..12003ff49e 100644 --- a/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb +++ b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb @@ -29,3 +29,5 @@ do_install() { } RRECOMMENDS_${PN} += "lrzsz" + +RDEPENDS_${PN} += "ncurses-terminfo-base" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb index 994f1c5d90..3bd5f9edeb 100644 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.13.bb +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "ada945ab8d519102bb632f197273b3326ded25b38c003b0cf3861d1d6d4a9bb9" +SRC_URI[sha256sum] = "d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4" inherit gettext autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch b/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch deleted file mode 100644 index c55b648139..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 45d1ed58927593968faead7dbb295f3922f41a2f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Aug 2015 14:16:43 -0700 -Subject: [PATCH] Add support for defining missing funcitonality - -In order to support alternative libc on linux ( musl, bioninc ) etc we -need to check for glibc-only features and provide alternatives, in this -list strndupa is first one, when configure detects that its not included -in system C library then the altrnative implementation from missing.h is -used - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 3 +++ - libpam/include/missing.h | 12 ++++++++++++ - modules/pam_exec/pam_exec.c | 1 + - 3 files changed, 16 insertions(+) - create mode 100644 libpam/include/missing.h - -diff --git a/configure.ac b/configure.ac -index 9e1257f..cbed979 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -599,6 +599,9 @@ dnl - AC_CHECK_DECL(__NR_keyctl, [have_key_syscalls=1],[have_key_syscalls=0],[#include <sys/syscall.h>]) - AC_CHECK_DECL(ENOKEY, [have_key_errors=1],[have_key_errors=0],[#include <errno.h>]) - -+# musl and bionic don't have strndupa -+AC_CHECK_DECLS_ONCE([strndupa]) -+ - HAVE_KEY_MANAGEMENT=0 - if test $have_key_syscalls$have_key_errors = 11 - then -diff --git a/libpam/include/missing.h b/libpam/include/missing.h -new file mode 100644 -index 0000000..3cf011c ---- /dev/null -+++ b/libpam/include/missing.h -@@ -0,0 +1,12 @@ -+#pragma once -+ -+#if !HAVE_DECL_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ memcpy(__new, __old, __len); \ -+ }) -+#endif -diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c -index 17ba6ca..3aa2694 100644 ---- a/modules/pam_exec/pam_exec.c -+++ b/modules/pam_exec/pam_exec.c -@@ -59,6 +59,7 @@ - #include <security/pam_modutil.h> - #include <security/pam_ext.h> - #include <security/_pam_macros.h> -+#include <missing.h> - - #define ENV_ITEM(n) { (n), #n } - static struct { --- -2.1.4 - diff --git a/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch b/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch new file mode 100644 index 0000000000..5c6bc92705 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch @@ -0,0 +1,28 @@ +From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 6 Jan 2021 12:08:20 +0800 +Subject: [PATCH] Makefile.am: support usrmage + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index ddd5fc0..a1f1bec 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = /lib/systemd/system ++servicedir = $(systemd_system_unitdir) + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch b/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch new file mode 100644 index 0000000000..b41d1e5962 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch @@ -0,0 +1,28 @@ +From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sun, 27 Dec 2020 00:30:45 +0100 +Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd + unit file + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index 21e1b33..ddd5fc0 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = $(prefix)/lib/systemd/system ++servicedir = /lib/systemd/system + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.24.0 + diff --git a/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch b/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch deleted file mode 100644 index 917a8af64d..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b86575ab4a0df07da160283459da270e1c0372a0 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Tue, 24 May 2016 14:11:09 +0300 -Subject: [PATCH] crypt_configure - -This patch fixes a case where it find crypt defined in libc (musl) but -not in specified libraries then it ends up assigning -LIBCRYPT="-l" which then goes into makefile cause all sort of problems -e.g. - -ld: cannot find -l-m32 -| collect2: error: ld returned 1 exit status -The reason is that -l appears on commandline with -out any library and compiler treats the next argument as library name -whatever it is. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index df39d07..e68d856 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -401,7 +401,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], - [crypt_libs="crypt"]) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_lib:+-l$ac_lib}", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[$crypt_libs], [test "$ac_cv_search_crypt" = "none required" || LIBCRYPT="$ac_cv_search_crypt"]) - AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) --- -2.4.0 - diff --git a/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch b/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch deleted file mode 100644 index e4eb95669b..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch +++ /dev/null @@ -1,59 +0,0 @@ -This patch adds missing include for paths.h which should provide -_PATH_LASTLOG definition - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c -=================================================================== ---- Linux-PAM-1.1.6.orig/modules/pam_lastlog/pam_lastlog.c -+++ Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c -@@ -23,9 +23,11 @@ - #include <stdarg.h> - #include <stdio.h> - #include <string.h> -+#include <sys/file.h> - #include <sys/types.h> - #include <syslog.h> - #include <unistd.h> -+#include <paths.h> - - #if defined(hpux) || defined(sunos) || defined(solaris) - # ifndef _PATH_LASTLOG -@@ -332,6 +334,23 @@ last_login_read(pam_handle_t *pamh, int - return retval; - } - -+#ifndef __GLIBC__ -+static void logwtmp(const char * line, const char * name, const char * host) -+{ -+ struct utmp u; -+ memset(&u, 0, sizeof(u)); -+ -+ u.ut_pid = getpid(); -+ u.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; -+ strncpy(u.ut_line, line, sizeof(u.ut_line)); -+ strncpy(u.ut_name, name, sizeof(u.ut_name)); -+ strncpy(u.ut_host, host, sizeof(u.ut_host)); -+ gettimeofday(&(u.ut_tv), NULL); -+ -+ updwtmp(_PATH_WTMP, &u); -+} -+#endif /* __GLIBC__ */ -+ - static int - last_login_write(pam_handle_t *pamh, int announce, int last_fd, - uid_t uid, const char *user) -Index: Linux-PAM-1.1.6/modules/Makefile.am -=================================================================== ---- Linux-PAM-1.1.6.orig/modules/Makefile.am -+++ Linux-PAM-1.1.6/modules/Makefile.am -@@ -7,7 +7,7 @@ SUBDIRS = pam_access pam_cracklib pam_de - pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ - pam_listfile pam_localuser pam_loginuid pam_mail \ - pam_mkhomedir pam_motd pam_namespace pam_nologin \ -- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ -+ pam_permit pam_pwhistory pam_rootok pam_securetty \ - pam_selinux pam_sepermit pam_shells pam_stress \ - pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ - pam_tty_audit pam_umask \ diff --git a/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch deleted file mode 100644 index 9b8d4c2975..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch +++ /dev/null @@ -1,203 +0,0 @@ -Description: extract the securetty logic for use with the "nullok_secure" option - introduced in the "055_pam_unix_nullok_secure" patch. - -Upstream-Status: Pending - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -=================================================================== -Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am -=================================================================== ---- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am -+++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am -@@ -24,6 +24,10 @@ endif - securelib_LTLIBRARIES = pam_securetty.la - pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la - -+pam_securetty_la_SOURCES = \ -+ pam_securetty.c \ -+ tty_secure.c -+ - if ENABLE_REGENERATE_MAN - noinst_DATA = README - README: pam_securetty.8.xml -Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c -=================================================================== ---- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c -+++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c -@@ -1,7 +1,5 @@ - /* pam_securetty module */ - --#define SECURETTY_FILE "/etc/securetty" --#define TTY_PREFIX "/dev/" - #define CMDLINE_FILE "/proc/cmdline" - #define CONSOLEACTIVE_FILE "/sys/class/tty/console/active" - -@@ -40,6 +38,9 @@ - #include <security/pam_modutil.h> - #include <security/pam_ext.h> - -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, -+ const char *uttyname); -+ - #define PAM_DEBUG_ARG 0x0001 - #define PAM_NOCONSOLE_ARG 0x0002 - -@@ -73,11 +74,7 @@ securetty_perform_check (pam_handle_t *p - const char *username; - const char *uttyname; - const void *void_uttyname; -- char ttyfileline[256]; -- char ptname[256]; -- struct stat ttyfileinfo; - struct passwd *user_pwd; -- FILE *ttyfile; - - /* log a trail for debugging */ - if (ctrl & PAM_DEBUG_ARG) { -@@ -105,50 +102,7 @@ securetty_perform_check (pam_handle_t *p - return PAM_SERVICE_ERR; - } - -- /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ -- if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) { -- uttyname += sizeof(TTY_PREFIX)-1; -- } -- -- if (stat(SECURETTY_FILE, &ttyfileinfo)) { -- pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", SECURETTY_FILE); -- return PAM_SUCCESS; /* for compatibility with old securetty handling, -- this needs to succeed. But we still log the -- error. */ -- } -- -- if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { -- /* If the file is world writable or is not a -- normal file, return error */ -- pam_syslog(pamh, LOG_ERR, -- "%s is either world writable or not a normal file", -- SECURETTY_FILE); -- return PAM_AUTH_ERR; -- } -- -- ttyfile = fopen(SECURETTY_FILE,"r"); -- if (ttyfile == NULL) { /* Check that we opened it successfully */ -- pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); -- return PAM_SERVICE_ERR; -- } -- -- if (isdigit(uttyname[0])) { -- snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); -- } else { -- ptname[0] = '\0'; -- } -- -- retval = 1; -- -- while ((fgets(ttyfileline, sizeof(ttyfileline)-1, ttyfile) != NULL) -- && retval) { -- if (ttyfileline[strlen(ttyfileline) - 1] == '\n') -- ttyfileline[strlen(ttyfileline) - 1] = '\0'; -- -- retval = ( strcmp(ttyfileline, uttyname) -- && (!ptname[0] || strcmp(ptname, uttyname)) ); -- } -- fclose(ttyfile); -+ retval = _pammodutil_tty_secure(pamh, uttyname); - - if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { - FILE *cmdlinefile; -Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c -=================================================================== ---- /dev/null -+++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c -@@ -0,0 +1,90 @@ -+/* -+ * A function to determine if a particular line is in /etc/securetty -+ */ -+ -+ -+#define SECURETTY_FILE "/etc/securetty" -+#define TTY_PREFIX "/dev/" -+ -+/* This function taken out of pam_securetty by Sam Hartman -+ * <hartmans@debian.org>*/ -+/* -+ * by Elliot Lee <sopwith@redhat.com>, Red Hat Software. -+ * July 25, 1996. -+ * Slight modifications AGM. 1996/12/3 -+ */ -+ -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <security/pam_modules.h> -+#include <stdarg.h> -+#include <syslog.h> -+#include <sys/syslog.h> -+#include <stdio.h> -+#include <string.h> -+#include <stdlib.h> -+#include <ctype.h> -+#include <security/pam_modutil.h> -+#include <security/pam_ext.h> -+ -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, -+ const char *uttyname); -+ -+int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname) -+{ -+ int retval = PAM_AUTH_ERR; -+ char ttyfileline[256]; -+ char ptname[256]; -+ struct stat ttyfileinfo; -+ FILE *ttyfile; -+ /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ -+ if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) -+ uttyname += sizeof(TTY_PREFIX)-1; -+ -+ if (stat(SECURETTY_FILE, &ttyfileinfo)) { -+ pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", -+ SECURETTY_FILE); -+ return PAM_SUCCESS; /* for compatibility with old securetty handling, -+ this needs to succeed. But we still log the -+ error. */ -+ } -+ -+ if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { -+ /* If the file is world writable or is not a -+ normal file, return error */ -+ pam_syslog(pamh, LOG_ERR, -+ "%s is either world writable or not a normal file", -+ SECURETTY_FILE); -+ return PAM_AUTH_ERR; -+ } -+ -+ ttyfile = fopen(SECURETTY_FILE,"r"); -+ if(ttyfile == NULL) { /* Check that we opened it successfully */ -+ pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); -+ return PAM_SERVICE_ERR; -+ } -+ -+ if (isdigit(uttyname[0])) { -+ snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); -+ } else { -+ ptname[0] = '\0'; -+ } -+ -+ retval = 1; -+ -+ while ((fgets(ttyfileline,sizeof(ttyfileline)-1, ttyfile) != NULL) -+ && retval) { -+ if(ttyfileline[strlen(ttyfileline) - 1] == '\n') -+ ttyfileline[strlen(ttyfileline) - 1] = '\0'; -+ retval = ( strcmp(ttyfileline,uttyname) -+ && (!ptname[0] || strcmp(ptname, uttyname)) ); -+ } -+ fclose(ttyfile); -+ -+ if(retval) { -+ retval = PAM_AUTH_ERR; -+ } -+ -+ return retval; -+} diff --git a/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch deleted file mode 100644 index d2cc66882e..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch +++ /dev/null @@ -1,195 +0,0 @@ -From b6545b83f94c5fb7aec1478b8d458a1393f479c8 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Wed, 25 May 2016 14:12:25 +0300 -Subject: [PATCH] pam_unix: support 'nullok_secure' option - -Debian patch to add a new 'nullok_secure' option to pam_unix, -which accepts users with null passwords only when the applicant is -connected from a tty listed in /etc/securetty. - -Authors: Sam Hartman <hartmans@debian.org>, - Steve Langasek <vorlon@debian.org> - -Upstream-Status: Pending - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - modules/pam_unix/Makefile.am | 3 ++- - modules/pam_unix/pam_unix.8.xml | 19 ++++++++++++++++++- - modules/pam_unix/support.c | 40 +++++++++++++++++++++++++++++++++++----- - modules/pam_unix/support.h | 8 ++++++-- - 4 files changed, 61 insertions(+), 9 deletions(-) - -diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am -index 56df178..2bba460 100644 ---- a/modules/pam_unix/Makefile.am -+++ b/modules/pam_unix/Makefile.am -@@ -30,7 +30,8 @@ if HAVE_VERSIONING - pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map - endif - pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \ -- @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ -+ @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ \ -+ ../pam_securetty/tty_secure.lo - - securelib_LTLIBRARIES = pam_unix.la - -diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml -index 1b318f1..be0330e 100644 ---- a/modules/pam_unix/pam_unix.8.xml -+++ b/modules/pam_unix/pam_unix.8.xml -@@ -159,7 +159,24 @@ - <para> - The default action of this module is to not permit the - user access to a service if their official password is blank. -- The <option>nullok</option> argument overrides this default. -+ The <option>nullok</option> argument overrides this default -+ and allows any user with a blank password to access the -+ service. -+ </para> -+ </listitem> -+ </varlistentry> -+ <varlistentry> -+ <term> -+ <option>nullok_secure</option> -+ </term> -+ <listitem> -+ <para> -+ The default action of this module is to not permit the -+ user access to a service if their official password is blank. -+ The <option>nullok_secure</option> argument overrides this -+ default and allows any user with a blank password to access -+ the service as long as the value of PAM_TTY is set to one of -+ the values found in /etc/securetty. - </para> - </listitem> - </varlistentry> -diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c -index fc8595e..29e3341 100644 ---- a/modules/pam_unix/support.c -+++ b/modules/pam_unix/support.c -@@ -183,13 +183,22 @@ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds, - /* now parse the arguments to this module */ - - for (; argc-- > 0; ++argv) { -+ int sl; - - D(("pam_unix arg: %s", *argv)); - - for (j = 0; j < UNIX_CTRLS_; ++j) { -- if (unix_args[j].token -- && !strncmp(*argv, unix_args[j].token, strlen(unix_args[j].token))) { -- break; -+ if (unix_args[j].token) { -+ sl = strlen(unix_args[j].token); -+ if (unix_args[j].token[sl-1] == '=') { -+ /* exclude argument from comparison */ -+ if (!strncmp(*argv, unix_args[j].token, sl)) -+ break; -+ } else { -+ /* compare full strings */ -+ if (!strcmp(*argv, unix_args[j].token)) -+ break; -+ } - } - } - -@@ -560,6 +569,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, - if (child == 0) { - static char *envp[] = { NULL }; - const char *args[] = { NULL, NULL, NULL, NULL }; -+ int nullok = off(UNIX__NONULL, ctrl); - - /* XXX - should really tidy up PAM here too */ - -@@ -587,7 +597,16 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, - /* exec binary helper */ - args[0] = CHKPWD_HELPER; - args[1] = user; -- if (off(UNIX__NONULL, ctrl)) { /* this means we've succeeded */ -+ if (on(UNIX_NULLOK_SECURE, ctrl)) { -+ const void *uttyname; -+ retval = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval != PAM_SUCCESS || uttyname == NULL -+ || _pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) { -+ nullok = 0; -+ } -+ } -+ -+ if (nullok) { - args[2]="nullok"; - } else { - args[2]="nonull"; -@@ -672,6 +691,17 @@ _unix_blankpasswd (pam_handle_t *pamh, unsigned int ctrl, const char *name) - if (on(UNIX__NONULL, ctrl)) - return 0; /* will fail but don't let on yet */ - -+ if (on(UNIX_NULLOK_SECURE, ctrl)) { -+ int retval2; -+ const void *uttyname; -+ retval2 = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval2 != PAM_SUCCESS || uttyname == NULL) -+ return 0; -+ -+ if (_pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) -+ return 0; -+ } -+ - /* UNIX passwords area */ - - retval = get_pwd_hash(pamh, name, &pwd, &salt); -@@ -758,7 +788,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name - } - } - } else { -- retval = verify_pwd_hash(p, salt, off(UNIX__NONULL, ctrl)); -+ retval = verify_pwd_hash(p, salt, _unix_blankpasswd(pamh, ctrl, name)); - } - - if (retval == PAM_SUCCESS) { -diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h -index b4c279c..8da4a8e 100644 ---- a/modules/pam_unix/support.h -+++ b/modules/pam_unix/support.h -@@ -98,8 +98,9 @@ typedef struct { - #define UNIX_QUIET 28 /* Don't print informational messages */ - #define UNIX_NO_PASS_EXPIRY 29 /* Don't check for password expiration if not used for authentication */ - #define UNIX_DES 30 /* DES, default */ -+#define UNIX_NULLOK_SECURE 31 /* NULL passwords allowed only on secure ttys */ - /* -------------- */ --#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */ -+#define UNIX_CTRLS_ 32 /* number of ctrl arguments defined */ - - #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) - -@@ -117,7 +118,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - /* UNIX_AUTHTOK_TYPE */ {"authtok_type=", _ALL_ON_, 0100, 0}, - /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, - /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, --/* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, -+/* UNIX__NONULL */ {NULL, _ALL_ON_^(02000000000), 01000, 0}, - /* UNIX__QUIET */ {NULL, _ALL_ON_, 02000, 0}, - /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 04000, 0}, - /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 010000, 0}, -@@ -139,6 +140,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - /* UNIX_QUIET */ {"quiet", _ALL_ON_, 01000000000, 0}, - /* UNIX_NO_PASS_EXPIRY */ {"no_pass_expiry", _ALL_ON_, 02000000000, 0}, - /* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, -+/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(01000), 02000000000, 0}, - }; - - #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -172,6 +174,8 @@ extern int _unix_read_password(pam_handle_t * pamh - ,const char *data_name - ,const void **pass); - -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname); -+ - extern int _unix_run_verify_binary(pam_handle_t *pamh, - unsigned int ctrl, const char *user, int *daysleft); - #endif /* _PAM_UNIX_SUPPORT_H */ --- -2.4.0 - diff --git a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb b/poky/meta/recipes-extended/pam/libpam_1.5.1.bb index bc72afe6ad..8c008a9701 100644 --- a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/poky/meta/recipes-extended/pam/libpam_1.5.1.bb @@ -21,17 +21,11 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://pam-security-abstract-securetty-handling.patch \ - file://pam-unix-nullok-secure.patch \ - file://crypt_configure.patch \ - " + file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ + file://0001-Makefile.am-support-usrmage.patch \ + " -SRC_URI[md5sum] = "558ff53b0fc0563ca97f79e911822165" -SRC_URI[sha256sum] = "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db" - -SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \ - file://include_paths_header.patch \ - " +SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" @@ -39,13 +33,14 @@ EXTRA_OECONF = "--includedir=${includedir}/security \ --libdir=${base_libdir} \ --disable-nis \ --disable-regenerate-docu \ + --disable-doc \ --disable-prelude" CFLAGS_append = " -fPIC " S = "${WORKDIR}/Linux-PAM-${PV}" -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig systemd PACKAGECONFIG ??= "" PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," @@ -54,7 +49,7 @@ PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," PACKAGES += "${PN}-runtime ${PN}-xtests" FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-runtime = "${sysconfdir}" +FILES_${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" @@ -77,11 +72,10 @@ RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ - coreutils" + bash coreutils" # FIXME: Native suffix breaks here, disable it for now RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" diff --git a/poky/meta/recipes-extended/parted/parted_3.3.bb b/poky/meta/recipes-extended/parted/parted_3.3.bb index a1fd3ef07b..ce40c04ad4 100644 --- a/poky/meta/recipes-extended/parted/parted_3.3.bb +++ b/poky/meta/recipes-extended/parted/parted_3.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" SECTION = "console/tools" -DEPENDS = "ncurses readline util-linux virtual/libiconv" +DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ @@ -22,6 +22,9 @@ EXTRA_OECONF = "--disable-device-mapper" inherit autotools pkgconfig gettext texinfo ptest +PACKAGECONFIG ?= "readline" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" + BBCLASSEXTEND = "native nativesdk" do_compile_ptest() { diff --git a/poky/meta/recipes-extended/sed/sed_4.8.bb b/poky/meta/recipes-extended/sed/sed_4.8.bb index 39e3a61df5..048db47e14 100644 --- a/poky/meta/recipes-extended/sed/sed_4.8.bb +++ b/poky/meta/recipes-extended/sed/sed_4.8.bb @@ -63,3 +63,5 @@ do_install_ptest() { } RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index f86e5e03c0..4ae7a78c52 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -71,6 +71,8 @@ PAM_PLUGINS = "libpam-runtime \ pam-plugin-shells \ pam-plugin-rootok" +PAM_PLUGINS_remove_libc-musl = "pam-plugin-lastlog" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb index 3516c15451..3b38b39893 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.00.bb @@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "5b3a724a85eed48743dedf37eab851b617ecf921b7fff427c6d0bbf405534671" +SRC_URI[sha256sum] = "b2b738f574671926654b1623103a7aa58ee6911894ac78760ee188c4bfa96fe2" DEPENDS = "coreutils-native" diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb index ba61a7f247..040130b49a 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.3p1.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.4p1.bb @@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "dcb9de53e45e1c39042074b847f5e0d8ae1890725dd6a9d9101a81569e6eb49e" +SRC_URI[sha256sum] = "1172099dfcdd2fa497e13a3c274a9f5920abd36ae7d2f7aaacd6bc6bc92fd677" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc index 5368464f30..9a19093e24 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 = "2020d" +PV = "2020f" 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,5 +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.sha256sum] = "6cf050ba28e8053029d3f32d71341d11a794c6b5dd51a77fc769d6dae364fad5" -SRC_URI[tzdata.sha256sum] = "8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3" +SRC_URI[tzcode.sha256sum] = "cfeeea2a7745164f64bd9f6d76e47916f4ac820c4434493674adbbd4324329c5" +SRC_URI[tzdata.sha256sum] = "121131918c3ae6dc5d40f0eb87563a2be920b71a76e2392c09519a5e4a666881" diff --git a/poky/meta/recipes-extended/which/which_2.21.bb b/poky/meta/recipes-extended/which/which_2.21.bb index fc9185061b..1da69c548e 100644 --- a/poky/meta/recipes-extended/which/which_2.21.bb +++ b/poky/meta/recipes-extended/which/which_2.21.bb @@ -33,3 +33,5 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-doc = "which.1" ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch new file mode 100644 index 0000000000..178124a2ef --- /dev/null +++ b/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch @@ -0,0 +1,80 @@ +From 8d01b0753162681dcdbb7cf56f1e393c261e3eb0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 23 Dec 2020 19:14:32 +0100 +Subject: [PATCH] Makefile: sort all wildcard file list expansions + +Otherwise the order is non-deterministic and breaks +reproducible builds. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + programs/Makefile | 10 +++++----- + tests/Makefile | 4 ++-- + tests/fuzz/Makefile | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/programs/Makefile b/programs/Makefile +index 8641d0ee..26fee45f 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -72,11 +72,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy + + vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) + +-ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) +-ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) +-ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) ++ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) ++ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) ++ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) + ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) +-ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) ++ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) + + ZSTD_LEGACY_SUPPORT ?= 5 + ZSTDLEGACY_SRC := +@@ -91,7 +91,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) + ZSTDLIB_LOCAL_SRC := $(notdir $(ZSTDLIB_FULL_SRC)) + ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) + +-ZSTD_CLI_SRC := $(wildcard *.c) ++ZSTD_CLI_SRC := $(sort $(wildcard *.c)) + ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) + + ZSTD_ALL_SRC := $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) +diff --git a/tests/Makefile b/tests/Makefile +index 42bc353c..5f5654f0 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) + ZBUFF_FILES := $(ZSTDDIR)/deprecated/*.c + ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c + +-ZSTD_F1 := $(wildcard $(ZSTD_FILES)) ++ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) + ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) + ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) + ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) +@@ -212,7 +212,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c + invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c + + legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4 +-legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c ++legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) legacy.c + + decodecorpus : LDLIBS += -lm + decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c +diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile +index 36232a8c..574fe877 100644 +--- a/tests/fuzz/Makefile ++++ b/tests/fuzz/Makefile +@@ -58,7 +58,7 @@ FUZZ_SRC := \ + $(ZSTDCOMP_SRC) \ + $(ZSTDDICT_SRC) \ + $(ZSTDLEGACY_SRC) +-FUZZ_SRC := $(wildcard $(FUZZ_SRC)) ++FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) + + FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) + FUZZ_D_OBJ2 := $(subst $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) diff --git a/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb b/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb new file mode 100644 index 0000000000..10a6334cb7 --- /dev/null +++ b/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb @@ -0,0 +1,37 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;branch=release \ + file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ + " + +SRCREV = "97a3da1df009d4dc67251de0c4b1c9d7fe286fc1" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb index f9daa8bfe2..70148c96d8 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb @@ -14,7 +14,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.sha256sum] = "59b7576acb11fbb52eaca6dbf6fce28664de5c915ca2580c47f0b08ba83d2843" +SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch new file mode 100644 index 0000000000..3fef2bc1eb --- /dev/null +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch @@ -0,0 +1,55 @@ +From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 +From: Robert Ancell <robert.ancell@canonical.com> +Date: Mon, 30 Nov 2020 12:26:12 +1300 +Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. + +The code value after a reset wasn't being validated, which means we would +accept invalid codes. This could cause an infinite loop in the decoder. + +Fixes CVE-2020-29385 + +Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81] +CVE: CVE-2020-29385 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> + +--- + gdk-pixbuf/lzw.c | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + create mode 100644 tests/test-images/fail/hang_114.gif + +diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c +index 9e052a6f7..105daf2b1 100644 +--- a/gdk-pixbuf/lzw.c ++++ b/gdk-pixbuf/lzw.c +@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, + if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { + if (self->code < self->code_table_size) + add_code (self, self->code); +- else if (self->code == self->code_table_size) ++ else + add_code (self, self->last_code); +- else { +- /* Invalid code received - just stop here */ +- self->last_code = self->eoi_code; +- return output_length; +- } + + /* When table is full increase code size */ + if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) + self->code_size++; + } + ++ /* Invalid code received - just stop here */ ++ if (self->code >= self->code_table_size) { ++ self->last_code = self->eoi_code; ++ return output_length; ++ } ++ + /* Convert codeword into indexes */ + n_written += write_indexes (self, output + n_written, output_length - n_written); + } +-- +2.25.1 + diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb index 3dec5ed052..16708fd581 100644 --- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ file://missing-test-data.patch \ + file://CVE-2020-29385.patch \ " SRC_URI_append_class-target = " \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb index 338b7030e1..01a2a94ce3 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.24.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1" +SRC_URI[sha256sum] = "cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a" S = "${WORKDIR}/gtk+-${PV}" diff --git a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb index 29e839b6b2..890c08bf4a 100644 --- a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb +++ b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb @@ -11,7 +11,7 @@ LICENSE = "OFL-1.1 & Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7" inherit gnomebase meson allarch fontcache pkgconfig -SRC_URI[archive.sha256sum] = "b61f64e5f6a48aa0abc7a53cdcbce60de81908ca36048a64730978fcd9ac9863" +SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83" EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" diff --git a/poky/meta/recipes-graphics/libva/libva-initial_2.9.0.bb b/poky/meta/recipes-graphics/libva/libva-initial_2.10.0.bb index 5c6abeafe6..5c6abeafe6 100644 --- a/poky/meta/recipes-graphics/libva/libva-initial_2.9.0.bb +++ b/poky/meta/recipes-graphics/libva/libva-initial_2.10.0.bb diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.9.1.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.10.0.bb index feb9ce1662..828f4fb317 100644 --- a/poky/meta/recipes-graphics/libva/libva-utils_2.9.1.bb +++ b/poky/meta/recipes-graphics/libva/libva-utils_2.10.0.bb @@ -14,8 +14,8 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.9-branch" -SRCREV = "50c7f19d65e2535940e31c6711352b36d6d64fd7" +SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.10-branch" +SRCREV = "f112ee75fcd1472131b20f901b93f6ac1d293fad" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$" diff --git a/poky/meta/recipes-graphics/libva/libva.inc b/poky/meta/recipes-graphics/libva/libva.inc index 7b6f11674d..d251afa125 100644 --- a/poky/meta/recipes-graphics/libva/libva.inc +++ b/poky/meta/recipes-graphics/libva/libva.inc @@ -18,7 +18,7 @@ LICENSE = "MIT" SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI[sha256sum] = "e344c1392dde92696c9ffd9cb3c7277d0a3b912236eb4e0fdedf7f375434584b" +SRC_URI[sha256sum] = "fa81e35b50d9818fce5ec9eeeeff08a24a8864ceeb9a5c8e7ae4446eacfc0236" S = "${WORKDIR}/libva-${PV}" diff --git a/poky/meta/recipes-graphics/libva/libva_2.9.0.bb b/poky/meta/recipes-graphics/libva/libva_2.10.0.bb index 4d3fa50963..4d3fa50963 100644 --- a/poky/meta/recipes-graphics/libva/libva_2.9.0.bb +++ b/poky/meta/recipes-graphics/libva/libva_2.10.0.bb diff --git a/poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch deleted file mode 100644 index 9ee72880a2..0000000000 --- a/poky/meta/recipes-graphics/mesa/files/0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c Mon Sep 17 00:00:00 2001 -From: Duncan Hopkins <duncan@duncanhopkins.me.uk> -Date: Thu, 15 Oct 2020 12:14:57 +0100 -Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes - undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c - -loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3. -But the source meson file does not set this up dependent on with_dri3. -The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast. - -Reviewed-by: Eric Anholt <eric@anholt.net> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164> - -Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c] - ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index cfe02fa6373..3cb3c904927 100644 ---- a/meson.build -+++ b/meson.build -@@ -1782,7 +1782,8 @@ if with_platform_x11 - dep_xxf86vm = dependency('xxf86vm') - endif - endif -- if (with_egl or ( -+ if (with_egl or -+ with_dri3 or ( - with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or - with_gallium_omx != 'disabled')) - dep_xcb_xfixes = dependency('xcb-xfixes') --- -2.17.1 - diff --git a/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch index 74f7fe5c2d..89c0d150fa 100644 --- a/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ b/poky/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch @@ -6,6 +6,21 @@ Subject: [PATCH] meson.build: make TLS ELF optional USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make TLS GLX optional again" patch updated to the latest mesa. +For details, see: +https://gitlab.freedesktop.org/mesa/mesa/-/issues/966 + +This prevents runtime segfault on musl: + +Traceback (most recent call last): + File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f + return func(*args, **kwargs) + File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs + self.assertEqual(errcount, 0, msg=self.msg) +AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log +----------------------- +Central error: [ 10.477] (EE) Failed to load /usr/lib/xorg/modules/extensions/libglx.so: Error relocating /usr/lib/libGL.so.1: alphasort: initial-exec TLS resolves to dynamic definition in /usr/lib/libGL.so.1 +*********************** + Upstream-Status: Inappropriate [configuration] Signed-off-by: Alistair Francis <alistair@alistair23.me> diff --git a/poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch b/poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch deleted file mode 100644 index 833742359f..0000000000 --- a/poky/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 43d9e40db7357f27e91002b2bb7688b6775ebb43 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair@alistair23.me> -Date: Thu, 14 Nov 2019 09:06:02 -0800 -Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that - gen_matypes is gone." - -This reverts commit 20294dceebc23236e33b22578245f7e6f41b6997. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Alistair Francis <alistair@alistair23.me> - ---- - meson.build | 94 ++++++++++++++++++++++++++++++----------------- - meson_options.txt | 6 +++ - 2 files changed, 67 insertions(+), 33 deletions(-) - -diff --git a/meson.build b/meson.build -index e7dc599..e2fc934 100644 ---- a/meson.build -+++ b/meson.build -@@ -52,6 +52,7 @@ pre_args = [ - with_vulkan_icd_dir = get_option('vulkan-icd-dir') - with_tests = get_option('build-tests') - with_aco_tests = get_option('build-aco-tests') -+with_asm = get_option('asm') - with_glx_read_only_text = get_option('glx-read-only-text') - with_glx_direct = get_option('glx-direct') - with_osmesa = get_option('osmesa') -@@ -1154,41 +1155,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows) - - # TODO: shared/static? Is this even worth doing? - -+# When cross compiling we generally need to turn off the use of assembly, -+# because mesa's assembly relies on building an executable for the host system, -+# and running it to get information about struct sizes. There is at least one -+# case of cross compiling where we can use asm, and that's x86_64 -> x86 when -+# host OS == build OS, since in that case the build machine can run the host's -+# binaries. -+if with_asm and meson.is_cross_build() -+ if build_machine.system() != host_machine.system() -+ # TODO: It may be possible to do this with an exe_wrapper (like wine). -+ message('Cross compiling from one OS to another, disabling assembly.') -+ with_asm = false -+ elif not (build_machine.cpu_family().startswith('x86') and host_machine.cpu_family() == 'x86') -+ # FIXME: Gentoo always sets -m32 for x86_64 -> x86 builds, resulting in an -+ # x86 -> x86 cross compile. We use startswith rather than == to handle this -+ # case. -+ # TODO: There may be other cases where the 64 bit version of the -+ # architecture can run 32 bit binaries (aarch64 and armv7 for example) -+ message(''' -+ Cross compiling to different architectures, and the host cannot run -+ the build machine's binaries. Disabling assembly. -+ ''') -+ with_asm = false -+ endif -+endif -+ - with_asm_arch = '' --if host_machine.cpu_family() == 'x86' -- if system_has_kms_drm or host_machine.system() == 'gnu' -- with_asm_arch = 'x86' -- pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM', -- '-DUSE_SSE_ASM'] -- -- if with_glx_read_only_text -- pre_args += ['-DGLX_X86_READONLY_TEXT'] -+if with_asm -+ if host_machine.cpu_family() == 'x86' -+ if system_has_kms_drm or host_machine.system() == 'gnu' -+ with_asm_arch = 'x86' -+ pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM', -+ '-DUSE_SSE_ASM'] -+ -+ if with_glx_read_only_text -+ pre_args += ['-DGLX_X86_READONLY_TEXT'] -+ endif -+ endif -+ elif host_machine.cpu_family() == 'x86_64' -+ if system_has_kms_drm -+ with_asm_arch = 'x86_64' -+ pre_args += ['-DUSE_X86_64_ASM'] -+ endif -+ elif host_machine.cpu_family() == 'arm' -+ if system_has_kms_drm -+ with_asm_arch = 'arm' -+ pre_args += ['-DUSE_ARM_ASM'] -+ endif -+ elif host_machine.cpu_family() == 'aarch64' -+ if system_has_kms_drm -+ with_asm_arch = 'aarch64' -+ pre_args += ['-DUSE_AARCH64_ASM'] -+ endif -+ elif host_machine.cpu_family() == 'sparc64' -+ if system_has_kms_drm -+ with_asm_arch = 'sparc' -+ pre_args += ['-DUSE_SPARC_ASM'] -+ endif -+ elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little' -+ if system_has_kms_drm -+ with_asm_arch = 'ppc64le' -+ pre_args += ['-DUSE_PPC64LE_ASM'] - endif -- endif --elif host_machine.cpu_family() == 'x86_64' -- if system_has_kms_drm -- with_asm_arch = 'x86_64' -- pre_args += ['-DUSE_X86_64_ASM'] -- endif --elif host_machine.cpu_family() == 'arm' -- if system_has_kms_drm -- with_asm_arch = 'arm' -- pre_args += ['-DUSE_ARM_ASM'] -- endif --elif host_machine.cpu_family() == 'aarch64' -- if system_has_kms_drm -- with_asm_arch = 'aarch64' -- pre_args += ['-DUSE_AARCH64_ASM'] -- endif --elif host_machine.cpu_family() == 'sparc64' -- if system_has_kms_drm -- with_asm_arch = 'sparc' -- pre_args += ['-DUSE_SPARC_ASM'] -- endif --elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little' -- if system_has_kms_drm -- with_asm_arch = 'ppc64le' -- pre_args += ['-DUSE_PPC64LE_ASM'] - endif - endif - -diff --git a/meson_options.txt b/meson_options.txt -index 147cccb..562b059 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -254,6 +254,12 @@ option( - value : false, - description : 'Enable GLVND support.' - ) -+option( -+ 'asm', -+ type : 'boolean', -+ value : true, -+ description : 'Build assembly code if possible' -+) - option( - 'glx-read-only-text', - type : 'boolean', diff --git a/poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch b/poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch deleted file mode 100644 index dacb1ea1c8..0000000000 --- a/poky/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 281a636353666bfdd373c62591e744087e750e89 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 4 Dec 2019 14:15:28 -0800 -Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members - -32bit architectures which have 64bit time_t does not fit the assumption -of time_t being same as system long int - -Fixes -error: format specifies type 'long' but the argument has type 'time_t' (aka 'long long') [-Werror,-Wformat] - time.tv_sec); - ^~~~~~~~~~~ - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++-- - src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c -index 31a0803..cc2e2af 100644 ---- a/src/gallium/drivers/v3d/v3d_bufmgr.c -+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c -@@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen) - - struct timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); -- fprintf(stderr, " now: %ld\n", -- (long)time.tv_sec); -+ fprintf(stderr, " now: %jd\n", -+ (intmax_t)time.tv_sec); - } - } - -diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c -index a786e8e..975d49e 100644 ---- a/src/gallium/drivers/vc4/vc4_bufmgr.c -+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c -@@ -99,8 +99,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen) - - struct timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); -- fprintf(stderr, " now: %ld\n", -- (long)time.tv_sec); -+ fprintf(stderr, " now: %jd\n", -+ (intmax_t)time.tv_sec); - } - } - diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb index e50782be1c..e50782be1c 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_20.2.4.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.1.bb diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 7956d95fc1..883c244471 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -17,15 +17,12 @@ PE = "2" SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0002-meson.build-make-TLS-ELF-optional.patch \ - file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ - file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ - file://0001-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch \ " -SRC_URI[sha256sum] = "0572dc6015d2e1c50f67823edd16855ae9b6feded0a1470598404e75e64aa092" +SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" @@ -53,9 +50,7 @@ BBCLASSEXTEND = "native nativesdk" ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" -PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \ - surfaceless" +PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" @@ -78,7 +73,7 @@ def check_buildtype(d): MESON_BUILDTYPE = "${@check_buildtype(d)}" EXTRA_OEMESON = " \ - -Dshared-glapi=true \ + -Dshared-glapi=enabled \ -Dgallium-opencl=disabled \ -Dglx-read-only-text=true \ -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ @@ -99,13 +94,13 @@ PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl elf-tls x11" PACKAGECONFIG_remove_libc-musl = "elf-tls" # "gbm" requires "dri", "opengl" -PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" # "x11" requires "opengl" PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" -PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc" +PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" DRIDRIVERS_class-native = "swrast" @@ -114,7 +109,7 @@ DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl" PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm" -PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" +PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled # amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 @@ -127,10 +122,10 @@ PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" # "gles" requires "opengl" -PACKAGECONFIG[gles] = "-Dgles1=true -Dgles2=true, -Dgles1=false -Dgles2=false" +PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled" # "egl" requires "dri", "opengl" -PACKAGECONFIG[egl] = "-Degl=true, -Degl=false" +PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" PACKAGECONFIG[etnaviv] = "" PACKAGECONFIG[freedreno] = "" @@ -160,12 +155,12 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''" -PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ +PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \ elfutils" -PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" -PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" +PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" +PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" -PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=true,-Dgallium-vdpau=false,libvdpau" +PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau" PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" @@ -176,10 +171,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panf OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" -PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" - -# mesa tries to run cross-built gen_matypes on build machine to get struct size information -EXTRA_OEMESON_append = " -Dasm=false" +PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" diff --git a/poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb b/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_20.2.4.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_20.3.1.bb diff --git a/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch b/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch new file mode 100644 index 0000000000..261d98d8f6 --- /dev/null +++ b/poky/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch @@ -0,0 +1,24 @@ +From e21e68f6aa0f5249fce613e8fd4ac0edbd5cb7b0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 22 Dec 2020 13:35:11 +0100 +Subject: [PATCH] render-ops.c: add missing format string + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + tests/spec/ati_fragment_shader/render-ops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/spec/ati_fragment_shader/render-ops.c b/tests/spec/ati_fragment_shader/render-ops.c +index 131334ba2..19a353d67 100644 +--- a/tests/spec/ati_fragment_shader/render-ops.c ++++ b/tests/spec/ati_fragment_shader/render-ops.c +@@ -393,7 +393,7 @@ piglit_display(void) + bool ok = piglit_probe_rect_halves_equal_rgba(get_test_x(i), get_test_y(i), + w * 2, h); + enum piglit_result sub_result = ok ? PIGLIT_PASS : PIGLIT_FAIL; +- piglit_report_subtest_result(sub_result, test->name); ++ piglit_report_subtest_result(sub_result, "%s", test->name); + piglit_merge_result(&result, sub_result); + } + diff --git a/poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb index 31954aa8b6..442c1a3c62 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -13,10 +13,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ file://0001-serializer.py-make-.gz-files-reproducible.patch \ file://0001-framework-profile.py-make-test-lists-reproducible.patch \ file://0001-tests-shader.py-sort-the-file-list-before-working-on.patch \ + file://0001-render-ops.c-add-missing-format-string.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "0fda9f67a782edec640998286e7b6058e8933d17" +SRCREV = "603deba4ab66e2a8948693a14d715e536caddcc5" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" diff --git a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch index 0d58925adc..e4e3f0be1e 100644 --- a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch @@ -1,11 +1,12 @@ -From e092619a9ef7910ad56acfb8728c66f0125d176a Mon Sep 17 00:00:00 2001 +From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH 3/3] cmake: de-vendor libs and disable git versioning +Subject: [PATCH] cmake: de-vendor libs and disable git versioning Upstream-Status: Inappropriate [configuration] Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> + --- CMakeLists.txt | 2 -- glslc/CMakeLists.txt | 1 - @@ -14,18 +15,15 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> create mode 100644 glslc/src/build-version.inc diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4e779b..cfa7bd8 100644 +index 5c74cd8..9451fbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,7 +70,6 @@ endif(MSVC) +@@ -102,12 +102,10 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - if(SHADERC_ENABLE_SPVC) - add_subdirectory(libshaderc_spvc) -@@ -79,7 +78,6 @@ endif() add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) add_subdirectory(glslc) @@ -34,10 +32,10 @@ index a4e779b..cfa7bd8 100644 add_custom_target(build-version ${PYTHON_EXECUTABLE} diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 0f5d888..08686e0 100644 +index 35b3f19..52006b8 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) +@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) @@ -48,6 +46,3 @@ index 0f5d888..08686e0 100644 diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc new file mode 100644 index 0000000..e69de29 --- -2.28.0 - diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2020.3.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb index f5edf53caf..ee9b118371 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2020.3.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "1fce59794079f90ceb091190adbbb5499acd4e95" +SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch \ file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \ diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2020.5.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb index 5e42987240..eb07833f22 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2020.5.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch;destsuffix=${DEST_DIR}/effcee \ " -SRCREV_spirv-tools = "b27e039c68dd9eb959bb9249fcb2c9a54841474b" -SRCREV_spirv-headers = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6" +SRCREV_spirv-tools = "b27b1afd12d05bf238ac7368bb49de73cd620a8e" +SRCREV_spirv-headers = "f027d53ded7e230e008d37c8b47ede7cd308e19d" SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d" SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb" SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.154.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb index 0e4d260960..a28954ad70 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.154.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master" -SRCREV = "7f9879b1b1fab53f719a9ed5e6e29533b10972b2" +SRCREV = "87aaa16d4c8e1ac70f8f04acdcd46eed4bd77209" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch b/poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch new file mode 100644 index 0000000000..26b1a40f26 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch @@ -0,0 +1,40 @@ +From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001 +From: Michel Zou <xantares09@hotmail.com> +Date: Wed, 16 Dec 2020 15:03:23 +0100 +Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX + +Closes #527 + +Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-Loader/commit/66a23ac8c566299343668f094de50798a5f4a0e4] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + loader/CMakeLists.txt | 2 +- + loader/vulkan.pc.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt +index 659511855..ba9f460f1 100644 +--- a/loader/CMakeLists.txt ++++ b/loader/CMakeLists.txt +@@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND) + set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") + endforeach() + if(WIN32) +- set(LIB_SUFFIX "-1") ++ set(VULKAN_LIB_SUFFIX "-1") + endif () + configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in +index fc17cb1f3..44049ee34 100644 +--- a/loader/vulkan.pc.in ++++ b/loader/vulkan.pc.in +@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: @CMAKE_PROJECT_NAME@ + Description: Vulkan Loader + Version: @VK_API_VERSION@ +-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@ ++Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@ + Libs.private: @PRIVATE_LIBS@ + Cflags: -I${includedir} + diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb index 23bf59f8a6..d39e7af975 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.154.1.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb @@ -9,8 +9,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.2.154" -SRCREV = "2aa801755eab3fab610d9676c4dd94054e30c854" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ + file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \ + " +SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 3785723232..896b248327 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -9,7 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "b4fe3addff337f3c264a6f7dd62be60c726fcc03" +SRCREV = "fdc8fab1a520df5566de3eda7b526b24f04e6379" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.154.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb index 0fc3494eea..972859c934 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.154.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.0.bb @@ -5,8 +5,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.154" -SRCREV = "10d757bb1072416ddfbe4c24b43d4cd2f808a5c7" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.162" +SRCREV = "9e9d7c24ed8b321815f77f31c100bbf9462193b4" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb index 3280813ef8..b1589a8d75 100644 --- a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb +++ b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb @@ -14,5 +14,4 @@ DEPENDS += "libxmu" PE = "1" -SRC_URI[md5sum] = "cc369c28383a5d7144e7197ee7d30bfa" -SRC_URI[sha256sum] = "8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753" +SRC_URI[sha256sum] = "9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1" diff --git a/poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch b/poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch deleted file mode 100644 index 3f97143082..0000000000 --- a/poky/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/33] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From b41469c5f08b1f3365667ff3c430b104c9b8e25f Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 22 Jan 2020 17:11:23 +0000 -Subject: [PATCH libX11] cpprules.in: squash whitespace in generated files - -CPP is used to generate files, but as cpp reads files from the build host the -output has a number of blank lines at the beginning which varies depending on -what GCC and friends is used. - -Pathalogical example: - - $ cpp -undef -traditional /dev/null - # 1 "/dev/null" - # 1 "<built-in>" - # 1 "<command-line>" - # 31 "<command-line>" - # 1 "/usr/include/stdc-predef.h" 1 3 4 - - # 17 "/usr/include/stdc-predef.h" 3 4 - - [ 40 blank line ] - - # 32 "<command-line>" 2 - # 1 "/dev/null" - -So depending on the content of stdc-predef.h and what other headers CPP will -load, the amount of whitespace in the generates files varies. This can result in -differences in reproducible environments, and file conflicts in multilib -environments. - -As whitespace is irrelevant to these machine-readable files, extend the sed to -just delete blank lines. ---- - cpprules.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cpprules.in b/cpprules.in -index 03d6701e..ce6b3c98 100644 ---- a/cpprules.in -+++ b/cpprules.in -@@ -23,7 +23,8 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ - -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ - -e '/^[ ]*XHASH/s/XHASH/\#/' \ - -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ -- -e '/\@\@$$/s/\@\@$$/\\/' -+ -e '/\@\@$$/s/\@\@$$/\\/' \ -+ -e '/^$$/d' - - .pre: - @$(MKDIR_P) $(@D) --- -2.20.1 - diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb index 3d97ad78d2..0f4be35770 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb @@ -15,7 +15,7 @@ SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" SRC_URI += "file://0001-Drop-x11-dependencies.patch \ - file://libx11-whitespace.patch" + " XORG_PN = "libX11" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb index de7f1c366e..3faee6e497 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb @@ -11,10 +11,10 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" PE = "1" SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ - file://disable_tests.patch \ - file://libx11-whitespace.patch" + file://disable_tests.patch \ + " -SRC_URI[sha256sum] = "f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7" +SRC_URI[sha256sum] = "36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54" PROVIDES = "virtual/libx11" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb index c83e43ed99..5c6dbac4d7 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb @@ -8,7 +8,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " -SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index ea33732a3e..27eef7fb6a 100644 --- a/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "df4390b18a500a1a7d4695e1856971f8e36ce517" +SRCREV = "73f813024d33432116a122524fd2ae48afc910c7" PR = "r12" PV = "0.2+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch deleted file mode 100644 index 31f4d00b53..0000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c5fec6d6368b4103557deb710150119dca438544 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 5 Aug 2020 10:46:39 -0700 -Subject: [PATCH] kexec: Fix build with -fno-common - -Ensure that my_debug is not doubly defined - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - kexec/arch/ppc64/kexec-elf-ppc64.c | 2 -- - kexec/fs2dt.h | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) - ---- a/kexec/arch/ppc64/kexec-elf-ppc64.c -+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c -@@ -44,8 +44,6 @@ - uint64_t initrd_base, initrd_size; - unsigned char reuse_initrd = 0; - const char *ramdisk; --/* Used for enabling printing message from purgatory code */ --int my_debug = 0; - - int elf_ppc64_probe(const char *buf, off_t len) - { ---- a/kexec/fs2dt.h -+++ b/kexec/fs2dt.h -@@ -30,7 +30,7 @@ extern struct bootblock bb[1]; - - /* Used for enabling printing message from purgatory code - * Only has implemented for PPC64 */ --int my_debug; -+extern int my_debug; - extern int dt_no_old_root; - - void reserve(unsigned long long where, unsigned long long length); ---- a/kexec/arch/arm64/kexec-arm64.h -+++ b/kexec/arch/arm64/kexec-arm64.h -@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **a - void zImage_arm64_usage(void); - - --off_t initrd_base; --off_t initrd_size; -+extern off_t initrd_base; -+extern off_t initrd_size; - - /** - * struct arm64_mem - Memory layout info. -@@ -65,7 +65,7 @@ struct arm64_mem { - }; - - #define arm64_mem_ngv UINT64_MAX --struct arm64_mem arm64_mem; -+extern struct arm64_mem arm64_mem; - - uint64_t get_phys_offset(void); - uint64_t get_vp_offset(void); ---- a/kexec/arch/x86_64/kexec-bzImage64.c -+++ b/kexec/arch/x86_64/kexec-bzImage64.c -@@ -42,7 +42,6 @@ - #include <arch/options.h> - - static const int probe_debug = 0; --int bzImage_support_efi_boot; - - int bzImage64_probe(const char *buf, off_t len) - { ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch new file mode 100644 index 0000000000..6aeebc3939 --- /dev/null +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch @@ -0,0 +1,23 @@ +From ba2fb5baf6b0a8c882ac32301dd7a8d16de0dcf6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sun, 27 Dec 2020 23:39:29 +0100 +Subject: [PATCH] kexec/arch/ppc/kexec-ppc.c: correct double definition error + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + kexec/arch/ppc/kexec-ppc.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c +index 03bec36..5b3e244 100644 +--- a/kexec/arch/ppc/kexec-ppc.c ++++ b/kexec/arch/ppc/kexec-ppc.c +@@ -35,7 +35,6 @@ unsigned long long initrd_base = 0, initrd_size = 0; + unsigned long long ramdisk_base = 0, ramdisk_size = 0; + unsigned int rtas_base, rtas_size; + int max_memory_ranges; +-const char *ramdisk; + + /* + * Reads the #address-cells and #size-cells on this platform. diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch deleted file mode 100644 index a809d5ba8e..0000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 8c9a5076543eb3d497e016b3d7707e93d6311883 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> -Date: Mon, 15 Jul 2013 23:32:36 -0700 -Subject: [PATCH] x86_64: Add support to build kexec-tools with x32 ABI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary of changes, - -configure.ac: Add test for detect x32 ABI. -purgatory/arch/x86_64/Makefile: Not use mcmodel large when - x32 ABI is set. -kexec/arch/x86_64/kexec-elf-rel-x86_64.c: When x32 ABI is set - use ELFCLASS32 instead of ELFCLASS64. -kexec/kexec-syscall.h: Add correct syscall number for x32 ABI. - -Upstream-Status: Submitted - -Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> -Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> ---- - configure.ac | 9 +++++++++ - kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 4 ++++ - kexec/kexec-syscall.h | 4 ++++ - purgatory/arch/x86_64/Makefile | 4 +++- - 4 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c2b0c68..60882b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,15 @@ case $target_cpu in - ;; - ia64|x86_64|alpha|m68k ) - ARCH="$target_cpu" -+ -+ dnl ---Test for x32 ABI in x86_64 -+ if test "x$ARCH" = "xx86_64" ; then -+ AC_EGREP_CPP(x32_test, -+ [#if defined(__x86_64__) && defined (__ILP32__) -+ x32_test -+ #endif -+ ], SUBARCH='x32', SUBARCH='64') -+ fi - ;; - * ) - AC_MSG_ERROR([unsupported architecture $target_cpu]) -diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -index db85b44..0ce1172 100644 ---- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -@@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - if (ehdr->ei_data != ELFDATA2LSB) { - return 0; - } -+#ifdef __ILP32__ -+ if (ehdr->ei_class != ELFCLASS32) { -+#else - if (ehdr->ei_class != ELFCLASS64) { -+#endif - return 0; - } - if (ehdr->e_machine != EM_X86_64) { -diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h -index dac1c1f..e9479b7 100644 ---- a/kexec/kexec-syscall.h -+++ b/kexec/kexec-syscall.h -@@ -31,8 +31,12 @@ - #define __NR_kexec_load 268 - #endif - #ifdef __x86_64__ -+#ifdef __ILP32__ -+#define __NR_kexec_load 528 -+#else - #define __NR_kexec_load 246 - #endif -+#endif - #ifdef __s390x__ - #define __NR_kexec_load 277 - #endif -diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile -index 7300937..4af11e4 100644 ---- a/purgatory/arch/x86_64/Makefile -+++ b/purgatory/arch/x86_64/Makefile -@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c - x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c - x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c - --x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+ifeq ($(SUBARCH),64) -+ x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large -+endif diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch deleted file mode 100644 index 6811dfa597..0000000000 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b54816eff272324320c490d62dc36b27d2838732 Mon Sep 17 00:00:00 2001 -From: Quanyang Wang <quanyang.wang@windriver.com> -Date: Mon, 16 Sep 2019 10:49:05 +0800 -Subject: [PATCH] kexec/arm: undefine __NR_kexec_file_load for arm - -In the kernel upstream commit 4ab65ba7a5cb -("ARM: add kexec_file_load system call number"), -__NR_kexec_file_load for arm has been defined to be 401. -This results that even if kexec_file_load isn't implemented -for arm but the function is_kexec_file_load_implemented() -will still return true. So undef __NR_kexec_file_load for -arm architecture. - -Upstream-Status: Backport -[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/kexec/kexec-syscall.h?id=b54816eff272324320c490d62dc36b27d2838732] - -Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> -Signed-off-by: Simon Horman <horms@verge.net.au> ---- - kexec/kexec-syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h -index dac1c1f..92d51d3 100644 ---- a/kexec/kexec-syscall.h -+++ b/kexec/kexec-syscall.h -@@ -56,6 +56,10 @@ - #endif - #endif /*ifndef __NR_kexec_load*/ - -+#ifdef __arm__ -+#undef __NR_kexec_file_load -+#endif -+ - #ifndef __NR_kexec_file_load - - #ifdef __x86_64__ --- -2.17.1 - diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch index b91608e52b..36b0845f4a 100644 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch @@ -1,20 +1,21 @@ -From d294c5039753a36506949ba5dc782a4c0b307b74 Mon Sep 17 00:00:00 2001 +From bb6a26371d15473b380459ac4404bf330634b585 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 20 Dec 2019 17:21:08 +0100 Subject: [PATCH] kexec: un-break the build on 32 bit x86 Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- kexec/arch/i386/Makefile | 1 + kexec/arch/i386/kexec-x86.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile -index 105cefd..25df57a 100644 +index f486103..5d560be 100644 --- a/kexec/arch/i386/Makefile +++ b/kexec/arch/i386/Makefile -@@ -11,6 +11,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c +@@ -12,6 +12,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c @@ -23,7 +24,7 @@ index 105cefd..25df57a 100644 dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ kexec/arch/i386/crashdump-x86.h \ diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h -index 1b58c3b..d6b10c0 100644 +index 0f941df..c423171 100644 --- a/kexec/arch/i386/kexec-x86.h +++ b/kexec/arch/i386/kexec-x86.h @@ -56,9 +56,13 @@ struct arch_options_t { @@ -38,5 +39,5 @@ index 1b58c3b..d6b10c0 100644 void multiboot_x86_usage(void); +void multiboot2_x86_usage(void); - int elf_x86_probe(const char *buf, off_t len); - int elf_x86_load(int argc, char **argv, const char *buf, off_t len, + int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.21.bb index 69d2e9bfba..069e8f4d05 100644 --- a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb +++ b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.21.bb @@ -16,16 +16,13 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz file://0001-powerpc-change-the-memory-size-limit.patch \ file://0002-purgatory-Pass-r-directly-to-linker.patch \ file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ - file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \ file://0005-Disable-PIE-during-link.patch \ - file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \ file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \ - file://0001-kexec-Fix-build-with-fno-common.patch \ file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ + file://0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch \ " -SRC_URI[md5sum] = "46724b67f32501c5d3e778161347cad9" -SRC_URI[sha256sum] = "cb16d79818e0c9de3bb3e33ede5677c34a1d28c646379c7ab44e0faa3eb57a16" +SRC_URI[sha256sum] = "b3d4cfd2ba10d68ce341ea3b8ca414d00a0b6183b95686172154f94bce834f94" inherit autotools update-rc.d systemd diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb index baac26c510..700a79b118 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201218.bb @@ -31,6 +31,7 @@ LICENSE = "\ & Firmware-iwlwifi_firmware \ & Firmware-IntcSST2 \ & Firmware-kaweth \ + & Firmware-Lontium \ & Firmware-Marvell \ & Firmware-moxa \ & Firmware-myri10ge_firmware \ @@ -94,6 +95,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ + file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \ file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ @@ -126,7 +128,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=ef221e03fc58f4d34a132b801dfa1d68 \ + file://WHENCE;md5=03f0fad70b8b557b56084e3090198021 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -161,6 +163,7 @@ NO_GENERIC_LICENSE[Firmware-IntcSST2] = "LICENCE.IntcSST2" NO_GENERIC_LICENSE[Firmware-it913x] = "LICENCE.it913x" NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" +NO_GENERIC_LICENSE[Firmware-Lontium] = "LICENSE.Lontium" NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek" NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" @@ -198,7 +201,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "863d5a31da725b856a917280d1e3014929b3bc3d4e6e5faecf530c13afb7e2b9" +SRC_URI[sha256sum] = "a1cc1ff72c739f312b095df589e9fd639fc81c3f8f7966377ea35222dc94c04b" inherit allarch @@ -298,6 +301,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-amlogic-vdec-license ${PN}-amlogic-vdec \ + ${PN}-lt9611uxc ${PN}-lontium-license \ ${PN}-whence-license \ ${PN}-license \ " @@ -402,6 +406,12 @@ FILES_${PN}-radeon = " \ RDEPENDS_${PN}-radeon += "${PN}-radeon-license" +# For lontium +LICENSE_${PN}-lt9611uxc = "Firmware-Lontium" + +FILES_${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium" +FILES_${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin" + # For marvell LICENSE_${PN}-pcie8897 = "Firmware-Marvell" LICENSE_${PN}-pcie8997 = "Firmware-Marvell" diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb index d76a8a36f8..d6a4d5aa61 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.8.bb +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb @@ -14,5 +14,6 @@ SRC_URI_append = "\ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI[md5sum] = "0e5c4c15266218ef26c50fac0016095b" -SRC_URI[sha256sum] = "e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5" +SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3" +SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43" + diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 8a900ed182..dadeade3aa 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -186,7 +186,7 @@ do_install() { cp -a --parents $SYSCALL_TOOLS $kerneldir/build/ fi - cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ 2>/dev/null || : fi if [ -d arch/${ARCH}/include ]; then diff --git a/poky/meta/recipes-kernel/linux/linux-dummy.bb b/poky/meta/recipes-kernel/linux/linux-dummy.bb index 649fc04dd1..95dc85ff2f 100644 --- a/poky/meta/recipes-kernel/linux/linux-dummy.bb +++ b/poky/meta/recipes-kernel/linux/linux-dummy.bb @@ -26,7 +26,7 @@ DESCRIPTION_kernel-vmlinux = "Kernel vmlinux meta package" INHIBIT_DEFAULT_DEPS = "1" -#COMPATIBLE_MACHINE = "your_machine" +COMPATIBLE_HOST = ".*-linux" PR = "r1" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 6272af6253..95ac6e0a4c 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "5.10-rc+" +LINUX_VERSION ?= "5.11-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb new file mode 100644 index 0000000000..1c54ec1719 --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -0,0 +1,44 @@ +KBRANCH ?= "v5.10/standard/preempt-rt/base" + +require recipes-kernel/linux/linux-yocto.inc + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "dca023723e0dbfba1c7e8933ca6d70b17af0eab6" +SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" + +LINUX_VERSION ?= "5.10.2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +LINUX_KERNEL_TYPE = "preempt-rt" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 104ada2db5..d505949eb8 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97576fb7447efba82eb025bde3ae9ceb29939d5e" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine ?= "baf3ccf7c7cfaf9515d8c8b3b639d7bbb0564594" +SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.78" +LINUX_VERSION ?= "5.4.85" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb index 033dfc76a2..d20b8b10ab 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.8;destsuffix=${KMETA}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb new file mode 100644 index 0000000000..1a1845f470 --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -0,0 +1,32 @@ +KBRANCH ?= "v5.10/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs" + +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "5.10.2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine_qemuarm ?= "d02c60a7622d7f06805925ae1742dad2b36eaab9" +SRCREV_machine ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index d8784c49ad..fea9ae26c1 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.78" +LINUX_VERSION ?= "5.4.85" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "6cf3b1d30bc7ac9bd86190129b3cbbdd04b8b236" -SRCREV_machine ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine_qemuarm ?= "f7f4bcebdd599197cde6f1d1985cb1ef1f3e8a54" +SRCREV_machine ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb index 50cee07620..a5135155d5 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "9509db6e3ed6a23b1f7495b53248d1cbfe22710b" SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb new file mode 100644 index 0000000000..fdfc32123d --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -0,0 +1,55 @@ +KBRANCH ?= "v5.10/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.10/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.10/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.10/standard/base" +KBRANCH_qemux86 ?= "v5.10/standard/base" +KBRANCH_qemux86-64 ?= "v5.10/standard/base" +KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "5397e4b8744f2319707fef0b1fed890dcdbb30c8" +SRCREV_machine_qemuarm64 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemumips ?= "925ed2e122804bb2d3b86622c1309c04d8e13652" +SRCREV_machine_qemuppc ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemuriscv64 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemux86 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemux86-64 ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_machine_qemumips64 ?= "2395091f9593bd8465c37f67fabdee14de1900a5" +SRCREV_machine ?= "0c61b00f3d64aebc1b8248f50d4855d609030fbf" +SRCREV_meta ?= "6b12385f7d89ccac211c3981420a84394530ce83" + +# remap qemuarm to qemuarma15 for the 5.8 kernel +# KMACHINE_qemuarm ?= "qemuarma15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LINUX_VERSION ?= "5.10.2" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" +DEPENDS += "gmp-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb index c24e5ddc87..a3feeae966 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b3bafed66cf1be24caaa9c876d7d9a8298df831b" -SRCREV_machine_qemuarm64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemumips ?= "36c2a0b1caef0b2dd6b5777d1939c383238536a8" -SRCREV_machine_qemuppc ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemuriscv64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemux86 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemux86-64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemumips64 ?= "971a3cedf9a2a7774fa072b9a13380fb59fd605b" -SRCREV_machine ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine_qemuarm ?= "888fe3a6f7776f5732c3c4cf4c862447e646c25e" +SRCREV_machine_qemuarm64 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemumips ?= "459ad51fb16465be3d291217a10bcb9d055f5775" +SRCREV_machine_qemuppc ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemuriscv64 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemux86 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemux86-64 ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_machine_qemumips64 ?= "7eff01977ef77715ebc3e5a126534c39fe4ac918" +SRCREV_machine ?= "4f2b484a791fac88262922aa26ddd5ac3df9720f" +SRCREV_meta ?= "1c358e19696827b594de26a221f110fc2647dfa8" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.78" +LINUX_VERSION ?= "5.4.85" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb index af576891e2..f6ebefbf1b 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" SRCREV_machine_qemux86-64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" SRCREV_machine_qemumips64 ?= "01a02b058f9a8941032b298b8d25c673526152f4" SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_meta ?= "b976de4f41df1a50dc84839b64fb0ce2c6f9fb21" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch new file mode 100644 index 0000000000..fde9398394 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch @@ -0,0 +1,88 @@ +From 37b9cb0e6cb92181b7a25583849a9d161a558982 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 26 Oct 2020 13:41:02 -0400 +Subject: [PATCH 07/19] fix: objtool: Rename frame.h -> objtool.h (v5.10) + +See upstream commit : + + commit 00089c048eb4a8250325efb32a2724fd0da68cce + Author: Julien Thierry <jthierry@redhat.com> + Date: Fri Sep 4 16:30:25 2020 +0100 + + objtool: Rename frame.h -> objtool.h + + Header frame.h is getting more code annotations to help objtool analyze + object files. + + Rename the file to objtool.h. + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Change-Id: Ic2283161bebcbf1e33b72805eb4d2628f4ae3e89 +--- + lttng-filter-interpreter.c | 2 +- + wrapper/{frame.h => objtool.h} | 19 ++++++++++++------- + 2 files changed, 13 insertions(+), 8 deletions(-) + rename wrapper/{frame.h => objtool.h} (50%) + +diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c +index 21169f01..5d572437 100644 +--- a/lttng-filter-interpreter.c ++++ b/lttng-filter-interpreter.c +@@ -8,7 +8,7 @@ + */ + + #include <wrapper/uaccess.h> +-#include <wrapper/frame.h> ++#include <wrapper/objtool.h> + #include <wrapper/types.h> + #include <linux/swab.h> + +diff --git a/wrapper/frame.h b/wrapper/objtool.h +similarity index 50% +rename from wrapper/frame.h +rename to wrapper/objtool.h +index 6e6dc811..3b997cae 100644 +--- a/wrapper/frame.h ++++ b/wrapper/objtool.h +@@ -1,18 +1,23 @@ +-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) ++/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) + * +- * wrapper/frame.h ++ * wrapper/objtool.h + * + * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> + */ + +-#ifndef _LTTNG_WRAPPER_FRAME_H +-#define _LTTNG_WRAPPER_FRAME_H ++#ifndef _LTTNG_WRAPPER_OBJTOOL_H ++#define _LTTNG_WRAPPER_OBJTOOL_H + + #include <linux/version.h> + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) +- ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++#include <linux/objtool.h> ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) + #include <linux/frame.h> ++#endif ++ ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) + + #define LTTNG_STACK_FRAME_NON_STANDARD(func) \ + STACK_FRAME_NON_STANDARD(func) +@@ -23,4 +28,4 @@ + + #endif + +-#endif /* _LTTNG_WRAPPER_FRAME_H */ ++#endif /* _LTTNG_WRAPPER_OBJTOOL_H */ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch new file mode 100644 index 0000000000..bc87c7174e --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch @@ -0,0 +1,179 @@ +From ddad4e82bc2cc48c0eb56d2daf69409026e8b31a Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Tue, 27 Oct 2020 12:10:05 -0400 +Subject: [PATCH 09/19] fix: btrfs: make ordered extent tracepoint take + btrfs_inode (v5.10) + +See upstream commit : + + commit acbf1dd0fcbd10c67826a19958f55a053b32f532 + Author: Nikolay Borisov <nborisov@suse.com> + Date: Mon Aug 31 14:42:40 2020 +0300 + + btrfs: make ordered extent tracepoint take btrfs_inode + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Change-Id: I096d0801ffe0ad826cfe414cdd1c0857cbd2b624 +--- + instrumentation/events/lttng-module/btrfs.h | 120 +++++++++++++++----- + 1 file changed, 90 insertions(+), 30 deletions(-) + +diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h +index 52fcfd0d..d47f3280 100644 +--- a/instrumentation/events/lttng-module/btrfs.h ++++ b/instrumentation/events/lttng-module/btrfs.h +@@ -346,7 +346,29 @@ LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist, + ) + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered), ++ ++ TP_FIELDS( ++ ctf_array(u8, fsid, inode->root->lttng_fs_info_fsid, BTRFS_UUID_SIZE) ++ ctf_integer(ino_t, ino, btrfs_ino(inode)) ++ ctf_integer(u64, file_offset, ordered->file_offset) ++ ctf_integer(u64, start, ordered->disk_bytenr) ++ ctf_integer(u64, len, ordered->num_bytes) ++ ctf_integer(u64, disk_len, ordered->disk_num_bytes) ++ ctf_integer(u64, bytes_left, ordered->bytes_left) ++ ctf_integer(unsigned long, flags, ordered->flags) ++ ctf_integer(int, compress_type, ordered->compress_type) ++ ctf_integer(int, refs, refcount_read(&ordered->refs)) ++ ctf_integer(u64, root_objectid, inode->root->root_key.objectid) ++ ) ++) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, + + TP_PROTO(const struct inode *inode, +@@ -458,7 +480,39 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, + ) + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, ++ ++ TP_PROTO(const struct btrfs_inode *inode, ++ const struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ +@@ -494,7 +548,41 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, + + TP_ARGS(inode, ordered) + ) ++#else ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) + ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, ++ ++ TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), ++ ++ TP_ARGS(inode, ordered) ++) ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ ++ LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage, + + TP_PROTO(const struct page *page, const struct inode *inode, +@@ -563,34 +651,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, + ) + ) + #else +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- +-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put, +- +- TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), +- +- TP_ARGS(inode, ordered) +-) +- + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage, + + TP_PROTO(struct page *page, struct inode *inode, +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch new file mode 100644 index 0000000000..fb00a44b31 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-ext4-fast-commit-recovery-path-v5.10.patch @@ -0,0 +1,99 @@ +From a28235f8ffa3c961640a835686dddb5ca600dfaf Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 26 Oct 2020 17:03:23 -0400 +Subject: [PATCH 10/19] fix: ext4: fast commit recovery path (v5.10) + +See upstream commit : + + commit 8016e29f4362e285f0f7e38fadc61a5b7bdfdfa2 + Author: Harshad Shirwadkar <harshadshirwadkar@gmail.com> + Date: Thu Oct 15 13:37:59 2020 -0700 + + ext4: fast commit recovery path + + This patch adds fast commit recovery path support for Ext4 file + system. We add several helper functions that are similar in spirit to + e2fsprogs journal recovery path handlers. Example of such functions + include - a simple block allocator, idempotent block bitmap update + function etc. Using these routines and the fast commit log in the fast + commit area, the recovery path (ext4_fc_replay()) performs fast commit + log recovery. + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Change-Id: Ia65cf44e108f2df0b458f0d335f33a8f18f50baa +--- + instrumentation/events/lttng-module/ext4.h | 41 ++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h +index b172c8d9..6e74abad 100644 +--- a/instrumentation/events/lttng-module/ext4.h ++++ b/instrumentation/events/lttng-module/ext4.h +@@ -1274,6 +1274,18 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent, + ) + ) + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT(ext4_load_inode, ++ TP_PROTO(struct super_block *sb, unsigned long ino), ++ ++ TP_ARGS(sb, ino), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, sb->s_dev) ++ ctf_integer(ino_t, ino, ino) ++ ) ++) ++#else + LTTNG_TRACEPOINT_EVENT(ext4_load_inode, + TP_PROTO(struct inode *inode), + +@@ -1284,6 +1296,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_load_inode, + ctf_integer(ino_t, ino, inode->i_ino) + ) + ) ++#endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)) + +@@ -1895,6 +1908,34 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, + + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan, ++ TP_PROTO(struct super_block *sb, int error, int off), ++ ++ TP_ARGS(sb, error, off), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, sb->s_dev) ++ ctf_integer(int, error, error) ++ ctf_integer(int, off, off) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT(ext4_fc_replay, ++ TP_PROTO(struct super_block *sb, int tag, int ino, int priv1, int priv2), ++ ++ TP_ARGS(sb, tag, ino, priv1, priv2), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, sb->s_dev) ++ ctf_integer(int, tag, tag) ++ ctf_integer(int, ino, ino) ++ ctf_integer(int, priv1, priv1) ++ ctf_integer(int, priv2, priv2) ++ ) ++) ++#endif ++ + #endif /* LTTNG_TRACE_EXT4_H */ + + /* This part must be outside protection */ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch new file mode 100644 index 0000000000..8651bded99 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch @@ -0,0 +1,82 @@ +From e30866f96b3ab02639f429e4bd34e59b3a336579 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 26 Oct 2020 14:28:35 -0400 +Subject: [PATCH 12/19] fix: kvm: x86/mmu: Add TDP MMU PF handler (v5.10) + +See upstream commit : + + commit bb18842e21111a979e2e0e1c5d85c09646f18d51 + Author: Ben Gardon <bgardon@google.com> + Date: Wed Oct 14 11:26:50 2020 -0700 + + kvm: x86/mmu: Add TDP MMU PF handler + + Add functions to handle page faults in the TDP MMU. These page faults + are currently handled in much the same way as the x86 shadow paging + based MMU, however the ordering of some operations is slightly + different. Future patches will add eager NX splitting, a fast page fault + handler, and parallel page faults. + + Tested by running kvm-unit-tests and KVM selftests on an Intel Haswell + machine. This series introduced no new failures. + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Change-Id: Ie56959cb6c77913d2f1188b0ca15da9114623a4e +--- + .../lttng-module/arch/x86/kvm/mmutrace.h | 20 ++++++++++++++++++- + probes/lttng-probe-kvm-x86-mmu.c | 5 +++++ + 2 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +index e5470400..86717835 100644 +--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h ++++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +@@ -163,7 +163,25 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page, + TP_ARGS(sp) + ) + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++ ++LTTNG_TRACEPOINT_EVENT_MAP( ++ mark_mmio_spte, ++ ++ kvm_mmu_mark_mmio_spte, ++ ++ TP_PROTO(u64 *sptep, gfn_t gfn, u64 spte), ++ TP_ARGS(sptep, gfn, spte), ++ ++ TP_FIELDS( ++ ctf_integer_hex(void *, sptep, sptep) ++ ctf_integer(gfn_t, gfn, gfn) ++ ctf_integer(unsigned, access, spte & ACC_ALL) ++ ctf_integer(unsigned int, gen, get_mmio_spte_generation(spte)) ++ ) ++) ++ ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) + + LTTNG_TRACEPOINT_EVENT_MAP( + mark_mmio_spte, +diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/probes/lttng-probe-kvm-x86-mmu.c +index 8f981865..5043c776 100644 +--- a/probes/lttng-probe-kvm-x86-mmu.c ++++ b/probes/lttng-probe-kvm-x86-mmu.c +@@ -31,6 +31,11 @@ + #include <../../arch/x86/kvm/mmutrace.h> + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++#include <../arch/x86/kvm/mmu.h> ++#include <../arch/x86/kvm/mmu/spte.h> ++#endif ++ + #undef TRACE_INCLUDE_PATH + #undef TRACE_INCLUDE_FILE + +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch new file mode 100644 index 0000000000..5892a408b3 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch @@ -0,0 +1,196 @@ +From bb346792c2cb6995ffc08d2084121935c6384865 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 26 Oct 2020 17:09:05 -0400 +Subject: [PATCH 14/19] fix: tracepoint: Optimize using static_call() (v5.10) + +See upstream commit : + + commit d25e37d89dd2f41d7acae0429039d2f0ae8b4a07 + Author: Steven Rostedt (VMware) <rostedt@goodmis.org> + Date: Tue Aug 18 15:57:52 2020 +0200 + + tracepoint: Optimize using static_call() + + Currently the tracepoint site will iterate a vector and issue indirect + calls to however many handlers are registered (ie. the vector is + long). + + Using static_call() it is possible to optimize this for the common + case of only having a single handler registered. In this case the + static_call() can directly call this handler. Otherwise, if the vector + is longer than 1, call a function that iterates the whole vector like + the current code. + +Upstream-Status: Backport + +Change-Id: I739dd84d62cc1a821b8bd8acff74fa29aa25d22f +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + lttng-statedump-impl.c | 80 +++++++++++++++++++++++++++++++-------- + probes/lttng.c | 7 +++- + tests/probes/lttng-test.c | 7 +++- + wrapper/tracepoint.h | 8 ++++ + 4 files changed, 84 insertions(+), 18 deletions(-) + +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c +index a6fa71a5..67ecd33c 100644 +--- a/lttng-statedump-impl.c ++++ b/lttng-statedump-impl.c +@@ -55,26 +55,76 @@ + #define LTTNG_INSTRUMENTATION + #include <instrumentation/events/lttng-module/lttng-statedump.h> + +-DEFINE_TRACE(lttng_statedump_block_device); +-DEFINE_TRACE(lttng_statedump_end); +-DEFINE_TRACE(lttng_statedump_interrupt); +-DEFINE_TRACE(lttng_statedump_file_descriptor); +-DEFINE_TRACE(lttng_statedump_start); +-DEFINE_TRACE(lttng_statedump_process_state); +-DEFINE_TRACE(lttng_statedump_process_pid_ns); ++LTTNG_DEFINE_TRACE(lttng_statedump_block_device, ++ TP_PROTO(struct lttng_session *session, ++ dev_t dev, const char *diskname), ++ TP_ARGS(session, dev, diskname)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_end, ++ TP_PROTO(struct lttng_session *session), ++ TP_ARGS(session)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_interrupt, ++ TP_PROTO(struct lttng_session *session, ++ unsigned int irq, const char *chip_name, ++ struct irqaction *action), ++ TP_ARGS(session, irq, chip_name, action)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_file_descriptor, ++ TP_PROTO(struct lttng_session *session, ++ struct files_struct *files, ++ int fd, const char *filename, ++ unsigned int flags, fmode_t fmode), ++ TP_ARGS(session, files, fd, filename, flags, fmode)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_start, ++ TP_PROTO(struct lttng_session *session), ++ TP_ARGS(session)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_state, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ int type, int mode, int submode, int status, ++ struct files_struct *files), ++ TP_ARGS(session, p, type, mode, submode, status, files)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_pid_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct pid_namespace *pid_ns), ++ TP_ARGS(session, p, pid_ns)); ++ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) +-DEFINE_TRACE(lttng_statedump_process_cgroup_ns); ++LTTNG_DEFINE_TRACE(lttng_statedump_process_cgroup_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct cgroup_namespace *cgroup_ns), ++ TP_ARGS(session, p, cgroup_ns)); + #endif +-DEFINE_TRACE(lttng_statedump_process_ipc_ns); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_ipc_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct ipc_namespace *ipc_ns), ++ TP_ARGS(session, p, ipc_ns)); ++ + #ifndef LTTNG_MNT_NS_MISSING_HEADER +-DEFINE_TRACE(lttng_statedump_process_mnt_ns); ++LTTNG_DEFINE_TRACE(lttng_statedump_process_mnt_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct mnt_namespace *mnt_ns), ++ TP_ARGS(session, p, mnt_ns)); + #endif +-DEFINE_TRACE(lttng_statedump_process_net_ns); +-DEFINE_TRACE(lttng_statedump_process_user_ns); +-DEFINE_TRACE(lttng_statedump_process_uts_ns); +-DEFINE_TRACE(lttng_statedump_network_interface); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_network_interface, ++ TP_PROTO(struct lttng_session *session, ++ struct net_device *dev, struct in_ifaddr *ifa), ++ TP_ARGS(session, dev, ifa)); ++ + #ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY +-DEFINE_TRACE(lttng_statedump_cpu_topology); ++LTTNG_DEFINE_TRACE(lttng_statedump_cpu_topology, ++ TP_PROTO(struct lttng_session *session, struct cpuinfo_x86 *c), ++ TP_ARGS(session, c)); + #endif + + struct lttng_fd_ctx { +diff --git a/probes/lttng.c b/probes/lttng.c +index 05bc1388..7ddaa69f 100644 +--- a/probes/lttng.c ++++ b/probes/lttng.c +@@ -8,7 +8,7 @@ + */ + + #include <linux/module.h> +-#include <linux/tracepoint.h> ++#include <wrapper/tracepoint.h> + #include <linux/uaccess.h> + #include <linux/gfp.h> + #include <linux/fs.h> +@@ -32,7 +32,10 @@ + #define LTTNG_LOGGER_COUNT_MAX 1024 + #define LTTNG_LOGGER_FILE "lttng-logger" + +-DEFINE_TRACE(lttng_logger); ++LTTNG_DEFINE_TRACE(lttng_logger, ++ PARAMS(const char __user *text, size_t len), ++ PARAMS(text, len) ++); + + static struct proc_dir_entry *lttng_logger_dentry; + +diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c +index b450e7d7..a4fa0645 100644 +--- a/tests/probes/lttng-test.c ++++ b/tests/probes/lttng-test.c +@@ -25,7 +25,12 @@ + #define LTTNG_INSTRUMENTATION + #include <instrumentation/events/lttng-module/lttng-test.h> + +-DEFINE_TRACE(lttng_test_filter_event); ++LTTNG_DEFINE_TRACE(lttng_test_filter_event, ++ PARAMS(int anint, int netint, long *values, ++ char *text, size_t textlen, ++ char *etext, uint32_t * net_values), ++ PARAMS(anint, netint, values, text, textlen, etext, net_values) ++); + + #define LTTNG_TEST_FILTER_EVENT_FILE "lttng-test-filter-event" + +diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h +index c4ba0123..bc19d8c1 100644 +--- a/wrapper/tracepoint.h ++++ b/wrapper/tracepoint.h +@@ -14,6 +14,14 @@ + #include <linux/tracepoint.h> + #include <linux/module.h> + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) ++#define LTTNG_DEFINE_TRACE(name, proto, args) \ ++ DEFINE_TRACE(name, PARAMS(proto), PARAMS(args)) ++#else ++#define LTTNG_DEFINE_TRACE(name, proto, args) \ ++ DEFINE_TRACE(name) ++#endif ++ + #ifndef HAVE_KABI_2635_TRACEPOINT + + #define kabi_2635_tracepoint_probe_register tracepoint_probe_register +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch new file mode 100644 index 0000000000..e848e16f59 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch @@ -0,0 +1,55 @@ +From 31f8bf794172102e9758928b481856c4a8800a7f Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Mon, 23 Nov 2020 18:14:25 +0800 +Subject: [PATCH 16/19] fix: statedump: undefined symbols caused by incorrect + patch backport + +bb346792c2cb ("fix: tracepoint: Optimize using static_call() (v5.10)") +misses three definitions and causes the following build failures. + +ERROR: "__tracepoint_lttng_statedump_process_net_ns" [lttng-statedump.ko] undefined! +ERROR: "__tracepoint_lttng_statedump_process_user_ns" [lttng-statedump.ko] undefined! +ERROR: "__tracepoint_lttng_statedump_process_uts_ns" [lttng-statedump.ko] undefined! + +Fixes: #1290 + +Upstream-Status: Backport + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + lttng-statedump-impl.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c +index 67ecd33c..cf803a73 100644 +--- a/lttng-statedump-impl.c ++++ b/lttng-statedump-impl.c +@@ -116,6 +116,24 @@ LTTNG_DEFINE_TRACE(lttng_statedump_process_mnt_ns, + TP_ARGS(session, p, mnt_ns)); + #endif + ++LTTNG_DEFINE_TRACE(lttng_statedump_process_net_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct net *net_ns), ++ TP_ARGS(session, p, net_ns)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_user_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct user_namespace *user_ns), ++ TP_ARGS(session, p, user_ns)); ++ ++LTTNG_DEFINE_TRACE(lttng_statedump_process_uts_ns, ++ TP_PROTO(struct lttng_session *session, ++ struct task_struct *p, ++ struct uts_namespace *uts_ns), ++ TP_ARGS(session, p, uts_ns)); ++ + LTTNG_DEFINE_TRACE(lttng_statedump_network_interface, + TP_PROTO(struct lttng_session *session, + struct net_device *dev, struct in_ifaddr *ifa), +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb index ca79e27df6..3515e4f51e 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb @@ -12,6 +12,12 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ file://0001-fix-btrfs-tracepoints-output-proper-root-owner-for-t.patch \ + file://0007-fix-objtool-Rename-frame.h-objtool.h-v5.10.patch \ + file://0009-fix-btrfs-make-ordered-extent-tracepoint-take-btrfs_.patch \ + file://0010-fix-ext4-fast-commit-recovery-path-v5.10.patch \ + file://0012-fix-kvm-x86-mmu-Add-TDP-MMU-PF-handler-v5.10.patch \ + file://0014-fix-tracepoint-Optimize-using-static_call-v5.10.patch \ + file://0016-fix-statedump-undefined-symbols-caused-by-incorrect-.patch \ " SRC_URI[sha256sum] = "673ef85c9f03e9b8fed10795e09d4e68add39404b70068d08b10f7b85754d7f0" @@ -37,7 +43,7 @@ SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.1 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "ad594e3a953db1b0c3c059fde45b5a5494f6be78" -PV_class-devupstream = "2.12.2+git${SRCPV}" +SRCREV_class-devupstream = "be71b60a327d7ad2588abc5cad2861177119972b" +PV_class-devupstream = "2.12.3+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch index f2c14ecc94..08c1423310 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch @@ -1,4 +1,4 @@ -From c69b68e5c03f1d260025fb1dd9ab7345e31e15ef Mon Sep 17 00:00:00 2001 +From de9fc501e775cae05f1f87534b4237cd78e8d9a8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 24 Jan 2020 18:03:25 +0100 Subject: [PATCH] tests/regression: disable the tools/live tests @@ -9,15 +9,16 @@ https://bugs.lttng.org/issues/1217 Upstream-Status: Inappropriate [upstream is working on a real fix] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - tests/regression/Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) + tests/regression/Makefile.am | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am -index 73eb9f7..b92bdbd 100644 +index cbac90d..d467886 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am -@@ -9,14 +9,10 @@ TESTS = tools/filtering/test_invalid_filter \ +@@ -11,16 +11,10 @@ TESTS = tools/filtering/test_invalid_filter \ tools/filtering/test_valid_filter \ tools/streaming/test_ust \ tools/health/test_thread_ok \ @@ -26,9 +27,29 @@ index 73eb9f7..b92bdbd 100644 - tools/live/test_lttng_ust \ tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ - tools/exclusion/test_exclusion \ +- tools/exclusion/test_exclusion \ tools/snapshots/test_ust_fast \ - tools/snapshots/test_ust_streaming \ tools/save-load/test_save \ - tools/save-load/test_load \ +- tools/save-load/test_load \ tools/save-load/test_autoload \ + tools/mi/test_mi \ + tools/wildcard/test_event_wildcard \ +@@ -38,8 +32,7 @@ TESTS = tools/filtering/test_invalid_filter \ + tools/working-directory/test_relayd_working_directory \ + tools/notification/test_notification_multi_app \ + tools/clear/test_ust \ +- tools/clear/test_kernel \ +- tools/tracker/test_event_tracker ++ tools/clear/test_kernel + + if HAVE_LIBLTTNG_UST_CTL + SUBDIRS += ust +@@ -60,7 +53,6 @@ TESTS += ust/before-after/test_before_after \ + ust/multi-lib/test_multi_lib \ + ust/rotation-destroy-flush/test_rotation_destroy_flush \ + ust/namespaces/test_ns_contexts \ +- ust/namespaces/test_ns_contexts_change \ + tools/metadata/test_ust \ + tools/relayd-grouping/test_ust + endif # HAVE_LIBLTTNG_UST_CTL diff --git a/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index 3274c25a69..28fe6f92d7 100755 --- a/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh +++ b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh @@ -17,7 +17,7 @@ LOAD_MODULE=modprobe # Test if modules.dep exists and has a size greater than zero if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..." - depmod -Ae + depmod -a fi [ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0 diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch new file mode 100644 index 0000000000..efc79f6c0f --- /dev/null +++ b/poky/meta/recipes-kernel/systemtap/systemtap/0001-transport-protect-include-and-callsite-with-same-con.patch @@ -0,0 +1,44 @@ +From cbf27cd54071f788231e69d96dbaad563f1010d4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 18 Dec 2020 13:15:08 -0500 +Subject: [PATCH] transport: protect include and callsite with same conditional + +transport.c has the following code block: + + if (!debugfs_p && security_locked_down (LOCKDOWN_DEBUGFS)) + +Which is protected by the conditional STAPCONF_LOCKDOWN_DEBUGFS. + +linux/security.h provides the definition of LOCKDOWN_DEBUGFS, and +must be included or we have a compilation issue. + +The include of security.h is protected by #ifdef CONFIG_SECURITY_LOCKDOWN_LSM, +which means that in some configurations we can get out of sync with +the include and the callsite. + +If we protect the include and the callsite with the same #ifdef, we can +be sure that they will be consistent. + +Upstream-status: Inappropriate (kernel-devsrc specific) + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + runtime/transport/transport.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c +index bb4a98bd3..88e20ea28 100644 +--- a/runtime/transport/transport.c ++++ b/runtime/transport/transport.c +@@ -21,7 +21,7 @@ + #include <linux/namei.h> + #include <linux/delay.h> + #include <linux/mutex.h> +-#ifdef CONFIG_SECURITY_LOCKDOWN_LSM ++#ifdef STAPCONF_LOCKDOWN_DEBUGFS + #include <linux/security.h> + #endif + #include "../uidgid_compatibility.h" +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/systemtap/systemtap_git.inc b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc index 56fa51d61e..016b423847 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,12 +1,13 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "82b8e1a07a31bf37ed05d6ebc5162b054c0be9fd" -PV = "4.3" +SRCREV = "988f439af39a359b4387963ca4633649866d8275" +PV = "4.4" SRC_URI = "git://sourceware.org/git/systemtap.git \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ + file://0001-transport-protect-include-and-callsite-with-same-con.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb index 2e09ef9c25..9fd9e0be93 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gst-devtools_1.18.2.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "712212babd2238233d55beecfc0fe1ea8db18e8807ac6ab05a64505b2c7ab0df" +SRC_URI[sha256sum] = "6ea73d718bf1f9692218540ff88479c51d67c0b477fa56d6812fc7b739d30a56" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" diff --git a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb index 048b45a08f..54a4b5df15 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gst-examples_1.18.2.bb @@ -9,7 +9,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=http file://gst-player.desktop \ " -SRCREV = "998ee69af18a5928759dbe17fffbceebbc8d72d0" +SRCREV = "45086d8ef2d75244d9d5c8f69c0f0e1dfd4200b3" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb index 38bbffafa4..b638814aa4 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "39a717bc2613efbbba19df3cf5cacff0987471fc8281ba2c5dcdeaded79c2ed8" +SRC_URI[sha256sum] = "36969ad44c5f0756a8a90215410710d6c39713d58f6cee13d663be9774557f49" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb index 513d66f9fc..686fcc2655 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "42a8e0f9518b94655981ede441638f9f9395f4b1b9a4b329f068ee793975a965" +SRC_URI[sha256sum] = "4c05d64544eecf4aaf5b337789916c67ed720317dfb2c8c8c335720fcc5c7cf4" S = "${WORKDIR}/gst-omx-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb index ebd8c5a27d..d37a223254 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb @@ -6,7 +6,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2" +SRC_URI[sha256sum] = "8ad5822f1118fe46a19af54422b74e3a16d79a6800dcb173b49e199a496b341a" S = "${WORKDIR}/gst-plugins-bad-${PV}" @@ -27,6 +27,7 @@ PACKAGECONFIG ??= " \ ttml uvch264 webp \ " +PACKAGECONFIG[aom] = "-Daom=enabled,-Daom=disabled,aom" PACKAGECONFIG[assrender] = "-Dassrender=enabled,-Dassrender=disabled,libass" PACKAGECONFIG[bluez] = "-Dbluez=enabled,-Dbluez=disabled,bluez5" PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2" @@ -64,7 +65,7 @@ PACKAGECONFIG[resindvd] = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdr PACKAGECONFIG[rsvg] = "-Drsvg=enabled,-Drsvg=disabled,librsvg" PACKAGECONFIG[rtmp] = "-Drtmp=enabled,-Drtmp=disabled,rtmpdump" PACKAGECONFIG[sbc] = "-Dsbc=enabled,-Dsbc=disabled,sbc" -PACKAGECONFIG[sctp] = "-Dsctp=enabled,-Dsctp=disabled,usrsctp" +PACKAGECONFIG[sctp] = "-Dsctp=enabled,-Dsctp=disabled" PACKAGECONFIG[smoothstreaming] = "-Dsmoothstreaming=enabled,-Dsmoothstreaming=disabled,libxml2" PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" PACKAGECONFIG[srt] = "-Dsrt=enabled,-Dsrt=disabled,srt" @@ -72,6 +73,7 @@ PACKAGECONFIG[srtp] = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp" PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa" PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo" PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev" +PACKAGECONFIG[v4l2codecs] = "-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev" PACKAGECONFIG[va] = "-Dva=enabled,-Dva=disabled,libva" PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc" PACKAGECONFIG[voamrwbenc] = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc" @@ -81,14 +83,7 @@ PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice" PACKAGECONFIG[webrtcdsp] = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing" PACKAGECONFIG[zbar] = "-Dzbar=enabled,-Dzbar=disabled,zbar" -PACKAGECONFIG[v4l2codecs] = "-D-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev" - -# these plugins currently have no corresponding library in OE-core or meta-openembedded: -# aom androidmedia applemedia bs2b chromaprint d3dvideosink -# directsound dts fdkaac gme gsm iq kate ladspa lv2 mpeg2enc -# mplex musepack nvdec nvenc ofa openexr openni2 opensles -# soundtouch spandsp teletext wasapi wildmidi winks -# winscreencap wpe x265 +PACKAGECONFIG[x265] = "-Dx265=enabled,-Dx265=disabled,x265" EXTRA_OEMESON += " \ -Ddoc=disabled \ @@ -96,9 +91,8 @@ EXTRA_OEMESON += " \ -Ddvb=enabled \ -Dfbdev=enabled \ -Dipcpipeline=enabled \ - -Dnetsim=enabled \ -Dshm=enabled \ - -Daom=disabled \ + -Dtranscode=enabled \ -Dandroidmedia=disabled \ -Dapplemedia=disabled \ -Davtp=disabled \ @@ -137,7 +131,6 @@ EXTRA_OEMESON += " \ -Dwinks=disabled \ -Dwinscreencap=disabled \ -Dwpe=disabled \ - -Dx265=disabled \ -Dzxing=disabled \ " diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb index 1b2bd4fe14..531d577b0c 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.2.bb @@ -9,7 +9,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ file://0004-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[sha256sum] = "1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641" +SRC_URI[sha256sum] = "dd04fb1f7826e2f6d9b4d66fc22f19cc6a47c301e13041f0ee3d7f65c89b05ac" S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch deleted file mode 100644 index 685ee08e50..0000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3ec4fe5507a39383b161f1ab7687acb4a57c32f8 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 15 Nov 2020 11:30:07 +0000 -Subject: [PATCH] rpicamsrc: add vchostif library as it is required to build - successful - -fix: undefined reference to `vc_gencmd' -/usr/src/debug/gstreamer1.0-plugins-good/1.18.1-r0/build/../gst-plugins-good-1.18.1/sys/rpicamsrc/RaspiCamControl.c:1440: undefined reference to `vc_gencmd' - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/818] - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - sys/rpicamsrc/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build -index dc18a8345..48b2ceb66 100644 ---- a/sys/rpicamsrc/meson.build -+++ b/sys/rpicamsrc/meson.build -@@ -34,7 +34,7 @@ if not cc.has_header('bcm_host.h', args: rpi_inc_args) - endif - - mmal_deps = [] --foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host'] -+foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'vchostif', 'bcm_host'] - l = cc.find_library(rpi_lib, dirs: rpi_lib_path, required: false) - if not l.found() - if get_option('rpicamsrc').enabled() --- -2.29.2 - diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb index 77e1333ddc..2e076bf884 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.2.bb @@ -2,10 +2,9 @@ require gstreamer1.0-plugins-common.inc SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ - file://0001-rpicamsrc-add-vchostif-library-as-it-is-required-to-.patch \ " -SRC_URI[sha256sum] = "e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c" +SRC_URI[sha256sum] = "f71752dde434d9ec55fa5e8d2e2a3be3fc6eb5b34f397b065f84aead25b449a4" S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb index 614ef8d740..e482aa10b2 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.2.bb @@ -9,7 +9,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "18cd6cb829eb9611ca63cbcbf46aca0f0de1dd28b2df18caa2834326a75ff725" +SRC_URI[sha256sum] = "a337a022ed472209b38cab5918dc2f4e7a6adc1f4afacd226a6345e5cb668bdb" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb index c0c5d271d0..5711744b4d 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.2.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "42b289422f7ab32757670848cf2245c5a8a8b08a665a9cab65ded8d69364f6f6" +SRC_URI[sha256sum] = "e19d0f760b353e88161b3712193cffbd79bf1314418da792b5fec4d8ecef389c" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb index 30534c9782..b680aa38d6 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.2.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "10a82865c3d199e66731017ca4b120bad071df9889e60cfe4dd6c49d953ef754" +SRC_URI[sha256sum] = "973922aba65a1672a131527dee965fb09bab4bb996c351f0ee7f42f0d5b954e2" S = "${WORKDIR}/${PNREAL}-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb index acf5598a62..f237191d5f 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "400d3c42810b50b4566df03f37319a6bdd758f969560c40147e7d9a3b0e8a6ea" +SRC_URI[sha256sum] = "8c7b2c74fda095d83dea67accde6a68ba9f608d97ed969fdcf278930f9b1c7c0" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch index 17f8a0beb7..fe58e718a7 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch @@ -1,27 +1,41 @@ -From f700975f514758a4a7582c2c972fa54ecfca3302 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 25 Jan 2018 17:55:02 +0200 -Subject: [PATCH 1/4] gst/gstpluginloader.c: when env var is set do not fall - through to system plugin scanner +From fd8f49dba8c09d47425da80f5faab3bfa4a7c962 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 10 Oct 2020 19:09:03 +0000 +Subject: [PATCH 1/3] gstpluginloader: when env var is set do not fall through + to system plugin scanner If we set a custom GST_PLUGIN_SCANNER env var, then we probably want to use that and only that. Falling through to the one installed on the system is problamatic in cross-compilation environemnts, regardless of whether one pointed to by the env var succeeded or failed. -written by: Alexander Kanavin <alex.kanavin@gmail.com> +taken from: +http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch?id=0db7ba34ca41b107042306d13a6f0162885c123b Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669] Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> --- - gst/gstpluginloader.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + gst/gstpluginloader.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c -index d1e404d..2e00c3c 100644 +index d1e404d98..c626bf263 100644 --- a/gst/gstpluginloader.c +++ b/gst/gstpluginloader.c -@@ -475,9 +475,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) +@@ -464,20 +464,19 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) + if (loader->child_running) + return TRUE; + +- /* Find the gst-plugin-scanner: first try the env-var if it is set, +- * otherwise use the installed version */ ++ /* Find the gst-plugin-scanner */ + env = g_getenv ("GST_PLUGIN_SCANNER_1_0"); + if (env == NULL) + env = g_getenv ("GST_PLUGIN_SCANNER"); + + if (env != NULL && *env != '\0') { ++ /* use the env-var if it is set */ + GST_LOG ("Trying GST_PLUGIN_SCANNER env var: %s", env); helper_bin = g_strdup (env); res = gst_plugin_loader_try_helper (loader, helper_bin); g_free (helper_bin); @@ -29,9 +43,24 @@ index d1e404d..2e00c3c 100644 - - if (!res) { + } else { ++ /* use the installed version */ GST_LOG ("Trying installed plugin scanner"); #ifdef G_OS_WIN32 +@@ -497,10 +496,10 @@ gst_plugin_loader_spawn (GstPluginLoader * loader) + #endif + res = gst_plugin_loader_try_helper (loader, helper_bin); + g_free (helper_bin); ++ } + +- if (!res) { +- GST_INFO ("No gst-plugin-scanner available, or not working"); +- } ++ if (!res) { ++ GST_INFO ("No gst-plugin-scanner available, or not working"); + } + + return loader->child_running; -- -2.28.0 +2.29.2 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch deleted file mode 100644 index a2d215d72d..0000000000 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4449246a8d788e71dfe4679fba95955cec5894c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 3 Nov 2020 22:58:26 -0800 -Subject: [PATCH] gst_private.h: increse padding in struct _GstClockEntryImpl - -When compiling for 32bit architectures with 64bit time_t e.g. riscv32, -the static assert that the GstClockEntryImpl smaller or -equal to the struct _GstClockEntryImpl triggered. -(they were 12bytes off). - -To fix this, the padding is increased by 8 bytes (on 32bit). - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/694] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gst/gst_private.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/gst_private.h b/gst/gst_private.h -index a8897e1..8252ede 100644 ---- a/gst/gst_private.h -+++ b/gst/gst_private.h -@@ -522,7 +522,7 @@ struct _GstClockEntryImpl - GstClockEntry entry; - GWeakRef clock; - GDestroyNotify destroy_entry; -- gpointer padding[19]; /* padding for allowing e.g. systemclock -+ gpointer padding[21]; /* padding for allowing e.g. systemclock - * to add data in lieu of overridable - * virtual functions on the clock */ - }; --- -2.29.2 - diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch index c8bd58d471..96abef17b0 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch @@ -1,7 +1,7 @@ -From 355dd938bfb2cd36d6c3c4ed59ba1dcafdc78d95 Mon Sep 17 00:00:00 2001 +From 598d108e2c438d8f2ecd3bf948fa3ebbd3681490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> Date: Fri, 14 Aug 2020 16:38:26 +0100 -Subject: [PATCH 2/4] Remove unused valgrind detection +Subject: [PATCH 2/3] Remove unused valgrind detection Having this just to log a debug message in case we're running inside valgrind doesn't seem very useful, and @@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> 3 files changed, 42 deletions(-) diff --git a/gst/gst_private.h b/gst/gst_private.h -index 1b0f02b..a8897e1 100644 +index eefd044d9..8252ede51 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -116,8 +116,6 @@ G_GNUC_INTERNAL gboolean _priv_plugin_deps_env_vars_changed (GstPlugin * plugin @@ -32,10 +32,10 @@ index 1b0f02b..a8897e1 100644 G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); diff --git a/gst/gstinfo.c b/gst/gstinfo.c -index 37987d3..15f522e 100644 +index 5d317877b..097f8b20d 100644 --- a/gst/gstinfo.c +++ b/gst/gstinfo.c -@@ -304,36 +304,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; +@@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; @@ -72,7 +72,7 @@ index 37987d3..15f522e 100644 static gchar * _replace_pattern_in_gst_debug_file_name (gchar * name, const char *token, guint val) -@@ -462,9 +432,6 @@ _priv_gst_debug_init (void) +@@ -463,9 +433,6 @@ _priv_gst_debug_init (void) _priv_GST_CAT_PROTECTION = _gst_debug_category_new ("GST_PROTECTION", 0, "protection"); @@ -82,7 +82,7 @@ index 37987d3..15f522e 100644 env = g_getenv ("GST_DEBUG_OPTIONS"); if (env != NULL) { if (strstr (env, "full_tags") || strstr (env, "full-tags")) -@@ -2502,12 +2469,6 @@ gst_debug_construct_win_color (guint colorinfo) +@@ -2503,12 +2470,6 @@ gst_debug_construct_win_color (guint colorinfo) return 0; } @@ -96,7 +96,7 @@ index 37987d3..15f522e 100644 _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, const gchar * func, gint line, GObject * obj, const gchar * msg, diff --git a/meson.build b/meson.build -index f95b4f7..143c043 100644 +index ce1921aa4..7a84d0981 100644 --- a/meson.build +++ b/meson.build @@ -200,7 +200,6 @@ check_headers = [ @@ -108,5 +108,5 @@ index f95b4f7..143c043 100644 'sys/uio.h', ] -- -2.28.0 +2.29.2 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch index 1c0e1f8171..bf5e57249c 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-option-for-installed-tests.patch @@ -1,7 +1,7 @@ -From 24867db22a5cc35e7643bc218e959ce56c306aca Mon Sep 17 00:00:00 2001 +From cf8077a7e3ab0ae236ebde79b7fc0b02eac658de Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani <crg7475@mailbox.org> Date: Fri, 25 Oct 2019 00:06:26 +0200 -Subject: [PATCH 3/4] meson: Add option for installed tests +Subject: [PATCH 3/3] meson: Add option for installed tests This adds an option for producing installed versions of the unit tests. These versions don't need meson to run (only a small shell script). This @@ -23,7 +23,7 @@ Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> diff --git a/build-aux/gen-installed-test-desc.py b/build-aux/gen-installed-test-desc.py new file mode 100644 -index 0000000..69e8a0f +index 000000000..69e8a0faf --- /dev/null +++ b/build-aux/gen-installed-test-desc.py @@ -0,0 +1,18 @@ @@ -47,7 +47,7 @@ index 0000000..69e8a0f +write_template(args.output, build_template(args.test_execdir, args.testname)) diff --git a/build-aux/gen-installed-test-shscript.py b/build-aux/gen-installed-test-shscript.py new file mode 100644 -index 0000000..5da86fb +index 000000000..5da86fb37 --- /dev/null +++ b/build-aux/gen-installed-test-shscript.py @@ -0,0 +1,25 @@ @@ -77,7 +77,7 @@ index 0000000..5da86fb +write_template(args.output, build_template(args.test_execdir, args.testname)) +os.chmod(args.output, 0o755) diff --git a/meson_options.txt b/meson_options.txt -index 72c3997..346c423 100644 +index 72c3997e2..346c423d4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,6 +15,8 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso @@ -90,7 +90,7 @@ index 72c3997..346c423 100644 # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') diff --git a/tests/check/meson.build b/tests/check/meson.build -index 372ea41..bb0dcfa 100644 +index a617cf159..e629131c5 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -120,11 +120,17 @@ if add_languages('cpp', native: false, required: false) @@ -168,7 +168,7 @@ index 372ea41..bb0dcfa 100644 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') diff --git a/tests/files/testfile b/tests/files/testfile new file mode 100644 -index 0000000..89954e0 +index 000000000..89954e0e2 --- /dev/null +++ b/tests/files/testfile @@ -0,0 +1,80 @@ @@ -253,5 +253,5 @@ index 0000000..89954e0 +................................................................................ +................................................................................ -- -2.28.0 +2.29.2 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb index d55b2871e7..cce0f99226 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.2.bb @@ -19,9 +19,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ file://0002-Remove-unused-valgrind-detection.patch \ file://0003-meson-Add-option-for-installed-tests.patch \ - file://0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch \ " -SRC_URI[sha256sum] = "79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba" +SRC_URI[sha256sum] = "66cdeb4f970c2e55932a2f427177d438fe2c55c0b6d29e80fda80263f2ae5446" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ @@ -36,7 +35,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" -PACKAGECONFIG[setcap] = ",,libcap libcap-native" +PACKAGECONFIG[setcap] = "-Dptp-helper-permissions=capabilities,,libcap libcap-native" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 3a26cb59dd..e40b8c1c40 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -56,47 +56,47 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \ file://src/pulsecore/filter/biquad.h;beginline=1;endline=4;md5=6d46d1365206528a20137355924233c1 \ " +# libtool is needed for libltdl, used in module loading. DEPENDS = "libatomic-ops libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0" DEPENDS += "speexdsp libxml-parser-perl-native libcap" -inherit autotools bash-completion pkgconfig useradd gettext perlnative systemd manpages gsettings +inherit bash-completion meson pkgconfig useradd gettext perlnative systemd manpages gsettings # *.desktop rules wont be generated during configure and build will fail # if using --disable-nls USE_NLS = "yes" -EXTRA_OECONF = "\ - --disable-hal-compat \ - --disable-orc \ - --enable-tcpwrap=no \ - --with-access-group=audio \ - --disable-openssl \ - --with-database=simple \ - --without-zsh-completion-dir \ - --with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d \ - ac_cv_header_valgrind_memcheck_h=no \ - --disable-tests \ - --disable-running-from-build-tree \ +EXTRA_OEMESON = "\ + -Dhal-compat=false \ + -Dorc=disabled \ + -Daccess_group=audio \ + -Dopenssl=disabled \ + -Ddatabase=simple \ + -Dzshcompletiondir=no \ + -Dudevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ + -Dvalgrind=disabled \ + -Dtests=false \ + -Drunning-from-build-tree=false \ " # soxr (the SoX Resampler library) doesn't seem to be currently packaged in # oe-core nor meta-oe, so let's not add a PACKAGECONFIG entry for it for now. -EXTRA_OECONF += "--without-soxr" +EXTRA_OEMESON += "-Dsoxr=disabled" # The FFTW dependency (for module-equalizer-sink) was removed in commit # ddbd713293 without explaining why it was not made a PACKAGECONFIG item # instead. Oh well, let's keep it disabled until someone expresses some # interest in having it enabled. -EXTRA_OECONF += "--without-fftw" +EXTRA_OEMESON += "-Dfftw=disabled" # The "adrian" echo canceller implementation has a non-standard license # (src/modules/echo-cancel/adrian-license.txt). It's a permissive license, so # the licensing terms are probably not problematic, but it would be an extra # hassle to add the license to OE-Core's set of licenses. The canceller isn't # very good anyway, better alternatives exist (such as the webrtc canceller). -EXTRA_OECONF += "--disable-adrian-aec" +EXTRA_OEMESON += "-Dadrian-aec=false" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ @@ -105,35 +105,25 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5' dbus gsettings \ " -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" -PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf" -PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" -PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" -PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" -PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enable-systemd-journal --with-systemduserunitdir=${systemd_user_unitdir},--disable-systemd-daemon --disable-systemd-login --disable-systemd-journal,systemd" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" +PACKAGECONFIG[bluez5] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0-native glib-2.0" +PACKAGECONFIG[ofono] = "-Dbluez5-ofono-headset=true,-Dbluez5-ofono-headset=false,ofono" +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemduserunitdir=${systemd_user_unitdir},-Dsystemd=disabled,systemd" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxtst libice libsm libxcb" +PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" # Since many embedded systems don't have non-root users, it's useful to be # able to use pulseaudio autospawn for root as well. PACKAGECONFIG[autospawn-for-root] = ",,," -PACKAGECONFIG[lirc] = "--enable-lirc,--disable-lirc,lirc" -PACKAGECONFIG[webrtc] = "--enable-webrtc-aec,--disable-webrtc-aec,webrtc-audio-processing" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, " - -EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" -EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" - +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[webrtc] = "-Dwebrtc-aec=enabled,-Dwebrtc-aec=disabled,webrtc-audio-processing" +PACKAGECONFIG[ipv6] = "-Dipv6=true,-Dipv6=false," +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false," export TARGET_PFPU = "${TARGET_FPU}" -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - set_cfg_value () { sed -i -e "s/\(; *\)\?$2 =.*/$2 = $3/" "$1" if ! grep -q "^$2 = $3\$" "$1"; then @@ -143,7 +133,7 @@ set_cfg_value () { do_compile_append () { if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then - set_cfg_value src/client.conf allow-autospawn-for-root yes + set_cfg_value src/pulse/client.conf allow-autospawn-for-root yes fi } @@ -269,7 +259,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" -FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper" GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch new file mode 100644 index 0000000000..d60a9a211f --- /dev/null +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch @@ -0,0 +1,67 @@ +From 6d202833a5ae241eeb648631cf95090c452198f9 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanuk@iki.fi> +Date: Fri, 14 Feb 2020 07:29:33 +0200 +Subject: [PATCH] build-sys: Add an option for enabling/disabling Valgrind + +In OpenEmbedded the PulseAudio recipe currently disables Valgrind +support by passing "ac_cv_header_valgrind_memcheck_h=no" to the +configure script (this was added to make it deterministic whether +Valgrdind support gets enabled or not). I'm converting the PulseAudio +recipe to use Meson, and I needed an option to disable Valgrind. + +Upstream-Status: Backport + +Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> +--- + meson.build | 6 +++++- + meson_options.txt | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 658eeee57..258962724 100644 +--- a/meson.build ++++ b/meson.build +@@ -220,7 +220,6 @@ check_headers = [ + 'sys/un.h', + 'sys/wait.h', + 'syslog.h', +- 'valgrind/memcheck.h', + 'xlocale.h', + ] + +@@ -231,6 +230,10 @@ foreach h : check_headers + endif + endforeach + ++if cc.has_header('valgrind/memcheck.h', required: get_option('valgrind')) ++ cdata.set('HAVE_VALGRIND_MEMCHECK_H', 1) ++endif ++ + # FIXME: move this to the above set + if cc.has_header('pthread.h') + cdata.set('HAVE_PTHREAD', 1) +@@ -841,6 +844,7 @@ summary = [ + 'Enable SoXR (resampler): @0@'.format(soxr_dep.found()), + 'Enable WebRTC echo canceller: @0@'.format(webrtc_dep.found()), + 'Enable Gcov coverage: @0@'.format(get_option('gcov')), ++ 'Enable Valgrind: @0@'.format(cdata.has('HAVE_VALGRIND_MEMCHECK_H')), + 'Enable man pages: @0@'.format(get_option('man')), + 'Enable unit tests: @0@'.format(get_option('tests')), + '', +diff --git a/meson_options.txt b/meson_options.txt +index 824f24e08..115cc84af 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -138,6 +138,9 @@ option('systemd', + option('udev', + type : 'feature', value : 'auto', + description : 'Optional udev support') ++option('valgrind', ++ type : 'feature', value : 'auto', ++ description : 'Optional Valgrind support') + option('x11', + type : 'feature', value : 'auto', + description : 'Optional X11 support') +-- +2.20.1 + diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch new file mode 100644 index 0000000000..c9d8abcbf2 --- /dev/null +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch @@ -0,0 +1,82 @@ +From 9d0dc8aedd08d77797f90fa6075a59613f18bf0d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 Dec 2020 07:56:07 -0800 +Subject: [PATCH] meson: Check for __get_cpuid + +checking for presence of cpuid.h header alone is not sufficient in some case to use +cpuid related functions. e.g. when using clang which is built for +multiple targets will have cpuid.h header as part of compiler headers in +distribution but one maybe compiling pulseaudion for non-x86 target. The +current check in meson succeeds and then compile fails later because +cpuid.h is x86-specific header. Therefore checking for symbol that is +needed makes this robust, so even if header exist it will try to ensure +the given symbol can be used + +Fixes +src/pulsecore/core-util.c:113: +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/pulseaudio/14.0-r0/recipe-sysroot-native/usr/lib/clang/11.0.1/include/cpuid.h:11:2: error: this header is for x86 only +| #error this header is for x86 only +| ^ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Tanu Kaskinen <tanuk@iki.fi> +--- + meson.build | 5 ++++- + src/pulsecore/core-util.c | 2 +- + src/pulsecore/cpu-x86.c | 2 +- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 2589627..5f5127e 100644 +--- a/meson.build ++++ b/meson.build +@@ -185,7 +185,6 @@ endif + check_headers = [ + 'arpa/inet.h', + 'byteswap.h', +- 'cpuid.h', + 'dlfcn.h', + 'execinfo.h', + 'grp.h', +@@ -243,6 +242,10 @@ if cc.has_header_symbol('pthread.h', 'PTHREAD_PRIO_INHERIT') + cdata.set('HAVE_PTHREAD_PRIO_INHERIT', 1) + endif + ++if cc.has_header_symbol('cpuid.h', '__get_cpuid') ++ cdata.set('HAVE_GET_CPUID', 1) ++endif ++ + # Functions + + check_functions = [ +diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c +index 601b1d1..6f34e7c 100644 +--- a/src/pulsecore/core-util.c ++++ b/src/pulsecore/core-util.c +@@ -109,7 +109,7 @@ + #include <sys/personality.h> + #endif + +-#ifdef HAVE_CPUID_H ++#ifdef HAVE_GET_CPUID + #include <cpuid.h> + #endif + +diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c +index 4e59e14..86595d4 100644 +--- a/src/pulsecore/cpu-x86.c ++++ b/src/pulsecore/cpu-x86.c +@@ -24,7 +24,7 @@ + + #include <stdint.h> + +-#ifdef HAVE_CPUID_H ++#ifdef HAVE_GET_CPUID + #include <cpuid.h> + #endif + +-- +2.29.2 + diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb index ac0c82e37d..fccca1ba48 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.0.bb @@ -3,6 +3,8 @@ require pulseaudio.inc SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ + file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ + file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ " SRC_URI[md5sum] = "84a7776e63dd55c40db8fbd7c7e2e18e" diff --git a/poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch b/poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch new file mode 100644 index 0000000000..11cec74fbb --- /dev/null +++ b/poky/meta/recipes-multimedia/sbc/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch @@ -0,0 +1,45 @@ +From f4a1224323e386090a44bf70ee0ac9877ba7fb0d Mon Sep 17 00:00:00 2001 +From: Marius Bakke <marius@gnu.org> +Date: Tue, 22 Dec 2020 11:04:26 +0000 +Subject: [PATCH] sbc_primitives: Fix build on non-x86. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Don't call __builtin_cpu_init unless targeting i386 or x86_64. +Otherwise we get an error at link time: + + CC sbc/sbc_primitives.lo +sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: +sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration] +[...] + CCLD src/sbcdec +ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': +sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + sbc/sbc_primitives.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c +index 97a75be..09c214a 100644 +--- a/sbc/sbc_primitives.c ++++ b/sbc/sbc_primitives.c +@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( + + static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + { ++#if defined(__x86_64__) || defined(__i386__) + __builtin_cpu_init(); + + #ifdef SBC_BUILD_WITH_MMX_SUPPORT +@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + if (__builtin_cpu_supports("sse4.2")) + sbc_init_primitives_sse(state); + #endif ++#endif + } + + /* diff --git a/poky/meta/recipes-multimedia/sbc/sbc_1.4.bb b/poky/meta/recipes-multimedia/sbc/sbc_1.5.bb index 674d77ef48..04d82320c9 100644 --- a/poky/meta/recipes-multimedia/sbc/sbc_1.4.bb +++ b/poky/meta/recipes-multimedia/sbc/sbc_1.5.bb @@ -12,10 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ DEPENDS = "libsndfile1" -SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${BP}.tar.xz" +SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${BP}.tar.xz \ + file://0001-sbc_primitives-Fix-build-on-non-x86.patch \ + " -SRC_URI[md5sum] = "800fb0908899baa48dc216d8e156cc05" -SRC_URI[sha256sum] = "518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9" +SRC_URI[sha256sum] = "0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2" inherit autotools pkgconfig diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 8e4d5b3349..5b65cf8655 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -18,7 +18,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "9aa7b7cdfb2bcd200f45941a58d6ae698882a2d4" +SRCREV = "84cb4c6701e027090ff3fd955ce08065e20121b2" PE = "2" PV = "0.0+git${SRCPV}" diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index b064a63caa..1855232973 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -30,7 +30,7 @@ EXTRA_OECONF = "--enable-xim \ --enable-combining --disable-perl \ --with-x=${STAGING_DIR_HOST}${prefix}" -EXTRA_OECONF_append_libc-musl = " --disable-wtmp" +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" PACKAGECONFIG ??= "" PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch deleted file mode 100644 index 3a02253e5e..0000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 8d1c44a03c1870912991467f8d8cd8bb6f85efa5 Mon Sep 17 00:00:00 2001 -From: "stephan.szabo@sony.com" <stephan.szabo@sony.com> -Date: Tue, 3 Nov 2020 20:06:15 +0000 -Subject: [PATCH] ICU 68.1 no longer exposes FALSE and TRUE macros by default - https://bugs.webkit.org/show_bug.cgi?id=218522 - -Reviewed by Don Olmstead. - -Source/WebCore: - -* platform/text/TextCodecICU.cpp: Replace use of TRUE with true - -Source/WebKit: - -* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false - -Source/WTF: - -Replace uses of FALSE and TRUE with false and true. - -* wtf/text/icu/UTextProvider.h: -* wtf/text/icu/UTextProviderLatin1.cpp: -* wtf/text/icu/UTextProviderUTF16.cpp: - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++---- - Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- - Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++-- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- - 5 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h -index c8f28d6e..3c6fbeab 100644 ---- a/Source/WTF/wtf/text/icu/UTextProvider.h -+++ b/Source/WTF/wtf/text/icu/UTextProvider.h -@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -index 0a646b7f..49980f95 100644 ---- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) -diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -index 69c8d091..9c3fa709 100644 ---- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index c2684939..e716a6fb 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -240,7 +240,7 @@ void TextCodecICU::createICUConverter() const - UErrorCode error = U_ZERO_ERROR; - m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; - if (m_converter) -- ucnv_setFallback(m_converter.get(), TRUE); -+ ucnv_setFallback(m_converter.get(), true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error) -diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 61e3f605..5a51b9ec 100644 ---- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor() - int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor) - { - monitor->didDraw(); -- return FALSE; -+ return false; - } - - void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback) --- -2.25.1 - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb index 31370f3239..a16a676d7a 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.30.4.bb @@ -18,9 +18,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ file://include_xutil.patch \ - file://0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch \ " -SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a" +SRC_URI[sha256sum] = "d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc diff --git a/poky/meta/recipes-support/apr/apr-util_1.6.1.bb b/poky/meta/recipes-support/apr/apr-util_1.6.1.bb index 0dd8f025e8..f7d827a1d8 100644 --- a/poky/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/poky/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -19,10 +19,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ - --with-dbm=gdbm \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}" @@ -69,7 +68,7 @@ PACKAGECONFIG ??= "crypto gdbm" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" -PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" +PACKAGECONFIG[gdbm] = "--with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" diff --git a/poky/meta/recipes-support/apr/apr_1.7.0.bb b/poky/meta/recipes-support/apr/apr_1.7.0.bb index 7073af8c98..c9b9bf0f50 100644 --- a/poky/meta/recipes-support/apr/apr_1.7.0.bb +++ b/poky/meta/recipes-support/apr/apr_1.7.0.bb @@ -1,4 +1,8 @@ SUMMARY = "Apache Portable Runtime (APR) library" +DESCRIPTION = "The Apache Portable Runtime (APR) is a supporting library for the \ +Apache web server. It provides a set of APIs that map to the underlying \ +operating system (OS). Where the OS does not support a particular function, \ +APR will provide an emulation." HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" DEPENDS = "util-linux" diff --git a/poky/meta/recipes-support/aspell/aspell_0.60.8.bb b/poky/meta/recipes-support/aspell/aspell_0.60.8.bb index 629987810a..f1d931b39c 100644 --- a/poky/meta/recipes-support/aspell/aspell_0.60.8.bb +++ b/poky/meta/recipes-support/aspell/aspell_0.60.8.bb @@ -1,4 +1,8 @@ SUMMARY = "GNU Aspell spell-checker" +DESCRIPTION = "GNU Aspell is a spell-checker which can be used either as a \ +standalone application or embedded in other programs. Its main feature is that \ +it does a much better job of suggesting possible spellings than just about any \ +other spell-checker available for the English language" SECTION = "console/utils" LICENSE = "LGPLv2 | LGPLv2.1" diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb index 88add83dd1..a0657950be 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.38.0.bb @@ -1,4 +1,6 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +DESCRIPTION = "At-Spi2 is a protocol over DBus, toolkit widgets use it to \ +provide their content to screen readers such as Orca." HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" diff --git a/poky/meta/recipes-support/attr/acl_2.2.53.bb b/poky/meta/recipes-support/attr/acl_2.2.53.bb index 5bb50f77f7..b120c1f16f 100644 --- a/poky/meta/recipes-support/attr/acl_2.2.53.bb +++ b/poky/meta/recipes-support/attr/acl_2.2.53.bb @@ -1,5 +1,7 @@ SUMMARY = "Utilities for managing POSIX Access Control Lists" HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" +DESCRIPTION = "ACL allows you to provide different levels of access to files \ +and folders for different users." SECTION = "libs" LICENSE = "LGPLv2.1+ & GPLv2+" diff --git a/poky/meta/recipes-support/attr/attr.inc b/poky/meta/recipes-support/attr/attr.inc index 0c3330a686..97bca46982 100644 --- a/poky/meta/recipes-support/attr/attr.inc +++ b/poky/meta/recipes-support/attr/attr.inc @@ -1,4 +1,8 @@ SUMMARY = "Utilities for manipulating filesystem extended attributes" +DESCRIPTION = "A set of tools for manipulating extended attributes on filesystem \ +objects, in particular getfattr(1) and setfattr(1). An attr(1) command \ +is also provided which is largely compatible with the SGI IRIX tool of \ +the same name." HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" SECTION = "libs" diff --git a/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb b/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb index bab8a018ce..f00e0fc5b7 100644 --- a/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb +++ b/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb @@ -1,4 +1,6 @@ SUMMARY = "Programmable Completion for Bash 4" +DESCRIPTION = "bash completion extends bash's standard completion behavior to \ +achieve complex command lines with just a few keystrokes." HOMEPAGE = "https://github.com/scop/bash-completion" BUGTRACKER = "https://github.com/scop/bash-completion/issues" diff --git a/poky/meta/recipes-support/boost/boost-1.74.0.inc b/poky/meta/recipes-support/boost/boost-1.75.0.inc index b47fdaf099..e5a8488c58 100644 --- a/poky/meta/recipes-support/boost/boost-1.74.0.inc +++ b/poky/meta/recipes-support/boost/boost-1.75.0.inc @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1" +SRC_URI[sha256sum] = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch b/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch deleted file mode 100644 index 169906344f..0000000000 --- a/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 8845a786598f1d9e83aa1b7d2966b0d1eb765ba0 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 10:14:31 -0700 -Subject: [PATCH 1/3] Apply boost-1.62.0-no-forced-flags.patch - -Upstream-Status: Inappropriate -Signed-off-by: Christopher Larson <chris_larson@mentor.com> ---- - libs/log/build/Jamfile.v2 | 4 ++-- - libs/log/config/x86-ext/Jamfile.jam | 16 ++++++++-------- - libs/log/src/dump_avx2.cpp | 4 ++++ - libs/log/src/dump_ssse3.cpp | 4 ++++ - 4 files changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libs/log/build/Jamfile.v2 b/libs/log/build/Jamfile.v2 -index 4abbdbc..b3016fc 100644 ---- a/libs/log/build/Jamfile.v2 -+++ b/libs/log/build/Jamfile.v2 -@@ -373,7 +373,7 @@ rule avx2-targets-cond ( properties * ) - } - else if <toolset>clang in $(properties) - { -- result = <cxxflags>"-mavx -mavx2" ; -+ result = <cxxflags> ; - } - else if <toolset>intel in $(properties) - { -@@ -383,7 +383,7 @@ rule avx2-targets-cond ( properties * ) - } - else - { -- result = <cxxflags>"-xCORE-AVX2 -fabi-version=0" ; -+ result = <cxxflags>"-fabi-version=0" ; - } - } - else if <toolset>msvc in $(properties) -diff --git a/libs/log/config/x86-ext/Jamfile.jam b/libs/log/config/x86-ext/Jamfile.jam -index 0e9695a..dcc394d 100644 ---- a/libs/log/config/x86-ext/Jamfile.jam -+++ b/libs/log/config/x86-ext/Jamfile.jam -@@ -15,19 +15,19 @@ project /boost/log/x86-extensions - - obj ssse3 : ssse3.cpp - : -- <toolset>gcc:<cxxflags>"-msse -msse2 -msse3 -mssse3" -- <toolset>clang:<cxxflags>"-msse -msse2 -msse3 -mssse3" -- <toolset>intel-linux:<cxxflags>"-xSSSE3" -- <toolset>intel-darwin:<cxxflags>"-xSSSE3" -+ <toolset>gcc:<cxxflags> -+ <toolset>clang:<cxxflags> -+ <toolset>intel-linux:<cxxflags> -+ <toolset>intel-darwin:<cxxflags> - <toolset>intel-win:<cxxflags>"/QxSSSE3" - ; - - obj avx2 : avx2.cpp - : -- <toolset>gcc:<cxxflags>"-mavx -mavx2 -fabi-version=0" -- <toolset>clang:<cxxflags>"-mavx -mavx2" -- <toolset>intel-linux:<cxxflags>"-xCORE-AVX2 -fabi-version=0" -- <toolset>intel-darwin:<cxxflags>"-xCORE-AVX2 -fabi-version=0" -+ <toolset>gcc:<cxxflags>"-fabi-version=0" -+ <toolset>clang:<cxxflags> -+ <toolset>intel-linux:<cxxflags>"-fabi-version=0" -+ <toolset>intel-darwin:<cxxflags>"-fabi-version=0" - <toolset>intel-win:<cxxflags>"/arch:CORE-AVX2" - <toolset>msvc:<cxxflags>"/arch:AVX" - ; -diff --git a/libs/log/src/dump_avx2.cpp b/libs/log/src/dump_avx2.cpp -index 4ab1250..610fc6d 100644 ---- a/libs/log/src/dump_avx2.cpp -+++ b/libs/log/src/dump_avx2.cpp -@@ -22,6 +22,10 @@ - #include <boost/cstdint.hpp> - #include <boost/log/detail/header.hpp> - -+#if !defined(__AVX2__) -+#error "AVX2 Unsupported!" -+#endif -+ - #if defined(__x86_64) || defined(__x86_64__) || \ - defined(__amd64__) || defined(__amd64) || \ - defined(_M_X64) -diff --git a/libs/log/src/dump_ssse3.cpp b/libs/log/src/dump_ssse3.cpp -index 1325b49..60d4112 100644 ---- a/libs/log/src/dump_ssse3.cpp -+++ b/libs/log/src/dump_ssse3.cpp -@@ -22,6 +22,10 @@ - #include <boost/cstdint.hpp> - #include <boost/log/detail/header.hpp> - -+#if !defined(__SSSE3__) -+#error "SSSE3 Unsupported!" -+#endif -+ - #if defined(__x86_64) || defined(__x86_64__) || \ - defined(__amd64__) || defined(__amd64) || \ - defined(_M_X64) --- -2.8.0 diff --git a/poky/meta/recipes-support/boost/boost_1.74.0.bb b/poky/meta/recipes-support/boost/boost_1.75.0.bb index b01b390a59..33137e236d 100644 --- a/poky/meta/recipes-support/boost/boost_1.74.0.bb +++ b/poky/meta/recipes-support/boost/boost_1.75.0.bb @@ -4,7 +4,6 @@ require boost.inc SRC_URI += "file://arm-intrinsics.patch \ file://boost-CVE-2012-2677.patch \ file://boost-math-disable-pch-for-gcc.patch \ - file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ file://0001-dont-setup-compiler-flags-m32-m64.patch \ file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ diff --git a/poky/meta/recipes-support/curl/curl_7.73.0.bb b/poky/meta/recipes-support/curl/curl_7.74.0.bb index 0f26b0f1af..873bbe8143 100644 --- a/poky/meta/recipes-support/curl/curl_7.73.0.bb +++ b/poky/meta/recipes-support/curl/curl_7.74.0.bb @@ -9,7 +9,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[sha256sum] = "cf34fe0b07b800f1c01a499a6e8b2af548f6d0e044dca4a29d88a4bee146d131" +SRC_URI[sha256sum] = "0f4d63e6681636539dc88fa8e929f934cd3a840c46e0bf28c73be11e521b77a5" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" diff --git a/poky/meta/recipes-support/diffoscope/diffoscope_161.bb b/poky/meta/recipes-support/diffoscope/diffoscope_163.bb index 0f566a3ec7..2b66d628fd 100644 --- a/poky/meta/recipes-support/diffoscope/diffoscope_161.bb +++ b/poky/meta/recipes-support/diffoscope/diffoscope_163.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "9c27d60a7bf3984b53c8af3fee86eb3d3e2292c4ddb9449c38b6cba068b8e22c" +SRC_URI[sha256sum] = "1afeea6e383bdd2626a9e9b827ff487723c0de581d9f9f4d4f5fc9b65728662a" RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" diff --git a/poky/meta/recipes-support/enchant/enchant2_2.2.13.bb b/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb index 3b890e733a..a5080d9c78 100644 --- a/poky/meta/recipes-support/enchant/enchant2_2.2.13.bb +++ b/poky/meta/recipes-support/enchant/enchant2_2.2.14.bb @@ -9,7 +9,7 @@ DEPENDS = "glib-2.0" inherit autotools pkgconfig SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "eab9f90d79039133660029616e2a684644bd524be5dc43340d4cfc3fb3c68a20" +SRC_URI[sha256sum] = "bf7cc9a410b54c29648c7711dc8f210e7b13768508aaf43cc9c4527d5a9c7a8e" UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" diff --git a/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch b/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch deleted file mode 100644 index c1580418dc..0000000000 --- a/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f993697af81c37df9c55e0ebedeb1b8b880506ae Mon Sep 17 00:00:00 2001 -From: Richard Leitner <richard.leitner@skidata.com> -Date: Tue, 5 May 2020 11:59:42 +0200 -Subject: [PATCH] gdbm: fix link failure against gcc-10 - -Copied from gentoo's solution at https://bugs.gentoo.org/show_bug.cgi?id=705898 -Original patch by Sergei Trofimovich <slyfox@gentoo.org> - -Original description: - -Before the change on gcc-10 link failed as: -``` - CCLD gdbmtool -ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args'; - gdbmtool.o:(.data.rel.local+0x260): first defined here -ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc'; - gdbmtool.o:(.data.rel.local+0x268): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: - https://gcc.gnu.org/PR85678. - -The fix is to avoid multiple definition and rely on -declarations only. - -Upstream-Status: Pending -Signed-off-by: Richard Leitner <richard.leitner@skidata.com> ---- - src/parseopt.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/parseopt.c b/src/parseopt.c -index 268e080..a4c8576 100644 ---- a/src/parseopt.c -+++ b/src/parseopt.c -@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) - } - - char *parseopt_program_name; --char *parseopt_program_doc; --char *parseopt_program_args; - const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; - void (*parseopt_help_hook) (FILE *stream); - --- -2.26.2 - diff --git a/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/poky/meta/recipes-support/gdbm/gdbm_1.19.bb index fbb1fe72d7..1f390a4aa2 100644 --- a/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/poky/meta/recipes-support/gdbm/gdbm_1.19.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://run-ptest \ file://ptest.patch \ - file://gdbm-fix-link-failure-against-gcc-10.patch \ " -SRC_URI[md5sum] = "988dc82182121c7570e0cb8b4fcd5415" -SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc" +SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e" +SRC_URI[sha256sum] = "37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc" inherit autotools gettext texinfo lib_package ptest diff --git a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index c641a19616..a0af2d48dc 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 56343af532389c31eab32c096c9a989c53c78ce0 Mon Sep 17 00:00:00 2001 +From abc5c396aaddaef2e6811362e3e0cc0da28c2b34 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1d05d39..eaaf33c 100644 +index 64cb8c6..3fe9027 100644 --- a/configure.ac +++ b/configure.ac -@@ -1858,7 +1858,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1824,7 +1824,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch index 607a09f188..a13b4d5fb5 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch @@ -1,4 +1,4 @@ -From 9a901dbb1c48685f2db6d7b55916c9484e871f16 Mon Sep 17 00:00:00 2001 +From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001 From: Saul Wold <sgw@linux.intel.com> Date: Wed, 16 Aug 2017 11:18:01 +0800 Subject: [PATCH] dirmngr uses libgpg error @@ -11,20 +11,18 @@ Rebase to 2.1.23 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - dirmngr/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + dirmngr/Makefile.am | 1 + + 1 file changed, 1 insertion(+) diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am -index 208a813..292c036 100644 +index 00d3c42..450d873 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am -@@ -90,7 +90,8 @@ endif - dirmngr_LDADD = $(libcommonpth) \ +@@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \ $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ -- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) -+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ -+ $(GPG_ERROR_LIBS) + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ ++ $(GPG_ERROR_LIBS) \ + $(dirmngr_robj) if USE_LDAP dirmngr_LDADD += $(ldaplibs) - endif diff --git a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch index aa8d1e3cc2..7f7812cd46 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 4005b3342db06749453835720b5a5c2392a90810 Mon Sep 17 00:00:00 2001 +From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb index c624b67a0b..1c6e68b4b1 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.2.23.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.26.bb @@ -20,7 +20,7 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI_append_class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c" +SRC_URI[sha256sum] = "517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ diff --git a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index 34c8985c19..6eb1edbdb1 100644 --- a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch @@ -1,3 +1,8 @@ +From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 +From: Joe Slater <jslater@windriver.com> +Date: Wed, 25 Jan 2017 13:52:59 -0800 +Subject: [PATCH] gnutls: account for ARM_EABI + Certain syscall's are not availabe for arm-eabi, so we eliminate reference to them. @@ -5,12 +10,18 @@ Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> +--- + tests/seccomp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/seccomp.c b/tests/seccomp.c +index ed14d00..3c5b726 100644 --- a/tests/seccomp.c +++ b/tests/seccomp.c -@@ -49,7 +49,9 @@ int disable_system_calls(void) - } +@@ -53,7 +53,9 @@ int disable_system_calls(void) ADD_SYSCALL(nanosleep, 0); + ADD_SYSCALL(clock_nanosleep, 0); +#if ! defined(__ARM_EABI__) ADD_SYSCALL(time, 0); +#endif diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb b/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb index b936db50d1..e3ca86b933 100644 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb +++ b/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb @@ -21,7 +21,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[sha256sum] = "0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558" +SRC_URI[sha256sum] = "49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc diff --git a/poky/meta/recipes-support/icu/icu_68.1.bb b/poky/meta/recipes-support/icu/icu_68.2.bb index 98aa6b7be6..1ca87feee4 100644 --- a/poky/meta/recipes-support/icu/icu_68.1.bb +++ b/poky/meta/recipes-support/icu/icu_68.2.bb @@ -112,8 +112,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d" -SRC_URI[data.sha256sum] = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510" +SRC_URI[code.sha256sum] = "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625" +SRC_URI[data.sha256sum] = "2989b466fa010edc41297e12fdd5ae47c2610ad68b63af1a0bd2a1acfaf497f3" UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb index 43f76dc561..43f76dc561 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc index a312b602ff..8c52b5d0b9 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -7,10 +7,10 @@ LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ +SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://python.patch \ " -SRC_URI[sha256sum] = "f06b17aaca029e245c9a26c698c6cc8a1cf42b58483d93e94ee02b478bdc1055" +SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb index 6e6de45494..6e6de45494 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb diff --git a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch index 3c737b884e..d2653afb75 100644 --- a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +++ b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch @@ -1,4 +1,4 @@ -From c22c6c16362c7dbc8d6faea06edee5e07759c5fa Mon Sep 17 00:00:00 2001 +From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 15 Jan 2020 17:16:28 +0100 Subject: [PATCH] tests: do not statically link a test @@ -7,7 +7,6 @@ This fails on e.g. centos 7 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- progs/Makefile | 2 +- tests/Makefile | 4 ++-- @@ -27,7 +26,7 @@ index 1d7fc7a..37db8f7 100644 sudotest: test tcapsh-static sudo $(LDPATH) ./quicktest.sh diff --git a/tests/Makefile b/tests/Makefile -index 3431df9..727fb86 100644 +index 01f7589..094ec57 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes) @@ -36,7 +35,7 @@ index 3431df9..727fb86 100644 else -LDFLAGS += --static +LDFLAGS += - DEPS=../libcap/libcap.a ../progs/tcapsh-static + DEPS=../libcap/libcap.a ifeq ($(PTHREADS),yes) DEPS += ../libcap/libpsx.a @@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS) @@ -48,3 +47,6 @@ index 3431df9..727fb86 100644 clean: rm -f psx_test libcap_psx_test libcap_launch_test *~ +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libcap/libcap_2.45.bb b/poky/meta/recipes-support/libcap/libcap_2.46.bb index 067ba32d99..605a738127 100644 --- a/poky/meta/recipes-support/libcap/libcap_2.45.bb +++ b/poky/meta/recipes-support/libcap/libcap_2.46.bb @@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286" +SRC_URI[sha256sum] = "4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" diff --git a/poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch b/poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch new file mode 100644 index 0000000000..2a48844cb2 --- /dev/null +++ b/poky/meta/recipes-support/libexif/files/CVE-2020-0198.patch @@ -0,0 +1,66 @@ +From ca71eda33fe8421f98fbe20eb4392473357c1c43 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 30 Dec 2020 10:22:47 +0800 +Subject: [PATCH] fixed another unsigned integer overflow + +first fixed by google in android fork, +https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0 + +(use a more generic overflow check method, also check second overflow instance.) + +https://security-tracker.debian.org/tracker/CVE-2020-0198 + +Upstream-Status: Backport[https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c] +CVE: CVE-2020-0198 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libexif/exif-data.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 8b280d3..34d58fc 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -47,6 +47,8 @@ + #undef JPEG_MARKER_APP1 + #define JPEG_MARKER_APP1 0xe1 + ++#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize )) ++ + static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; + + struct _ExifDataPrivate +@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); + return; + } +- if (s > ds - o) { ++ if (CHECKOVERFLOW(o,ds,s)) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + } + + /* Read the number of entries */ +- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) { ++ if (CHECKOVERFLOW(offset, ds, 2)) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Tag data past end of buffer (%u > %u)", offset+2, ds); ++ "Tag data past end of buffer (%u+2 > %u)", offset, ds); + return; + } + n = exif_get_short (d + offset, data->priv->order); +@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + offset += 2; + + /* Check if we have enough data. */ +- if (offset + 12 * n > ds) { ++ if (CHECKOVERFLOW(offset, ds, 12*n)) { + n = (ds - offset) / 12; + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "Short data; only loading %hu entries...", n); +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch b/poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch new file mode 100644 index 0000000000..a117b8b369 --- /dev/null +++ b/poky/meta/recipes-support/libexif/files/CVE-2020-0452.patch @@ -0,0 +1,39 @@ +From 302acd49eba0a125b0f20692df6abc6f7f7ca53e Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 30 Dec 2020 10:18:51 +0800 +Subject: [PATCH] fixed a incorrect overflow check that could be optimized + away. + +inspired by: +https://android.googlesource.com/platform/external/libexif/+/8e7345f3bc0bad06ac369d6cbc1124c8ceaf7d4b + +https://source.android.com/security/bulletin/2020-11-01 + +CVE-2020-0452 + +Upsteam-Status: Backport[https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06] +CVE: CVE-2020-0452 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libexif/exif-entry.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c +index 5de215f..3a6ce84 100644 +--- a/libexif/exif-entry.c ++++ b/libexif/exif-entry.c +@@ -1371,8 +1371,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) + { + unsigned char *utf16; + +- /* Sanity check the size to prevent overflow */ +- if (e->size+sizeof(uint16_t)+1 < e->size) break; ++ /* Sanity check the size to prevent overflow. Note EXIF files are 64kb at most. */ ++ if (e->size >= 65536 - sizeof(uint16_t)*2) break; + + /* The tag may not be U+0000-terminated , so make a local + U+0000-terminated copy before converting it */ +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libexif/libexif_0.6.22.bb b/poky/meta/recipes-support/libexif/libexif_0.6.22.bb index 2478ba07d8..dc30926c59 100644 --- a/poky/meta/recipes-support/libexif/libexif_0.6.22.bb +++ b/poky/meta/recipes-support/libexif/libexif_0.6.22.bb @@ -8,6 +8,8 @@ def version_underscore(v): return "_".join(v.split(".")) SRC_URI = "https://github.com/libexif/libexif/releases/download/libexif-${@version_underscore("${PV}")}-release/libexif-${PV}.tar.xz \ + file://CVE-2020-0198.patch \ + file://CVE-2020-0452.patch \ " SRC_URI[sha256sum] = "5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56" diff --git a/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch b/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch deleted file mode 100644 index 57b336c0c0..0000000000 --- a/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce091718716400119d6be6bd637c0e3f4f6ca315 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <JPEWhacker@gmail.com> -Date: Thu, 21 Nov 2019 08:07:41 -0600 -Subject: [PATCH] Make man pages reproducible - -Instructs the man page to be gzip'ed without the file name or timestamp -so that it builds reproducibly. - -Upstream-Status: Backport [https://github.com/smuellerDD/jitterentropy-library/pull/14] -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 2e78607..860b720 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) - $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) --- -2.23.0 - diff --git a/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch b/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch deleted file mode 100644 index 9af334ce2c..0000000000 --- a/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001 -From: Matt Weber <matthew.weber@rockwellcollins.com> -Date: Tue, 22 Oct 2019 12:44:30 -0500 -Subject: [PATCH] Makefile: cleanup install for rebuilds - -Support the ability to rebuild and redeploy without a clean. This -required some force linking and man archive creation. - -Provide the ability to override the stripping of the shared lib for -cases where a embedded target build may want to control stripping -or provide cross arch tools. - -Upstream-Status: Backport [060b9b4147f6e5ff386a8b017796118d783e59fa] -Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> -Signed-off-by: Stephan Mueller <smueller@chronox.de> -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> ---- - Makefile | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 4ff069b..2e78607 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,8 @@ LIBDIR := lib - # include target directory - INCDIR := include - -+INSTALL_STRIP ?= install -s -+ - NAME := jitterentropy - LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') - LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}') -@@ -58,15 +60,15 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) -- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ -+ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) - install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ - install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ - $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so -+ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) -+ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so - - clean: - @- $(RM) $(NAME) --- -2.23.0 - diff --git a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb index 710ef0172d..953ecfd055 100644 --- a/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb +++ b/poky/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.0.bb @@ -5,14 +5,12 @@ stamp. It is a small-scale, yet fast entropy source that is viable in almost \ all environments and on a lot of CPU architectures." HOMEPAGE = "http://www.chronox.de/jent.html" LICENSE = "GPLv2+ | BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=a95aadbdfae7ed812bb2b7b86eb5981c \ +LIC_FILES_CHKSUM = "file://COPYING;md5=fb16b29576d4c43a9dcd6a40fb3310c7 \ file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ " -SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ - file://0001-Makefile-cleanup-install-for-rebuilds.patch \ - file://0001-Make-man-pages-reproducible.patch" -SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba" +SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git" +SRCREV = "a37e57d9b939d1f93a1b92e1486edd44a3c1cb4c" S = "${WORKDIR}/git" do_configure[noexec] = "1" diff --git a/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index ebb7fa588a..af96bd57cd 100644 --- a/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -1,4 +1,4 @@ -From 7bd2b060e9ea3e2ff11e67d1e98ab882819b28b7 Mon Sep 17 00:00:00 2001 +From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 3 Dec 2012 18:17:31 +0800 Subject: [PATCH] libksba: add pkgconfig support @@ -11,11 +11,15 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/ksba.m4 | 90 +++-------------------------------------------------- + 1 file changed, 4 insertions(+), 86 deletions(-) + diff --git a/src/ksba.m4 b/src/ksba.m4 -index ad8de4f..af903ad 100644 +index 6b55bb8..6e7336f 100644 --- a/src/ksba.m4 +++ b/src/ksba.m4 -@@ -22,37 +22,6 @@ dnl with a changed API. +@@ -23,37 +23,6 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -23,7 +27,7 @@ index ad8de4f..af903ad 100644 - dnl since that is consistent with how our three siblings use the directory/ - dnl package name in --with-$dir_name-prefix=PFX. - AC_ARG_WITH(libksba-prefix, -- AC_HELP_STRING([--with-libksba-prefix=PFX], +- AS_HELP_STRING([--with-libksba-prefix=PFX], - [prefix where KSBA is installed (optional)]), - ksba_config_prefix="$withval", ksba_config_prefix="") - @@ -53,7 +57,7 @@ index ad8de4f..af903ad 100644 tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -63,56 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -64,56 +33,13 @@ AC_DEFUN([AM_PATH_KSBA], min_ksba_version="$tmp" fi @@ -113,7 +117,7 @@ index ad8de4f..af903ad 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -125,14 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -126,14 +52,8 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then @@ -129,7 +133,7 @@ index ad8de4f..af903ad 100644 if test x"$libksba_config_host" != xnone ; then if test x"$libksba_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -146,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], +@@ -147,8 +67,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi else diff --git a/poky/meta/recipes-support/libksba/libksba_1.4.0.bb b/poky/meta/recipes-support/libksba/libksba_1.5.0.bb index a9daf22d77..005389eab6 100644 --- a/poky/meta/recipes-support/libksba/libksba_1.4.0.bb +++ b/poky/meta/recipes-support/libksba/libksba_1.5.0.bb @@ -19,7 +19,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch" -SRC_URI[sha256sum] = "bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6" +SRC_URI[sha256sum] = "ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba" do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.35.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.36.bb index 35c019c100..d8077a1224 100644 --- a/poky/meta/recipes-support/libpcre/libpcre2_10.35.bb +++ b/poky/meta/recipes-support/libpcre/libpcre2_10.36.bb @@ -8,11 +8,11 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a06590e9bd4c229532364727aaeaf084" +LIC_FILES_CHKSUM = "file://LICENCE;md5=60c08fab1357bfe9084b333bc33362d6" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2" -SRC_URI[sha256sum] = "9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613" +SRC_URI[sha256sum] = "a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c" CVE_PRODUCT = "pcre2" diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.23.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb index 2fd658b4ef..4c552ae6c7 100644 --- a/poky/meta/recipes-support/libusb/libusb1_1.0.23.bb +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.24.bb @@ -12,8 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://run-ptest \ " -SRC_URI[md5sum] = "be79ed4a4a440169deec8beaac6aae33" -SRC_URI[sha256sum] = "4fc17b2ef3502757641bf8fe2c14ad86ec86302a2b785abcb0806fd03aa1201f" +SRC_URI[sha256sum] = "7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a" S = "${WORKDIR}/libusb-${PV}" diff --git a/poky/meta/recipes-support/nettle/nettle_3.6.bb b/poky/meta/recipes-support/nettle/nettle_3.6.bb index 90f8625ae5..7c1b1a2d5c 100644 --- a/poky/meta/recipes-support/nettle/nettle_3.6.bb +++ b/poky/meta/recipes-support/nettle/nettle_3.6.bb @@ -1,5 +1,8 @@ SUMMARY = "A low level cryptographic library" HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" +DESCRIPTION = "It tries to solve a problem of providing a common set of \ +cryptographic algorithms for higher-level applications by implementing a \ +context-independent set of cryptographic algorithms" SECTION = "libs" LICENSE = "LGPLv3+ | GPLv2+" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb index 33f041a161..19996fc064 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.33.0.bb +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.34.0.bb @@ -4,7 +4,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "106a2c48c7f75a298a7557bcc0d5f4f454e5b43811cc738b7ca294d6956bbb15" +SRC_URI[sha256sum] = "bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee" # -19242 is only an issue in specific development branch commits CVE_CHECK_WHITELIST += "CVE-2019-19242" |