From patchwork Thu Aug 11 19:58:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46BFBC19F2A for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web12.2436.1660247892073097023 for ; Thu, 11 Aug 2022 12:58:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CCxNKuUe; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id kb8so35332391ejc.4 for ; Thu, 11 Aug 2022 12:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=wuRDtjwmnEv/DEUkknv6C9mF1VFKMthY8Z5Py0fVFiw=; b=CCxNKuUek0equzH3uY2ZCyZBsX+UOhxPN5GUiwNDbEzBr6axhftlLOv1oaHL+/MSft 3J+PNA53i6MRsVj4KRO8FT8PfUpZ+y3cQxjYoAEcE70MsbXyyLsS3GdieWzPhLtYB/v6 B5Pj4K2f3lRXxhz7IUDSRZwAEBg9LDPO+f2n1HM/8pm2TMxQy/Dq4WvmSfjRjC44V6ld 9gxWoibPirhuuVEXZfCJh7MFTSF6JUiG6dKlxqVzg8k0grvdDxtw/pZr2/+LVWHp1Ngn f0nbuzeygeV+WNLFAzzA9rSBw5JhMCNHITW6K9xwWkv84FAZON8Q8Z9tNN65EyP/SIxu bZdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=wuRDtjwmnEv/DEUkknv6C9mF1VFKMthY8Z5Py0fVFiw=; b=y+1HtxIKV8MEZWn4DCf1PfnVlljBAjPYEapcDxu6f9fTiGp81ukv3vTsJQKJrx1tDn g1DHmV1c0Zo717taDpsuHi3bcewJPYcbbHWTMZfmcn5044GMB0UIddiS3kRArr0iDJ1F CCQm4WJYX1u39e2OJ2E+VbJ6qSSqOEeRnpTgmYauyP9kFvytZ5ldHQxJzU5UIcDtyVvW iXYSZun+mM+DTDPeb2b/z+7wSLHPZm1HngIQVAoUzJWnV7qz94ZmtotTHkl4dFjjUoTN EaOp+9C9ynLveyRx+JpCUUlFbwkVbhdcAYxfUC/MY9GqUWxs62hWUHmRKch2WBEcYCCY IMJQ== X-Gm-Message-State: ACgBeo0xsN22e45dnlWP7MP/fsuXt2M3MNQNhP4DihB4PQwXVia7SoqS tuTskhEL4DrX8Zx894zyhKCjE/A0A6Q= X-Google-Smtp-Source: AA6agR7fJK3ku9xpYkAbMnk35AW022Hwm31jlv2vk1mDoTx4sBNto+NBdSNJJDADdemGWOhon8Or7A== X-Received: by 2002:a17:906:845c:b0:730:bbf1:196a with SMTP id e28-20020a170906845c00b00730bbf1196amr443512ejy.13.1660247890407; Thu, 11 Aug 2022 12:58:10 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:09 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/7] dropbear: merge .inc into .bb Date: Thu, 11 Aug 2022 21:58:00 +0200 Message-Id: <20220811195806.1571221-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169263 Signed-off-by: Alexander Kanavin --- meta/recipes-core/dropbear/dropbear.inc | 128 ----------------- .../recipes-core/dropbear/dropbear_2022.82.bb | 129 +++++++++++++++++- 2 files changed, 128 insertions(+), 129 deletions(-) delete mode 100644 meta/recipes-core/dropbear/dropbear.inc diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc deleted file mode 100644 index e170587d08..0000000000 --- a/meta/recipes-core/dropbear/dropbear.inc +++ /dev/null @@ -1,128 +0,0 @@ -SUMMARY = "A lightweight SSH and SCP implementation" -HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" -DESCRIPTION = "Dropbear is a relatively small SSH server and client. It runs on a variety of POSIX-based platforms. Dropbear is open source software, distributed under a MIT-style license. Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers." -SECTION = "console/network" - -# some files are from other projects and have others license terms: -# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY -LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" - -DEPENDS = "zlib virtual/crypt" -RPROVIDES:${PN} = "ssh sshd" -RCONFLICTS:${PN} = "openssh-sshd openssh" - -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ - file://0001-urandom-xauth-changes-to-options.h.patch \ - file://init \ - file://dropbearkey.service \ - file://dropbear@.service \ - file://dropbear.socket \ - file://dropbear.default \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} " - -PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ - file://0006-dropbear-configuration-file.patch \ - file://dropbear" - -PAM_PLUGINS = "libpam-runtime \ - pam-plugin-deny \ - pam-plugin-permit \ - pam-plugin-unix \ - " -RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" - -inherit autotools update-rc.d systemd - -CVE_PRODUCT = "dropbear_ssh" - -INITSCRIPT_NAME = "dropbear" -INITSCRIPT_PARAMS = "defaults 10" - -SYSTEMD_SERVICE:${PN} = "dropbear.socket" - -SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" -BINCOMMANDS = "dbclient ssh scp" -EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' - -PACKAGECONFIG ?= "disable-weak-ciphers" -PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" -PACKAGECONFIG[disable-weak-ciphers] = "" - -EXTRA_OECONF += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" - -# This option appends to CFLAGS and LDFLAGS from OE -# 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 \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/dropbear \ - ${D}${bindir} \ - ${D}${sbindir} \ - ${D}${localstatedir} - - install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear - - install -m 0755 dropbearmulti ${D}${sbindir}/ - - for i in ${BINCOMMANDS} - do - # ssh and scp symlinks are created by update-alternatives - if [ $i = ssh ] || [ $i = scp ]; then continue; fi - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i - done - for i in ${SBINCOMMANDS} - do - ln -s ./dropbearmulti ${D}${sbindir}/$i - done - sed -e 's,/etc,${sysconfdir},g' \ - -e 's,/usr/sbin,${sbindir},g' \ - -e 's,/var,${localstatedir},g' \ - -e 's,/usr/bin,${bindir},g' \ - -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear - chmod 755 ${D}${sysconfdir}/init.d/dropbear - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -d ${D}${sysconfdir}/pam.d - install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ - fi - - # deal with systemd unit files - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir} - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@BINDIR@,${bindir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_system_unitdir}/dropbear.socket ${D}${systemd_system_unitdir}/*.service -} - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "20" -ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" - -ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" - -pkg_postrm:${PN} () { - if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then - rm ${sysconfdir}/dropbear/dropbear_rsa_host_key - fi - if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then - rm ${sysconfdir}/dropbear/dropbear_dss_host_key - fi -} - -CONFFILES:${PN} = "${sysconfdir}/default/dropbear" - -FILES:${PN} += "${bindir}" diff --git a/meta/recipes-core/dropbear/dropbear_2022.82.bb b/meta/recipes-core/dropbear/dropbear_2022.82.bb index 154a407a19..2de243b889 100644 --- a/meta/recipes-core/dropbear/dropbear_2022.82.bb +++ b/meta/recipes-core/dropbear/dropbear_2022.82.bb @@ -1,3 +1,130 @@ -require dropbear.inc +SUMMARY = "A lightweight SSH and SCP implementation" +HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" +DESCRIPTION = "Dropbear is a relatively small SSH server and client. It runs on a variety of POSIX-based platforms. Dropbear is open source software, distributed under a MIT-style license. Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers." +SECTION = "console/network" + +# some files are from other projects and have others license terms: +# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY +LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" + +DEPENDS = "zlib virtual/crypt" +RPROVIDES:${PN} = "ssh sshd" +RCONFLICTS:${PN} = "openssh-sshd openssh" + +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ + file://0001-urandom-xauth-changes-to-options.h.patch \ + file://init \ + file://dropbearkey.service \ + file://dropbear@.service \ + file://dropbear.socket \ + file://dropbear.default \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} " SRC_URI[sha256sum] = "3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1" + +PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ + file://0006-dropbear-configuration-file.patch \ + file://dropbear" + +PAM_PLUGINS = "libpam-runtime \ + pam-plugin-deny \ + pam-plugin-permit \ + pam-plugin-unix \ + " +RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" + +inherit autotools update-rc.d systemd + +CVE_PRODUCT = "dropbear_ssh" + +INITSCRIPT_NAME = "dropbear" +INITSCRIPT_PARAMS = "defaults 10" + +SYSTEMD_SERVICE:${PN} = "dropbear.socket" + +SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" +BINCOMMANDS = "dbclient ssh scp" +EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' + +PACKAGECONFIG ?= "disable-weak-ciphers" +PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" +PACKAGECONFIG[disable-weak-ciphers] = "" + +EXTRA_OECONF += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" + +# This option appends to CFLAGS and LDFLAGS from OE +# 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 \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/dropbear \ + ${D}${bindir} \ + ${D}${sbindir} \ + ${D}${localstatedir} + + install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear + + install -m 0755 dropbearmulti ${D}${sbindir}/ + + for i in ${BINCOMMANDS} + do + # ssh and scp symlinks are created by update-alternatives + if [ $i = ssh ] || [ $i = scp ]; then continue; fi + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i + done + for i in ${SBINCOMMANDS} + do + ln -s ./dropbearmulti ${D}${sbindir}/$i + done + sed -e 's,/etc,${sysconfdir},g' \ + -e 's,/usr/sbin,${sbindir},g' \ + -e 's,/var,${localstatedir},g' \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear + chmod 755 ${D}${sysconfdir}/init.d/dropbear + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + install -d ${D}${sysconfdir}/pam.d + install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ + fi + + # deal with systemd unit files + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir} + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@BINDIR@,${bindir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_system_unitdir}/dropbear.socket ${D}${systemd_system_unitdir}/*.service +} + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "20" +ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" + +ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" + +pkg_postrm:${PN} () { + if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_rsa_host_key + fi + if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_dss_host_key + fi +} + +CONFFILES:${PN} = "${sysconfdir}/default/dropbear" + +FILES:${PN} += "${bindir}" From patchwork Thu Aug 11 19:58:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11302 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73819C25B0F for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web10.2520.1660247892807032417 for ; Thu, 11 Aug 2022 12:58:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lD9Odzht; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id fy5so4520713ejc.3 for ; Thu, 11 Aug 2022 12:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=D/e7UyDuQ5UUla6aoOhnEmXy2PZabYT5UIUQOBzWMfE=; b=lD9Odzht4yf2vksp2Mka3BpWYruK9BX+6IwfNxJli6PQDD22hvYr/ja3QM2rEIBAFw IUH86fgvm4xQOHardouiTxggobMlStaOe5wnfxlnzcz+iFx6RcpGQ4ZEvg82genIJeTM E3fBwicsmrGM/mziBZeDV5MgaOKPeZvIwAxrR6jOgdzTwFZ58udDV7hacvDxG4M0qJ71 rcZHbmT9etQEv3GnhU7oPQzVp8MiEDg/i2RE9RKqgCjEwsvjMooJ0ZhwOtryhYHOyGid PUMjhoDSQ4d2EI3ToayLIcZg6KefJmIh2Py0ipLx+cdW/jaPre6XFHquCz1mMfl/PtdN fJ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=D/e7UyDuQ5UUla6aoOhnEmXy2PZabYT5UIUQOBzWMfE=; b=f+e3DRxVug/YtXWiHzz+JccUHtjP36S/RwESSrFKwxq6Nmjw0oe6/8H0NQ83/LtnET 3FNUYyVXw2/xgs3uTNqm3TKSinqUqcLkFiQyh8QKcjW+mr1ZlriuYRtovYecQg80mfzN n1yRT6T6iWgCN3I5Nn7XZ8KszzVzlzp9IZSwxQTO0aKBWTuEhm+i8oJnGBYZL4L9IaPD E5TZtuLQvhhN2PDG5NWvEZf5clnYyRNEBmWCiarcorIUcvqBAozk4e59JC4K5JjLsSzU CpwMWY7PmZdmCGAQr41n3FJ+OtdqVnf7PdC22jCq9AF4/JA/oqkQrx4GxtkH45njmUp/ kpQw== X-Gm-Message-State: ACgBeo2nKc3zl9c5o6Td638ql8YfsR66SVt+H5SESjsbv4elqbuXpo2w MBxMnB0LV9JRYB0jq0sGbdNw+mJXzng= X-Google-Smtp-Source: AA6agR7crI/gPZHia8mDMnLS0VuiMSuX8PciGZbT/F3QU/WRbQPthBqLOpihUl2NIRTK7fNI+8zA0w== X-Received: by 2002:a17:907:8687:b0:730:7c7b:b9ce with SMTP id qa7-20020a170907868700b007307c7bb9cemr434230ejc.656.1660247891379; Thu, 11 Aug 2022 12:58:11 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:10 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/7] rust: update 1.62.0 -> 1.62.1 Date: Thu, 11 Aug 2022 21:58:01 +0200 Message-Id: <20220811195806.1571221-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811195806.1571221-1-alex@linutronix.de> References: <20220811195806.1571221-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169264 Signed-off-by: Alexander Kanavin --- .../recipes-devtools/cargo/{cargo_1.62.0.bb => cargo_1.62.1.bb} | 0 .../rust/{libstd-rs_1.62.0.bb => libstd-rs_1.62.1.bb} | 0 ...t-cross-canadian_1.62.0.bb => rust-cross-canadian_1.62.1.bb} | 0 .../rust/{rust-llvm_1.62.0.bb => rust-llvm_1.62.1.bb} | 0 meta/recipes-devtools/rust/rust-source.inc | 2 +- meta/recipes-devtools/rust/{rust_1.62.0.bb => rust_1.62.1.bb} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cargo/{cargo_1.62.0.bb => cargo_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{libstd-rs_1.62.0.bb => libstd-rs_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.62.0.bb => rust-cross-canadian_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.62.0.bb => rust-llvm_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.62.0.bb => rust_1.62.1.bb} (100%) diff --git a/meta/recipes-devtools/cargo/cargo_1.62.0.bb b/meta/recipes-devtools/cargo/cargo_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/cargo/cargo_1.62.0.bb rename to meta/recipes-devtools/cargo/cargo_1.62.1.bb diff --git a/meta/recipes-devtools/rust/libstd-rs_1.62.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.62.0.bb rename to meta/recipes-devtools/rust/libstd-rs_1.62.1.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb diff --git a/meta/recipes-devtools/rust/rust-llvm_1.62.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-llvm_1.62.0.bb rename to meta/recipes-devtools/rust/rust-llvm_1.62.1.bb diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index b814574e55..dbcef2cbc2 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,5 +1,5 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust" -SRC_URI[rust.sha256sum] = "6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e" +SRC_URI[rust.sha256sum] = "02066a93c2f6596cc046a897d5716c86e3607c1cd0f54db9a867ae8c8265072e" SRC_URI:append:class-target:pn-rust = " file://hardcodepaths.patch" SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " file://hardcodepaths.patch" diff --git a/meta/recipes-devtools/rust/rust_1.62.0.bb b/meta/recipes-devtools/rust/rust_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.62.0.bb rename to meta/recipes-devtools/rust/rust_1.62.1.bb From patchwork Thu Aug 11 19:58:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11298 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54C54C25B06 for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web09.2533.1660247893703813052 for ; Thu, 11 Aug 2022 12:58:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KPwf3frS; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a7so35352988ejp.2 for ; Thu, 11 Aug 2022 12:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=tSkLGyWwnwnJjAK/6ziFuT0O/BZNUrTE6g3ZgDdXFSk=; b=KPwf3frS1yY/B1rzwtgmosIT+5aZVC1MP0g9jJ6vud8gzSwRR28/jhOyrrRz7SjIe6 daXrnXfpSCnMpjg2+aRLp5scambQdsbjHMln/2sHYEftFvscu5i/8a4pzbNW/KrYoO7Y N3CqWa2yG437tIgQCeuo7+maqe6NcI5hXeUkA3V/sNiKONWuqQMSkOgzPvhavPnRcrKC s1/zHg6QHNfNa74R6ohuuk+liCCTaoOBWn6A3Dh8Ri4vAMvMorLAtWD8/XnZWnVg0xIo WjRkdL3HVIn1irgE8OqyFGkSTzVJfzPhU57ib2dcVvLVN2a1VRln2do5iimjRRA6bn0Z xkkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=tSkLGyWwnwnJjAK/6ziFuT0O/BZNUrTE6g3ZgDdXFSk=; b=7QxEuS+jU8EQf2ihvmUVTl8kc9r27zPTlOyDnNtO/N6Yq/cTGXxwhiZZpWB81KXuv7 0xqnYrM3rzzNbw1DqBDZ0TrcyWnWmTdx/Spn+QzFxK6947lS3V3Z9Ca8nOM03kLnfDWB /4fdIsDRr40BeX8h/icFGUUa6OV50Al23x+5VSTUuekA7cLSxjLGJ6CoElhqjdAyiyFC VOytzdKkIFRYQ7batP+IXZgavegEzub9Bwc2XyYyoBm2v0z85PZ5M0EhLGJ9Ux+xefr9 qmv4i91yjH1hE7KrLqbgzQAmiUToB9ifFV5jZNpE7jJQu3BthbIVrqFbOFvpo39rHXiB 9RkA== X-Gm-Message-State: ACgBeo0wIUJap4QMDwHw3wrn0oDs58v9YdR09JgC5J7Nh3743O1gQy9K EEkbXzv64wDclfIqyoODYVueSkpWMTY= X-Google-Smtp-Source: AA6agR4Pp7V7CidZpCIYmySsz2LBfU+/1+6WDdtMiG4ycvukoLrGKPTsRT21ajUdAdTTwpP5CQ1muQ== X-Received: by 2002:a17:907:3e21:b0:730:92bb:7fcd with SMTP id hp33-20020a1709073e2100b0073092bb7fcdmr453688ejc.170.1660247892216; Thu, 11 Aug 2022 12:58:12 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:11 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/7] cmake: update 3.23.2 -> 3.24.0 Date: Thu, 11 Aug 2022 21:58:02 +0200 Message-Id: <20220811195806.1571221-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811195806.1571221-1-alex@linutronix.de> References: <20220811195806.1571221-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169265 License-Update: additional copyright holders Signed-off-by: Alexander Kanavin --- .../cmake/{cmake-native_3.23.2.bb => cmake-native_3.24.0.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 ++-- .../cmake/{cmake_3.23.2.bb => cmake_3.24.0.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.23.2.bb => cmake-native_3.24.0.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.23.2.bb => cmake_3.24.0.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.23.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.24.0.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.23.2.bb rename to meta/recipes-devtools/cmake/cmake-native_3.24.0.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 4a6884e871..d64afffdc1 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa" +SRC_URI[sha256sum] = "c2b61f7cdecb1576cad25f918a8f42b8685d88a832fd4b62b9e0fa32e915a658" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.23.2.bb b/meta/recipes-devtools/cmake/cmake_3.24.0.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.23.2.bb rename to meta/recipes-devtools/cmake/cmake_3.24.0.bb From patchwork Thu Aug 11 19:58:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11301 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55EE1C19F2D for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web10.2521.1660247894686278188 for ; Thu, 11 Aug 2022 12:58:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=U0sCfCpF; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id uj29so35425555ejc.0 for ; Thu, 11 Aug 2022 12:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Rrh71xddDzyjatKHf5dkG+lPyULKTsTWObTh1cVqxzw=; b=U0sCfCpF8Vpn3KSYOlE2HLAyVLTEgRnFfr4URXbmc8tJh/qGOAAZdhA4qcXgJ9HAC5 T/F2Iziq8VZ5OiOFLt9FllXJKto+JtU3uFP7yd5L7vMXOaOHaOIFpmTlvu9ScKnO4+wT 3FeExpii2627u7NJuaWIrVUkWND2NDWvllAKYWTkO2ljlgDIlHqEjC//l9n9Mzv65siG YoHfh7Ixfq3r/8XraL+R7bCeEgA8Cvtthe7mpRkb4fY5tf7F17SwI/mT/JnQMWezSSwx q+TXPwogpCAsCqbsYUVFGaoz0+vNxZvTIhVe8vFBrl8TX0LKiPZUSaAky+FvJwb3CmTr ivYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Rrh71xddDzyjatKHf5dkG+lPyULKTsTWObTh1cVqxzw=; b=MeiWGxmgnFVPmcGep3EfdjxqmY8Ve9GQ1X7ZB90S907kLg1/nXP0/Q7D/uBiTPGllE F5eXUFzz88h9Uqydn03l9MvnPaYcXxvVAzrkHy/900ASCyYXhjueQqDAIw1rEgGMYiUM qLhISAjIG0NqmWZo7wjofrl0NiAN0Mc4RqTvKAat7Hdsaz1TIIGsgh7h7LJA649ehuhs HV2q7x9y17u3dByje8MS8wsh+fuKGJWnDyuG4pjhnQl1S60eX3xxfVJD7Xm5zCgHXDqD 2s/zoAv/GNErJYGLEfBJB+9d4DEyYyfMyk1p9qyoyzix4Leot40KeXD54GJ9hiFyFki8 UhAg== X-Gm-Message-State: ACgBeo3Yz1dNToRFHmgdDQtEPE03Io21J0sfsbXbI1dIEUiRBCzCLbhs ycozqW5udGGPpJ2r/on6Fx9h9rEzzvY= X-Google-Smtp-Source: AA6agR6kU2qmMqpX+ZT7PEKxKunPUupT2/OMj3bv7dFxbhJxiHGakrjCGnil7zdPUZhPIw0upf09Bw== X-Received: by 2002:a17:907:60c7:b0:731:14e2:af10 with SMTP id hv7-20020a17090760c700b0073114e2af10mr450676ejc.92.1660247893215; Thu, 11 Aug 2022 12:58:13 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:12 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/7] weston: upgrade 10.0.1 -> 10.0.2 Date: Thu, 11 Aug 2022 21:58:03 +0200 Message-Id: <20220811195806.1571221-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811195806.1571221-1-alex@linutronix.de> References: <20220811195806.1571221-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169266 Drop dont-use-plane-add-prop.patch as issue is fixed elsewhere (see the link in the patch). Signed-off-by: Alexander Kanavin --- .../weston/dont-use-plane-add-prop.patch | 32 ------------------- .../{weston_10.0.1.bb => weston_10.0.2.bb} | 4 +-- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch rename meta/recipes-graphics/wayland/{weston_10.0.1.bb => weston_10.0.2.bb} (97%) diff --git a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch deleted file mode 100644 index 1ac0695222..0000000000 --- a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ece4c3d261aeec230869c0304ed1011ff6837c16 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Sep 2020 14:04:04 -0700 -Subject: [PATCH] Fix atomic modesetting with musl - -atomic modesetting seems to fail with drm weston backend and this patch fixes -it, below errors are seen before weston exits - -atomic: couldn't commit new state: Invalid argument - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] -Signed-off-by: Khem Raj - ---- - libweston/backend-drm/kms.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c -index 780d007..9994da1 100644 ---- a/libweston/backend-drm/kms.c -+++ b/libweston/backend-drm/kms.c -@@ -1142,8 +1142,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state, - wl_list_for_each(plane, &b->plane_list, link) { - drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", - (unsigned long) plane->plane_id); -- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); -- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); -+ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); -+ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); - } - - flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; diff --git a/meta/recipes-graphics/wayland/weston_10.0.1.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb similarity index 97% rename from meta/recipes-graphics/wayland/weston_10.0.1.bb rename to meta/recipes-graphics/wayland/weston_10.0.2.bb index e27dac164e..f81a33fd1e 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.1.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb @@ -13,9 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://systemd-notify.weston-start \ " -SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " - -SRC_URI[sha256sum] = "8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115" +SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" From patchwork Thu Aug 11 19:58:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11300 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57D00C25B0E for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web11.2469.1660247896141551615 for ; Thu, 11 Aug 2022 12:58:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hqKkT4cX; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id uj29so35425712ejc.0 for ; Thu, 11 Aug 2022 12:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=t58N1TRsB6M0QPM6L9khT86yxZOI/ON3Tkx3sW3pCVY=; b=hqKkT4cXfXmeSkQ9/CTC+gycxkmieaFiowOHr5d1tx4E74Gt9gb4C7j+aP7eeOf+6e VCu0jiHyRNYx4qur4PlNzOzE3Lx22CPqRCdNsiSYMxogxX7+PNQY/EHD1mBZMxB/XX9Z RhxEjFjALYUD9PLY1DLRfbQh9M0Ze6LQl++6GYD80j4Zuj344bNr/F/yqbleKjjoO3G2 OTW/Meey/VTJ4Cwhn0v9v22dCXzPKWYLOdsZgd/rzBsHgubY+HA7P8V5GQ2ihVtq2iL7 i3HnnVYuiXpzPo9AqFQR65QNUNmbbJPHkg7uc2KXFyfUAWboX7IMTTbjW/FoESd5V2Lc JroQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=t58N1TRsB6M0QPM6L9khT86yxZOI/ON3Tkx3sW3pCVY=; b=vhueXed1XuRPAHOA5F5uzjSILgri2Yktq80W1u0tOO0lMyYcVa7DxWzcjZiIYUhpPQ iQP7KuZ5OqqWqtreredfUFhHvYsrT/kU0zgZRVihB5lbZN3c+fQyAgqsF1+f6YR/Klz0 OHbJaLhcupvhFKOrFOxZCcKvHBLpzAeaImvK0deHWv6/mCOHeEvxqwOuPB2NlcFbsDCg cZ70UVzlUuqFGo8NVv1WGcmfSrJQe7TvVb1gDKNk+I0MJl5i6l4jkBPy0LnsZxcZ6/8C aIbXofAI/3tfudZTGOu6c2FNyR+1+jy7fbw8q30bhQeCVcIM+eKNlTkd2WlMjDytnA1w ZO7A== X-Gm-Message-State: ACgBeo2tYdJ3Pltd0SaO2J3HkJKz790sVQZR578dXr5efTFzhV6xmDWY eeS3x7khdMm/okDb2UhqSm+P/ZoVmvE= X-Google-Smtp-Source: AA6agR6l8xzabEcG/lFEs6gVxTEN69bFSg0ZUO9kr8ZMcsS+Qosm9pXPgh29ps8gOU+eW8QjUZv4OA== X-Received: by 2002:a17:907:72d5:b0:731:6512:ad with SMTP id du21-20020a17090772d500b00731651200admr399670ejc.739.1660247894741; Thu, 11 Aug 2022 12:58:14 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:13 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/7] patchelf: update 0.14.5 -> 0.15.0 Date: Thu, 11 Aug 2022 21:58:04 +0200 Message-Id: <20220811195806.1571221-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811195806.1571221-1-alex@linutronix.de> References: <20220811195806.1571221-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169267 Rebase handle-read-only-files.patch Signed-off-by: Alexander Kanavin --- .../patchelf/handle-read-only-files.patch | 30 +++++++++---------- ...{patchelf_0.14.5.bb => patchelf_0.15.0.bb} | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-) rename meta/recipes-devtools/patchelf/{patchelf_0.14.5.bb => patchelf_0.15.0.bb} (91%) diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch index b755a263a4..76ad8d9d4d 100644 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch @@ -1,4 +1,4 @@ -From 682fb48c137b687477008b68863c2a0b73ed47d1 Mon Sep 17 00:00:00 2001 +From 38b3d65f4a79d39ad9cdf841f2b3b29fd0c961ca Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Fri, 9 Sep 2016 16:00:42 -0300 Subject: [PATCH] handle read-only files @@ -9,37 +9,32 @@ https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d2634 Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] Signed-off-by: Fabio Berton - --- - src/patchelf.cc | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) + src/patchelf.cc | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) -Index: git/src/patchelf.cc -=================================================================== ---- git.orig/src/patchelf.cc -+++ git/src/patchelf.cc -@@ -534,9 +534,19 @@ void ElfFile::sortShd +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 49accae..fb6c7ed 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -378,8 +378,16 @@ void ElfFile::sortShdrs() static void writeFile(const std::string & fileName, const FileContents & contents) { + struct stat st; -+ int fd; + debug("writing %s\n", fileName.c_str()); -- int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); + if (stat(fileName.c_str(), &st) != 0) + error("stat"); + + if (chmod(fileName.c_str(), 0600) != 0) + error("chmod"); + -+ fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); -+ + int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0777); if (fd == -1) error("open"); - -@@ -551,8 +561,6 @@ static void writeFile(const std::string +@@ -395,8 +403,6 @@ static void writeFile(const std::string & fileName, const FileContents & content bytesWritten += portion; } @@ -48,7 +43,7 @@ Index: git/src/patchelf.cc /* * Just ignore EINTR; a retry loop is the wrong thing to do. * -@@ -561,9 +569,11 @@ static void writeFile(const std::string +@@ -405,9 +411,11 @@ static void writeFile(const std::string & fileName, const FileContents & content * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain */ @@ -63,3 +58,6 @@ Index: git/src/patchelf.cc } +-- +2.30.2 + diff --git a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb similarity index 91% rename from meta/recipes-devtools/patchelf/patchelf_0.14.5.bb rename to meta/recipes-devtools/patchelf/patchelf_0.15.0.bb index 0fa2c00f1d..389a0a9f40 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb +++ b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb @@ -7,7 +7,7 @@ LICENSE = "GPL-3.0-only" SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ file://handle-read-only-files.patch \ " -SRCREV = "a35054504293f9ff64539850d1ed0bfd2f5399f2" +SRCREV = "49008002562355b0e35075cbc1c42c645ff04e28" S = "${WORKDIR}/git" From patchwork Thu Aug 11 19:58:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11296 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 483E7C3F6B0 for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web09.2535.1660247897246539726 for ; Thu, 11 Aug 2022 12:58:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jF71PdXC; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id gk3so35284346ejb.8 for ; Thu, 11 Aug 2022 12:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=FlvBb4qfT8GhoNLT2aYsFZMksW5VrnFAShCHxt5jQSg=; b=jF71PdXCCsaMPoUdtm6iHsKy7PF8pxHsyXxzDksQaeGpJ09PDqW0rbdE0/mkFScaSK ceS/Brdg+e9NaC5ZdY2UQ6q/UDjkQS/nFWR1e+O+Jrml4dvE8oSxScGaq7WznNMhWTh/ mLgpijoAV89MqJ6iiH0DNP8pkQ200Sk//jgHSWf6/ER6kJgM7TYrkbShzL3JrMs0JQeX X5dyy8x3j54m4SVXjqWWgC1rhCkUrGyy5MofNWit23OjtQxKLt0UgV3GrjodJm9Pg4wZ rH7vUpttOt35HWgxu9eiOcULjn/rDL34TeYKnRAd50qZb0JgJxW0DSgSBaVBQjOhYdwX YeBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=FlvBb4qfT8GhoNLT2aYsFZMksW5VrnFAShCHxt5jQSg=; b=DvNV1URdTf8ppD4Hk8BSapF2TeKRilGhR97ueExRcaDCJYVc1w8NNal0aIpBj5C28t tUKMv+PrVhu8egnB6F7fs7IkWXFpzrWQCfCKSjFdUQSQKl5eV+E+g/0FGsFQEUPfuiRz qlYeUY2YtKccW3QYAxf+1AUq8GbJV0EZ/mfcMDoU1Lvi5nxL8zUzammekLMYWwoX+Xng CWxgrs+bdLQD2EO0xDK71t3jXKmeA77SLcmKNlVmo+PJ801EAyHmXxjXccUyaSLGlgNA xmAqcqZd/fLQJuQSnrv0VAZECIo2SefiGVF/1Q/pTGdN2Pd287Uy81JpS2IKO8Ag5JSx Mtdg== X-Gm-Message-State: ACgBeo02URHtmQqliEk7uAHcdwprYOjQ0ZysXpfhr2w3kUfeeVJyI+fU 76RnMm7qn6s0cwq76G3VQYg6FmcBacI= X-Google-Smtp-Source: AA6agR4I/MalY0P6F3GvkEs0LP3vN8/pg8QcmqJGqsyLdPo38pSiWYutXKB/qeKtOv2v1tSDAMO6cQ== X-Received: by 2002:a17:907:2707:b0:730:af0b:3572 with SMTP id w7-20020a170907270700b00730af0b3572mr411067ejk.411.1660247895510; Thu, 11 Aug 2022 12:58:15 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:15 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/7] patchelf: replace a rejected patch with an equivalent uninative.bbclass tweak Date: Thu, 11 Aug 2022 21:58:05 +0200 Message-Id: <20220811195806.1571221-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811195806.1571221-1-alex@linutronix.de> References: <20220811195806.1571221-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169268 This was the original reason to add the patch: https://git.openembedded.org/openembedded-core/commit/?id=18efcbcb896239c64fedd009ce57f3f0c668cbc0 and this is the upstream discussion which suggests handling read-only files explicitly outside of patchelf: https://github.com/NixOS/patchelf/pull/89 Signed-off-by: Alexander Kanavin --- meta/classes/uninative.bbclass | 2 + .../patchelf/handle-read-only-files.patch | 63 ------------------- .../patchelf/patchelf_0.15.0.bb | 1 - 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 6a9e862bcd..7f0591d49a 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -167,5 +167,7 @@ python uninative_changeinterp () { if not elf.isDynamic(): continue + os.chmod(f, s[stat.ST_MODE] | stat.S_IWUSR) subprocess.check_output(("patchelf-uninative", "--set-interpreter", d.getVar("UNINATIVE_LOADER"), f), stderr=subprocess.STDOUT) + os.chmod(f, s[stat.ST_MODE]) } diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch deleted file mode 100644 index 76ad8d9d4d..0000000000 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 38b3d65f4a79d39ad9cdf841f2b3b29fd0c961ca Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Fri, 9 Sep 2016 16:00:42 -0300 -Subject: [PATCH] handle read-only files - -Patch from: -https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d26348a503509 - -Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] - -Signed-off-by: Fabio Berton ---- - src/patchelf.cc | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 49accae..fb6c7ed 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -378,8 +378,16 @@ void ElfFile::sortShdrs() - - static void writeFile(const std::string & fileName, const FileContents & contents) - { -+ struct stat st; -+ - debug("writing %s\n", fileName.c_str()); - -+ if (stat(fileName.c_str(), &st) != 0) -+ error("stat"); -+ -+ if (chmod(fileName.c_str(), 0600) != 0) -+ error("chmod"); -+ - int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0777); - if (fd == -1) - error("open"); -@@ -395,8 +403,6 @@ static void writeFile(const std::string & fileName, const FileContents & content - bytesWritten += portion; - } - -- if (close(fd) >= 0) -- return; - /* - * Just ignore EINTR; a retry loop is the wrong thing to do. - * -@@ -405,9 +411,11 @@ static void writeFile(const std::string & fileName, const FileContents & content - * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR - * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain - */ -- if (errno == EINTR) -- return; -- error("close"); -+ if ((close(fd) < 0) && errno != EINTR) -+ error("close"); -+ -+ if (chmod(fileName.c_str(), st.st_mode) != 0) -+ error("chmod"); - } - - --- -2.30.2 - diff --git a/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb index 389a0a9f40..e07775f574 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb +++ b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb @@ -5,7 +5,6 @@ HOMEPAGE = "https://github.com/NixOS/patchelf" LICENSE = "GPL-3.0-only" SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ - file://handle-read-only-files.patch \ " SRCREV = "49008002562355b0e35075cbc1c42c645ff04e28" From patchwork Thu Aug 11 19:58:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 11299 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48E32C48BEA for ; Thu, 11 Aug 2022 19:58:21 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web09.2536.1660247897885408748 for ; Thu, 11 Aug 2022 12:58:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=o+dF6pWQ; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id z20so22353600edb.9 for ; Thu, 11 Aug 2022 12:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=AtkvL6iJWSNFiz7OB7TXQQtoYzQaYLAM1KWzt0KKdpc=; b=o+dF6pWQja5aYkssZtn429+SoVd84peajkLTR7/Gp71dG2bw/5vMVq1yj6pp0K8RYC jW9bMmSs8nHSkltElXzPqRAJ0FU8TLPXFqcsvzt7jV88/WT9E8Wq+qMh8uWrKAyE3AKe 4/mtGC0roBGqw6qiTe4F7ePHsyY+2Ta54sNxSbsSCPKbVDU25tR+64eepDQC5fohx/Xn Q84FbSEUb8L5RQsdvaSCkYNgabiQ+9X2nbUEb52jmvX3S8GXMtIAlRV/GCf0j05p8xFl I1XtgnkEG/86mVAFool9UrzV8K5Q6aXW7n8jnEY+HHjCsXOpYBlW6vCnnxnTiUuk3TUN T/3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=AtkvL6iJWSNFiz7OB7TXQQtoYzQaYLAM1KWzt0KKdpc=; b=aQr4FPal/rmjQs2fvhUW0tWkpdsOHoTLzzLFavoMekWr8Gsftb0mnVKpGad1kz3KRD YckFzc0cCL4EfSOy7IrlMtWIr5z22Zn7A+QPOKXwgUR2avnKAze+Z2NlEqtpI3sC5Y1W l/h9lTIYA1NDi2VDxn57oPv5TsOE3MxAG70kUNW4CGGWvAX6qFVIqqVpHsgBSsc811Vd OSR/L5V2F515wc5y++mbI4lAMm9aNmXawWqE25iXJG4BeN0NJ4DOWQIU9nAg+/mx5Swt fiZfNM5qLRZ2ZO5uJd3L42k8rcF4zJHqlhfYiyxdCYKqmYX0QN1PaVgBm6Bo6Mf8fQEk Ya/A== X-Gm-Message-State: ACgBeo11MGg1kxL5D8D+zPJ5i7Fy55Jzy4NIlO2Yas/dnEYoOYAPWBEQ y36d583Pev1Ox5MT+2xnLM1BiX3b7SA= X-Google-Smtp-Source: AA6agR66cgDOdelOF47+NQZCS39YU6pX+bDWUVev5S0nblTMOTo+mCvqFnETMqDgaKUKc+sVNFSLjA== X-Received: by 2002:a05:6402:194e:b0:442:c81c:ca25 with SMTP id f14-20020a056402194e00b00442c81cca25mr641963edz.137.1660247896294; Thu, 11 Aug 2022 12:58:16 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id fu18-20020a170907b01200b007308bdef04bsm22010ejc.103.2022.08.11.12.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 12:58:15 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/7] weston: exclude pre-releases from version check Date: Thu, 11 Aug 2022 21:58:06 +0200 Message-Id: <20220811195806.1571221-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811195806.1571221-1-alex@linutronix.de> References: <20220811195806.1571221-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 11 Aug 2022 19:58:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169269 Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/weston_10.0.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/wayland/weston_10.0.2.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb index f81a33fd1e..786d12be61 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.2.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb @@ -16,6 +16,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" +UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" inherit meson pkgconfig useradd