From patchwork Wed Apr 20 14:07:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6896 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 2DA82C55188 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web12.8110.1650463714260748139 for ; Wed, 20 Apr 2022 07:08:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=HJwYFpG0; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id e62-20020a17090a6fc400b001d2cd8e9b0aso2118867pjk.5 for ; Wed, 20 Apr 2022 07:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=S+Dm4bga7uJQ2VW6HIzaUbXpWqlc9D2lodXWz1s8WTA=; b=HJwYFpG0ZLnRNADteiIavdafz8SA29ejYcEjaCdTOHScHHroqPlNdzxWaWhyNTTLBT 92Ld82K1/wS+we/Jph5Xx3IX25YEX4RfmFOHBinV6iC+hXulexCdbAzWfyKcoYaAnI+x IHUaspGI9NPB5ANs4QQAyiVSnZ7Mk1IqBfUf8KFBtK4sYRBEZiK/zw77BT6XKN6dCxTy C6ABQSKMfFmc5/hMZJum/he/1/kGJQCC+vxg2CYQNscXGM6nBFQH8hyjHTGdY9Ov49zl lPSfbsnMTO2goBO2ZLkbMW6YcQKWDtLzEbR1/9zmZWAipa8CYzLYua8PD4UMkKDHIUio O52g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S+Dm4bga7uJQ2VW6HIzaUbXpWqlc9D2lodXWz1s8WTA=; b=2/qWwSaXQQ+6mBbIMWXvI1NQaXJgUIJOj/rPQxv0MiMcXa1B5gYDbqqCxHjeNO29jM 4EnjCc4bb1rSCGSEx9/A2e6YkK6gnyzJK0Wa+47QoKUfqhZBXa4UE4F+tLpZJwR67DxB p3VKVj0u2FZipqj1iPrPw6FQPlLQD4HQjGu9zEv15DMVpxID3X7FXx+IJ9yrvltYpvpw prpHWsClSd3fXtffMWXaOSMXKun1cC/QTkq5Q65hsoOLuz36Rpul+2xiFgdXED9aL+T7 +3VSvvlLKnkibJhq+Yf0OD5mK3H+OUzvhkEAMjBsM9idrca320qIc3T/rj8aNMD+QWCE Rjfg== X-Gm-Message-State: AOAM532i7pY9In7NGzAnLliiIv82TJWS++d7mgGQt0+B39wfc6O/cL4s wTIOmGK8HnJ7WMcEkr5Ak1cP6kYBEI0qYKJ6tpo= X-Google-Smtp-Source: ABdhPJzIri50kRsMwQeMsHLySol9kFjokcDLoIsvrnSk9Kzwo13yNqgWIshoiGx3PWcgXqkQB0Uw+w== X-Received: by 2002:a17:90b:4a09:b0:1d2:de49:9be8 with SMTP id kk9-20020a17090b4a0900b001d2de499be8mr4791710pjb.68.1650463713168; Wed, 20 Apr 2022 07:08:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/27] systemd-boot: remove outdated EFI_LD comment Date: Wed, 20 Apr 2022 04:07:49 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164669 From: Martin Jansa * efi-ld meson option was changed in systemd 250: https://github.com/systemd/systemd/commit/fe330f02dfebbaa462e0f4590de1049e47da54b9 the value was changed with the systemd upgrade in: https://git.openembedded.org/openembedded-core/commit/?id=e22188e47d2fce2406d9db9c95289b3878eda69f but the comment originally from: https://git.openembedded.org/openembedded-core/commit/?id=603e50f3db224a0e36a65decb9a98df41b9e22b3 no longer makes any sense, remove it Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit c14dbe3d3c1abf5f95310162288f861bfd312900) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd-boot_250.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd-boot_250.4.bb b/meta/recipes-core/systemd/systemd-boot_250.4.bb index 23a64bf30d..b67706b731 100644 --- a/meta/recipes-core/systemd/systemd-boot_250.4.bb +++ b/meta/recipes-core/systemd/systemd-boot_250.4.bb @@ -19,7 +19,6 @@ objcopy = ${@meson_array('OBJCOPY', d)} EOF } -# need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL EFI_LD = "bfd" EXTRA_OEMESON += "-Defi=true \ From patchwork Wed Apr 20 14:07:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6897 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 2ED39C5518D for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.8141.1650463718107042233 for ; Wed, 20 Apr 2022 07:08:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=u56xE47+; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id mm4-20020a17090b358400b001cb93d8b137so5067497pjb.2 for ; Wed, 20 Apr 2022 07:08:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WJDeZuhNg9o6CqmzNkbeh8aC8cV3lgV4SRwFyfmRc/U=; b=u56xE47+8uK3pm/W+ZxrjfrVm8jBBZ3CSipzrpPf2cqt+ht1ClenihdfhjOo2ySOvm 1rqWKwKZ565JRDBlZ5VHIB9olHYQbv6mgZ66BDckgOPRd5DQNH5W0gVTGKQ6h2VMShiQ vnTfx6ETGMuUyPo2emgwDIFUfP/8NkaFbvHSjOZlFEcbiTfJ/4D2Hcbkwu6djJ01rqoZ 3FtIU1dCVpaVfQQxHEaw5BsOXL4G13y9CBFzS+R4p1fSx80KyWQgpQuGnQUQld56/G6R aVX8yztCuuo1StLuULL/YFMA2tNUuWWhmsNkvAjl7ecsM+yZC1KJ/zcfStuM92TABpMw 4DtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WJDeZuhNg9o6CqmzNkbeh8aC8cV3lgV4SRwFyfmRc/U=; b=Psvp/2+ySbvw7HWZxFG5GL440HaOt4lerWvPiiKF/AU2gAm7HFOqZACnVaLYeQ/EjS +L/mcSOvcx749f5mWALi5q0XAfFJ4ZQdNYDpNmhs/FUhTi2IqWNt+6AA4hq+uJKxi7en yKjTDzARz4jDWBnOeA6H4xOwLZrfY/vNEpZFIivP1u9TIyk6lXZTNqkTQlFq2v2tqWm8 dCw+3X7rI+xi8h+bRPmmRIELz5pNMWuWUoOLhVRog1Lp+/Jf8BvZThRriQLN8wXBJjQh oHZczOmFwH8w049+/5MDDSidWwj3LC1mtVgUj5nJGzDsk0ZWCrSwBS1aG0Qq1dRZZ4wW lGqA== X-Gm-Message-State: AOAM531ZxvNnzKkcFhZcB4Y6Ryj9uroAotP+PA3JZqqdt+9CBdWR/05p Z2sYJ7W6MIFMErDgeP7eWB6oTW2GzdHZ7zzU7RQ= X-Google-Smtp-Source: ABdhPJwbW7aW69dsmuBRneiP+7zYa+QwE3tFcHXKVfsEP6ELL7akyxsqfQZs7U0k59CrlbKEm8VdBQ== X-Received: by 2002:a17:903:32d0:b0:158:fe2e:d2a7 with SMTP id i16-20020a17090332d000b00158fe2ed2a7mr14221024plr.93.1650463716952; Wed, 20 Apr 2022 07:08:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/27] qemuarm64: use virtio pci interfaces Date: Wed, 20 Apr 2022 04:07:50 -1000 Message-Id: <7426b5349e5a2872ce8f963be35ad11dcdc4891e.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164670 From: Jon Mason The virtio PCI devices seemed to be required for this machine for some versions of qemu (based on errors from running qemu saying that the devices don't exist). Changes to the entries here is all that is needed to get it working. Signed-off-by: Jon Mason Signed-off-by: Richard Purdie (cherry picked from commit 217deeb43036d1a046d6c5ea2c1ccdb94d3d605a) Signed-off-by: Steve Sakoman --- meta/conf/machine/qemuarm64.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index f245152168..ffc51c803f 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -23,9 +23,9 @@ QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" -QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" +QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@" # Virtio block device -QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" +QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=disk0" # Virtio serial console -QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" -QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" +QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" +QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" From patchwork Wed Apr 20 14:07:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6894 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 3AA41C55187 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web10.8029.1650463721103708197 for ; Wed, 20 Apr 2022 07:08:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=F/x0guge; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id p8so2020052pfh.8 for ; Wed, 20 Apr 2022 07:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=om6JYXtNYlHEGyop9cdUUarI52pL8APQ9WC4zbTWGN0=; b=F/x0gugeMkLhMYUerN2RI5h1C3xLKJzARR0bcu7cmh43QI8GDtvmiVYAaIzPLvUwnr fzIHzLTmlp7joBizC0Ex5rd+f6o3AlYvLpEAE1EpumUP9YE0HnDrFdc4dupo59bGY8m7 ZOeaoEOQxUIMhBG2HOP78FxEFx8+t+NxXfHqsP6fxW6ihTQE6rBxt4EhQC4hjFLq58+e nR+WJ8muO63JKzkBvRMSzt27jZc9kN7gCRW0Kg7FwFETQn43FeP6uluerwGNq3UxdGS/ KVW+sihiQoVPYtW/A10UYmhoZkbR2F+0Nq36/BGXAMJilDhiwutjoNTuNhACt08BXvKL tmhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=om6JYXtNYlHEGyop9cdUUarI52pL8APQ9WC4zbTWGN0=; b=GXqugKL3OUb1YOxhQ5xZaCFUWwAYhMeg5ZaLa4ihrInqVtBHgr2t+jwb0yYcoWHzAJ Rx4kRamCW2hTDysga+F0QpI0SX2DB0+fU3BtvbUTHgkiX/8BwMPUdRYCpIEuO9ce0t+0 x7XIE56QJnPwfA2aAt+5qL+bQatnD2J4Pt5Km37uCuckSP6sii0E96irYbvcpa4MQEvj GtpUfu4+38Wij5kUgPxxFB+hrAGSi4aTO00Xh4N1iYbMvSmmGlJxL94l7AbMYef0NCUG HJfA9J5/HJY5UIamcWFTuMBkoi2aVvwYChPd4/960uSX1tE7EtWBYgtr33nqkIOsGjFp o4Ow== X-Gm-Message-State: AOAM530y7h2fO3W6rUFv1m3x9EQwF0HJVn1RW+guMmnywD70q2ZlRPvi j4ipYIkNOnuUTytu4OWa9WuzTmG/tqIxKERHf4U= X-Google-Smtp-Source: ABdhPJxGUj9dwrhMwy7/op1/j8bd8R5MhYZSmAVF57j62CL1N+npxUSI3lO1pGBqrO9ZNFIr4qvSYg== X-Received: by 2002:a65:5286:0:b0:398:dad:c3d8 with SMTP id y6-20020a655286000000b003980dadc3d8mr19646113pgp.228.1650463720145; Wed, 20 Apr 2022 07:08:40 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/27] selftest/lic_checksum: Add test for filename containing space Date: Wed, 20 Apr 2022 04:07:51 -1000 Message-Id: <46349013561e0e4b376a845c1cce029a74e613d9.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164671 From: Paulo Neves A fix is being added to bitbake to correctly handle spaces inside checksum filenames. Add a test to oe-selftest to ensure this is tested and doesn't regress in future. Signed-off-by: Paulo Neves Signed-off-by: Richard Purdie (cherry picked from commit 324109f034f069ee3e91a1a705b3449911a448de) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/lic_checksum.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/lic_checksum.py b/meta/lib/oeqa/selftest/cases/lic_checksum.py index f8681ed755..8f1226e6a5 100644 --- a/meta/lib/oeqa/selftest/cases/lic_checksum.py +++ b/meta/lib/oeqa/selftest/cases/lic_checksum.py @@ -4,12 +4,30 @@ import os import tempfile +import urllib from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import bitbake class LicenseTests(OESelftestTestCase): + def test_checksum_with_space(self): + bitbake_cmd = '-c populate_lic emptytest' + + lic_file, lic_path = tempfile.mkstemp(" -afterspace") + os.close(lic_file) + #self.track_for_cleanup(lic_path) + + self.write_config("INHERIT:remove = \"report-error\"") + + self.write_recipeinc('emptytest', """ +INHIBIT_DEFAULT_DEPS = "1" +LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" +SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" +""" % (urllib.parse.quote(lic_path), urllib.parse.quote(lic_path))) + result = bitbake(bitbake_cmd) + + # Verify that changing a license file that has an absolute path causes # the license qa to fail due to a mismatched md5sum. def test_nonmatching_checksum(self): From patchwork Wed Apr 20 14:07:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6898 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 3AAF7C55191 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web08.8215.1650463723923201948 for ; Wed, 20 Apr 2022 07:08:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gvLCgYHe; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id x1so2043969pfj.2 for ; Wed, 20 Apr 2022 07:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dJ+kENKrYstMyvydhUE/Rvqdqy4HN+UiozASh9LWQ5o=; b=gvLCgYHerX35SXehreLMg0BDVdH6+v5OPYIEZKJvzA/NJkguO7wcb0t3hPoDkhFHjx 5RR6gghX42qcy6NuahsYzp/S5EtPvaF8dNvLRGrWg9wjIa/muCxoiLbx41yzk8NVujKB GJ5pYc9hgzISKfRuaSTjZrCghc4odNon0qZAbmtCO2cqpURIfWhykiWl76nD0NH9qH1Z g2CnkhJzpcGGCM6M32vkUP4mBF24celOWMs8ltDlvVkVD7CbO0eonIdD4AZBrfsWvJXg lO+AhB7Nf6bHT/JB8YwcDkHedROPxSnp715BHt3UcT1ouNKmS/dutHCHy82F7sSjwcUI wymg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dJ+kENKrYstMyvydhUE/Rvqdqy4HN+UiozASh9LWQ5o=; b=70Nu1URKzvNlaUApD+E/28V6atEZsQJL9wtPHFdzLKe2aa+GrNyxpxYQYHgaKK1D0J IaqN9NpyAGrQlhVDzVHcTMbC/TmPR3MmRH0w/IzOgZI8o2kmDgrevssCEvRWjuXoRYNS Dl9/h68zE62EqM6nHgUpNWCaAIcJ1SyeLQTfq7aVSwSKX7hcosTEm1DOo31wDrIge5z7 3Mf4rW7S4hFm/mWAuaeoey7/oXVLNwudPX6+XUB1IBg3wi4K2kLMoBXVqDO80LMNb87p APYxZD422HgQ/aZpCo1bRKNLsPGornyfR4IC6VbcNlXXKxifJfgBKiInleravWCkIU0z sEnw== X-Gm-Message-State: AOAM533/JSOIoCbTa4fgWLvGDXRodLVvT38IudIWLuaKHEZHHG/Odp5D /B1UDbEhJLtzFgVBnaheSNXKAFCyE6aCytnWkgc= X-Google-Smtp-Source: ABdhPJxg1VvXjplwnbwksn8DCZmGQrtkxSrxWINS49W0CI9wtbn1ZiB5mtkw1Y0WuyzFyeskfMdmXg== X-Received: by 2002:a65:4b85:0:b0:399:8cd:5270 with SMTP id t5-20020a654b85000000b0039908cd5270mr19057612pgq.418.1650463722979; Wed, 20 Apr 2022 07:08:42 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/27] buildtools-tarball: Only add cert envvars if certs are included Date: Wed, 20 Apr 2022 04:07:52 -1000 Message-Id: <168eb6b00bf332f46823773a38649b8bdc68d570.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164672 From: Richard Purdie Users may or may not include the certificates in buildtools. Only set the appropriate variables if they're present. Signed-off-by: Richard Purdie (cherry picked from commit 0945a2a5d7c41af22e222a116aafacb4beee54d2) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index f9f36e68c4..6b59e4934d 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -69,8 +69,10 @@ create_sdk_files:append () { touch $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 + if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then + 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 + fi toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} From patchwork Wed Apr 20 14:07:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6900 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 40602C433EF for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.8145.1650463726697700156 for ; Wed, 20 Apr 2022 07:08:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=JeX2Rd4F; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id t4so1736451pgc.1 for ; Wed, 20 Apr 2022 07:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jFJvQzGDNsvDjJpreDIS4wtTBuCBiYius326OFWpfCo=; b=JeX2Rd4Fa/zce8cQ4SkpTh2bxnG9ni4o8Uf9ZmX98PcbQN1xv5wVjhb7lKAl/xgwBT 8tz6AVbmLrShplEJnnZ/6BbLqK4Ja3pUC+GgccRMBYCiyT1lfNn/D57xO0SrcnzlM/Jk UWjPbgGJSjAha4xSFWPQgbIpuSTDspGjrdWor2fONLuh8sVZg94FTFEBrGtebtCpehWn hABtizB7wY7Eill87XFdhyTGtdrkGdQcohPaU2qBneA2X7AS3Pv0wrqzod/4lfYoaMGy Cslq8rQt+smnGaLFXWbI28tAPUqzWL3nhVIeXyDM65qlf1JDzWT7aFkosBxZF61qRCtv Z2Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jFJvQzGDNsvDjJpreDIS4wtTBuCBiYius326OFWpfCo=; b=qjXVxTpjQOk3nvNNxTVGxy4rrq4pUbE8niE8nOyIL8LPSA0KGFX9tG2ye3UfpCwHed rUqcvTDD5lW42UOrPXuHrZsklMS+fCBzMOMjVfEeZobL7hkPpSHhEl/pkPSNkQGCtl/B qA4t3qwsH4WU81eM7OaTE3eIwSatjYVdeHV2biM0x5MMUI/oxbzLQsIgPbd0WxlYL5AW Afs0RnYIi/seJvXL30sPdTDunWGT6pEgKv0ORgY1J6+XYMAcUN4Zl5jYIh5JlBo2tG6g dkEEZb/ErPYlDpGfQIp3EJmpLlnO9XA57GtYhV++pU9OAgfhg7aC0Uq2RgHNwsxJv9Nb 5m8g== X-Gm-Message-State: AOAM531NZr/w6FhDj7NLXl603/nLTuAAcQjMr+wNm8zSeQbzmxz1lnLs hzruZ/UPfAk4JHiWaF817ppoRNFZU3itqL9PeBY= X-Google-Smtp-Source: ABdhPJzwXMitYsY7lnOjrK20/mMspTKK4/n0wrX+SuYYvoW6X5ZmgSuE0bSN4CICg/6Kz6U0ZaXL2g== X-Received: by 2002:a05:6a02:114:b0:381:4931:1f96 with SMTP id bg20-20020a056a02011400b0038149311f96mr19217189pgb.331.1650463725699; Wed, 20 Apr 2022 07:08:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/27] babeltrace: Disable warnings as errors Date: Wed, 20 Apr 2022 04:07:53 -1000 Message-Id: <2d6d5317b4cd748b896a2a43a005367cc83938bb.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164673 From: Khem Raj These settings are good for developers/maintainers but for distributions generally disabling them turns out to be better especially when there is a knob to do so. This fixes build with gcc-12 which find additional warnings inlined from 'bt_ctf_object_set_parent' at ../../../git/src/ctf-writer/object.h:120:6, inlined from 'bt_ctf_trace_common_add_stream_class' at ../../../git/src/ctf-writer/trace.c:1243:3: ../../../git/src/ctf-writer/object.h:141:26: error: null pointer dereference [-Werror=null-dereference] 141 | if (child->parent) { | ~~~~~^~~~~~~~ ../../../git/src/ctf-writer/object.h:141:26: error: null pointer dereference [-Werror=null-dereference] cc1: all warnings being treated as errors Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1898d10dd4d4372823e6c8b8c4ed28604e692365) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb index 248b84e98d..b48f07ea0d 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig ptest python3targetconfig -EXTRA_OECONF = "--disable-debug-info" +EXTRA_OECONF = "--disable-debug-info --disable-Werror" PACKAGECONFIG ??= "manpages" PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" From patchwork Wed Apr 20 14:07:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 06/27] xserver-xorg: Fix build with gcc12 Date: Wed, 20 Apr 2022 04:07:54 -1000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Khem Raj backport patch to silence new array-bounds warnings Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 54fa74e6e60472e10f1a11b3daa8ee9f00f0c9d5) Signed-off-by: Steve Sakoman --- .../0001-render-Fix-build-with-gcc-12.patch | 90 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_21.1.3.bb | 1 + 2 files changed, 91 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch new file mode 100644 index 0000000000..df9332fae7 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch @@ -0,0 +1,90 @@ +From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Thu, 20 Jan 2022 10:20:38 +0100 +Subject: [PATCH] render: Fix build with gcc 12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The xserver fails to compile with the latest gcc 12: + + render/picture.c: In function ‘CreateSolidPicture’: + render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds] + 874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill; + | ^~ + render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’ + 868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + render/picture.c: In function ‘CreateLinearGradientPicture’: + render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] + 906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear; + | ^~ + render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’ + 899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + render/picture.c: In function ‘CreateConicalGradientPicture’: + render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] + 989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical; + | ^~ + render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’ + 982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + cc1: some warnings being treated as errors + ninja: build stopped: subcommand failed. + +This is because gcc 12 has become stricter and raises a warning now. + +Fix the warning/error by allocating enough memory to store the union +struct. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e] +Signed-off-by: Olivier Fourdan +Acked-by: Michel Dänzer +Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256 +--- + render/picture.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/render/picture.c b/render/picture.c +index afa0d25..2be4b19 100644 +--- a/render/picture.c ++++ b/render/picture.c +@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error) + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2, + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner, + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle, + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +-- +2.35.1 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb index 3e076ecca7..1f53ab5177 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb @@ -2,6 +2,7 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ + file://0001-render-Fix-build-with-gcc-12.patch \ " SRC_URI[sha256sum] = "61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5" From patchwork Wed Apr 20 14:07:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6902 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 4B61AC5519F for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.8034.1650463732859879728 for ; Wed, 20 Apr 2022 07:08:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ePiWc9xR; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id q19so1717896pgm.6 for ; Wed, 20 Apr 2022 07:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IP/S6mL63fUBf/b00Ow00T2opc6uvwgGUBJF+Dq9pL0=; b=ePiWc9xR1TcoT8xxDhnpDBwfoE0gj+SJg5D0f7AWbi7GXt5PvOTSHOEMN8ZHPIZ9Mb 2qPpenf3SrOsSYVle/wu54yK48gLV4k/syj64Z7lZGZq3I106OZWMuDEgTahFDOu6HJo EzonZ2kaROZf7/Mnxm+XFSxXWIBqCXjzHNzfpYZhWrplDSg3Q7eJjcYRO2xeKo4KNSu0 sG6raX+kYPuXT21+JCqVwHHY5tr43kKbVa9HpULSSyfRFv4euTuHdod4Taf7eIJCE7FX QEy1RX8/rWVu//bDNNLJ9ObVa1+8FGTBaOFIFOXQcKNo/8BjwgzU9AC7AHD9MV8Ss9hG dudw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IP/S6mL63fUBf/b00Ow00T2opc6uvwgGUBJF+Dq9pL0=; b=gibfqiTzIhCFOOdgQjXG3rYghADcsyQm2u6Wc0iWCG/8SiuHeMsj9TM4Nkq89h0X4S W491HbvtpnffaYOZt7Mrg2TlhRtDh0wsqfVlrxQFn7YXSn/vhPw7UaQuSIO6CZWSAzf3 IbRiuQXtGb9NsefPEQ/QpeY0/psgQjcVeXnU2jzR3zBpMnsnxgNl5SecVT0sG6ADVALQ S4I6xZSjuZCVsImwvGdX0nu6Z0pRwFwN+LaAfZl3Mo6RsHIBwUyU1COykqjX9mR4IJDi IJamNRChTicqFcRuyrsq0bG6iQcrb7cJBbG+SmQ/SwhEe8CLTm6G5FG1HKv+ezeoY0L9 zbXw== X-Gm-Message-State: AOAM532x6dF77NBsb1TbsHBAcpfJ+Rm/oeGX7jzeSZq2Gmt3fwGvOx2d 6JlABPjTdvdVL3ZTH1YiGhd/MFlvoi8pfz3Hbm0= X-Google-Smtp-Source: ABdhPJwzubQoG4FHcnYCF6iE3DhCAfvLyudYBZsJg4DGDFZze3TjpJUl2NyIyA4Kyfq2RzO/lDjW3g== X-Received: by 2002:a65:4c4e:0:b0:39d:21c4:2381 with SMTP id l14-20020a654c4e000000b0039d21c42381mr19584031pgr.566.1650463731631; Wed, 20 Apr 2022 07:08:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/27] systemtap: Fix build with gcc-12 Date: Wed, 20 Apr 2022 04:07:55 -1000 Message-Id: <943f1054e98c39357a223abe56bd93eb34c23d3f.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164675 From: Khem Raj Backport a patch to fix | ../git/util.cxx:1766:56: error: 'std::pointer_to_unary_function<_Arg, _Result> std::ptr_fun(_Result (*)(_Arg)) [with _Arg = int; _Result = int]' is deprecated: use 'std::function' instea d [-Werror=deprecated-declarations] | 1766 | std::not1(std::ptr_fun(std::isspace)))); | | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0b360d12203aafd8bf96433d11221a6ed910a11f) Signed-off-by: Steve Sakoman --- ...ility-re-tweak-for-rhel6-use-functio.patch | 49 +++++++++++++++++++ .../recipes-kernel/systemtap/systemtap_git.bb | 3 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch b/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch new file mode 100644 index 0000000000..f885c44460 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch @@ -0,0 +1,49 @@ +From f199d1982ef8a6c6d5c06c082d057b8793bcc6aa Mon Sep 17 00:00:00 2001 +From: Serhei Makarov +Date: Fri, 21 Jan 2022 18:21:46 -0500 +Subject: [PATCH] gcc12 c++ compatibility re-tweak for rhel6: use function + pointer instead of lambdas instead of ptr_fun<> + +Saving 2 lines in ltrim/rtrim is probably not a good reason to drop +compatibility with the RHEL6 system compiler. Actually declaring a +named function and passing the function pointer is compatible with +everything. + +Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=f199d1982ef8a6c6d5c06c082d057b8793bcc6aa] +Signed-off-by: Khem Raj +--- + util.cxx | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/util.cxx ++++ b/util.cxx +@@ -1757,21 +1757,24 @@ flush_to_stream (const string &fname, os + return 1; // Failure + } + ++int ++not_isspace(unsigned char c) ++{ ++ return !std::isspace(c); ++} ++ + // trim from start (in place) + void + ltrim(std::string &s) + { +- s.erase(s.begin(), +- std::find_if(s.begin(), s.end(), +- std::not1(std::ptr_fun(std::isspace)))); ++ s.erase(s.begin(), std::find_if(s.begin(), s.end(), not_isspace)); + } + + // trim from end (in place) + void + rtrim(std::string &s) + { +- s.erase(std::find_if(s.rbegin(), s.rend(), +- std::not1(std::ptr_fun(std::isspace))).base(), s.end()); ++ s.erase(std::find_if(s.rbegin(), s.rend(), not_isspace).base(), s.end()); + } + + // trim from both ends (in place) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 04f7e03ab5..ce86d5274d 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -7,7 +7,8 @@ HOMEPAGE = "https://sourceware.org/systemtap/" require systemtap_git.inc SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch \ - file://0001-staprun-address-ncurses-6.3-failures.patch \ + file://0001-staprun-address-ncurses-6.3-failures.patch \ + file://0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch \ " DEPENDS = "elfutils" From patchwork Wed Apr 20 14:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6901 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 4FB00C5AC75 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.8035.1650463735371662679 for ; Wed, 20 Apr 2022 07:08:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=aJu4jg7i; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id x1so2044485pfj.2 for ; Wed, 20 Apr 2022 07:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5TO7kdEvI9cbjWc60FppgLvgE/dRu7JwduMK7bqc9bQ=; b=aJu4jg7ieb6d3HM7hgHLqsieD9Q+vN6UJjwPltDM43IKrObBNXwpNZo4B5TKiYd7ae r0FQbNX4RfxEf3hH62Otozlk8+rw5W/Y2llY6+76Z0FRlRLleEnVuOA/jxwS/pDqN80l WWZq15YRqwqMRjMcZosh8wDpwbqIIEkPNacEoJ2iEVnUamrLEpCmA3PO2eEBCHzum4+V 9F3RV885CcJJ3wbIlFOpalBF8miCPVMjkinSLLk2+Parg+l7j1m9af5vwK2Qjki0YHQK ySU/SjeRY6KsTuOcSC8PuGfz+urmQ8TVNhSqdvkcIq/QqEOtTtu4p1YJLkfGZzl6waL4 kmPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5TO7kdEvI9cbjWc60FppgLvgE/dRu7JwduMK7bqc9bQ=; b=GYU8jlSjtGMvCmgFVzKtXmuJT+kL+iCC76LLUmwzpaOhEEPnYdc9Mh8Aws5Kty4r7X eOa6+Icv5cZPTM4qfAEDUdY8sU4/BlxhrL/oyOWvPbju6BYqEvWksi2RcE4Ggstrn4zC SNCoKJpaUkhb6/k2JPaFCKU+qeKIDgK2NlofLqNHr3yr5vYOyGEE2u+2XgQnSlpl7CuO eTE9nk/LgCckY4F5YxGZA1u6gpmRkectOgI7EaSbO0j2JwQgwbcfY3/MhCqbaWCQbesW V+U8hHmZ8FByguZSQZAGaZKa60GxzHppf4iXmjIVxAUoiYEjK8OEGJ/jrZYgdCoDXPwx ZLHg== X-Gm-Message-State: AOAM532ZemdaZ+21sGQ7kgriwTyf2JBnUN4AlM+hKPBZHE6UeY5guD9d eEXGdTRGwe1pT+equS9AitsWDEOq/FiWlVm5vdg= X-Google-Smtp-Source: ABdhPJyqms1lgiBJLZlo3KzlnYeOHYX1moUmaGDrvuK1AnqynZ1nYGgZPnADCRWa+n59zhn/uY2v6w== X-Received: by 2002:a05:6a00:17a0:b0:50a:99af:48d with SMTP id s32-20020a056a0017a000b0050a99af048dmr7613109pfg.64.1650463734475; Wed, 20 Apr 2022 07:08:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/27] gnupg: Disable FORTIFY_SOURCES on mips Date: Wed, 20 Apr 2022 04:07:56 -1000 Message-Id: <99004032cd4a21f0b3e626334cd4437c4f02e258.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164676 From: Khem Raj This is a workaround for issue reported with gcc12 [1] [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105234 Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8b8259e070c582d0c566535a3559aa712148efc0) Signed-off-by: Steve Sakoman --- meta/recipes-support/gnupg/gnupg_2.3.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/gnupg/gnupg_2.3.4.bb b/meta/recipes-support/gnupg/gnupg_2.3.4.bb index 81361d902c..d27bddb8bd 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.4.bb +++ b/meta/recipes-support/gnupg/gnupg_2.3.4.bb @@ -83,3 +83,6 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" BBCLASSEXTEND = "native nativesdk" + +lcl_maybe_fortify:mipsarch = "" + From patchwork Wed Apr 20 14:07:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6912 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 568EBC5AC78 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.8037.1650463738195736984 for ; Wed, 20 Apr 2022 07:08:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gVxK/3Ux; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id a15so2009702pfv.11 for ; Wed, 20 Apr 2022 07:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=k5Cz9Vf2l/e8Lq/UUf13A/ezUo5CcgBq2MpycrEc/Lg=; b=gVxK/3Ux0Fa2DMHAn6j91Rfkent6wkrznpqF0lvX9XjhgfEOfz3o/uHOyj+l/KA/Wz ubESKfYiX/DByolaL5hfCDE3/4TPDr4VnF0odlxKeP9NoDqVQS0lgzy002xkjw2WuRpl GBKM9d3a5CoaAdAq0SQjPStngzmCwNXxUVpGogENyx+Nc4cGiST4yjwy7f7xJ30cp4Nm w9ACyW4SgGf7Rt4ba3C7eGuDd5X27j9/cyL2a3wUwwVOaBPvrBtPDvSCXO/oMkr7wEzY +7oSH76ywsjDVYQmpy5GxQOtlYye9zO7TUmbgiDBKs7VABwhOjtmvBOC2/WrjfJMitb2 upSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k5Cz9Vf2l/e8Lq/UUf13A/ezUo5CcgBq2MpycrEc/Lg=; b=uKE0s+HSdxf1XVdXPKLHxisbWvLbh6WN0I+IA9umZIV65KY64Er+xt22XDXzUyALJb 21/lfZSUB/8oY3sD5QBtm0UJLpk7RYpf1VkkO7Xq8lsd1jhiCtojxfCmyMKZt/v/liSU BSUL/yAA9VqNhU0ba7nIywBYxJIRs6b078hGg/SMfjKiCdlpBDKal0uA9vFqGYEvKh9D s9b8z9LOEGR2X1kAQdjFdtrhg3LAiG2AYY+VeUieOl1Kt8bGf+XRfHw9ixqZEqI2ff9c ex9U71KMcHhA5bWGbsUkl0JgKfiDkfhiIEsjOQ23sqlFVehMfKPx1gkZxueRtHzmJgdx XGwg== X-Gm-Message-State: AOAM532BnTyo5w8AnmfWBvQ3D7huiKKx0Ul/S8iS4oJ8bSOakhdUiS3d y3msQQXQf42WK9fgQUcm0ayTM0YO2IYz9MOgk7Y= X-Google-Smtp-Source: ABdhPJxiFjcLr9O2ZW8C9AVirlGDehbmTTs9LV8SQs9Aco5keKYNvou8Y67XLbC7HVDN2TE2MwE5ug== X-Received: by 2002:a63:3f85:0:b0:3aa:2cec:57e4 with SMTP id m127-20020a633f85000000b003aa2cec57e4mr8781797pga.314.1650463737302; Wed, 20 Apr 2022 07:08:57 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.08.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:08:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/27] mdadm: Drop clang specific cflags Date: Wed, 20 Apr 2022 04:07:57 -1000 Message-Id: <6af90dfefc043faee90c8ddea9fa0eafa6fecd0a.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164677 From: Khem Raj This option is no longer needed Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8d7130937ea4e47f0fa4d23c1c8394e3ca3f939b) Signed-off-by: Steve Sakoman --- meta/recipes-extended/mdadm/mdadm_4.2.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 1c2fc8c37a..19035caaec 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -35,8 +35,6 @@ DEPENDS = "udev" SYSTEMD_SERVICE:${PN} = "mdmonitor.service" SYSTEMD_AUTO_ENABLE = "disable" -CFLAGS:append:toolchain-clang = " -Wno-error=address-of-packed-member" - # PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's asm/types.h # prevents 64-bit userland from seeing this definition, instead defaulting # to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get From patchwork Wed Apr 20 14:07:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14200 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 10/27] apt: add apt selftest to test signed package feeds Date: Wed, 20 Apr 2022 04:07:58 -1000 Message-Id: <4cc47a6937b6824fb059a179319d6d0f657b753e.1650463004.git.steve@sakoman.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Ferry Toth Since Gatesgarth apt (1.8.2) has become more strict and doesn’t allow unsigned repositories by default. Currently when building images this requirement is worked around by using [allow-insecure=yes] and equivalently when performing selftest. Patches "gpg-sign: Add parameters to gpg signature function" and "package_manager: sign DEB package feeds" enable signed DEB package feeds. This patch adds a runtime test for apt derived from the test_testimage_dnf test. It creates a signed deb package feed, runs a qemu image to install the key and performs some package management. To be able to install the key the gnupg package is added to the testimage. Signed-off-by: Ferry Toth Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 3ec30490d09d6639eea2638cf12a323948f221cc) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/apt.py | 38 ++++++++++++++++---- meta/lib/oeqa/selftest/cases/runtime_test.py | 38 ++++++++++++++++++++ 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py index 53745df93f..574a34f148 100644 --- a/meta/lib/oeqa/runtime/cases/apt.py +++ b/meta/lib/oeqa/runtime/cases/apt.py @@ -21,7 +21,7 @@ class AptRepoTest(AptTest): @classmethod def setUpClass(cls): - service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], 'all') + service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], '') cls.repo_server = HTTPService(service_repo, '0.0.0.0', port=cls.tc.target.server_port, logger=cls.tc.logger) @@ -34,20 +34,44 @@ class AptRepoTest(AptTest): def setup_source_config_for_package_install(self): apt_get_source_server = 'http://%s:%s/' % (self.tc.target.server_ip, self.repo_server.port) apt_get_sourceslist_dir = '/etc/apt/' - self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) + self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) + + def setup_source_config_for_package_install_signed(self): + apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port) + apt_get_sourceslist_dir = '/etc/apt/' + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) def cleanup_source_config_for_package_install(self): apt_get_sourceslist_dir = '/etc/apt/' self.target.run('cd %s; rm sources.list' % (apt_get_sourceslist_dir)) + def cleanup_source_config_for_package_install_signed(self): + apt_get_sourceslist_dir = '/etc/apt/' + self.target.run('cd %s; mv sources.list.bak sources.list' % (apt_get_sourceslist_dir)) + + def setup_key(self): + # the key is found on the target /etc/pki/packagefeed-gpg/ + # named PACKAGEFEED-GPG-KEY-poky-branch + self.target.run('cd %s; apt-key add P*' % ('/etc/pki/packagefeed-gpg')) + @skipIfNotFeature('package-management', 'Test requires package-management to be in IMAGE_FEATURES') @skipIfNotDataVar('IMAGE_PKGTYPE', 'deb', 'DEB is not the primary package manager') @OEHasPackage(['apt']) def test_apt_install_from_repo(self): - self.setup_source_config_for_package_install() - self.pkg('update') - self.pkg('remove --yes run-postinsts-dev') - self.pkg('install --yes --allow-unauthenticated run-postinsts-dev') - self.cleanup_source_config_for_package_install() + if not self.tc.td.get('PACKAGE_FEED_GPG_NAME'): + self.setup_source_config_for_package_install() + self.pkg('update') + self.pkg('remove --yes run-postinsts-dev') + self.pkg('install --yes --allow-unauthenticated run-postinsts-dev') + self.cleanup_source_config_for_package_install() + else: + # when we are here a key has been set to sign the package feed and + # public key and gnupg installed on the image by test_testimage_apt + self.setup_source_config_for_package_install_signed() + self.setup_key() + self.pkg('update') + self.pkg('install --yes run-postinsts-dev') + self.pkg('remove --yes run-postinsts-dev') + self.cleanup_source_config_for_package_install_signed() diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 2ad89490fc..3ece617cb0 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -162,6 +162,44 @@ class TestImage(OESelftestTestCase): bitbake('core-image-full-cmdline socat') bitbake('-c testimage core-image-full-cmdline') + def test_testimage_apt(self): + """ + Summary: Check package feeds functionality for apt + Expected: 1. Check that remote package feeds can be accessed + Product: oe-core + Author: Ferry Toth + """ + if get_bb_var('DISTRO') == 'poky-tiny': + self.skipTest('core-image-full-cmdline not buildable for poky-tiny') + + features = 'INHERIT += "testimage"\n' + features += 'TEST_SUITES = "ping ssh apt.AptRepoTest.test_apt_install_from_repo"\n' + # We don't yet know what the server ip and port will be - they will be patched + # in at the start of the on-image test + features += 'PACKAGE_FEED_URIS = "http://bogus_ip:bogus_port"\n' + features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' + features += 'PACKAGE_CLASSES = "package_deb"\n' + # We need gnupg on the target to install keys + features += 'IMAGE_INSTALL:append:pn-core-image-full-cmdline = " gnupg"\n' + + bitbake('gnupg-native -c addto_recipe_sysroot') + + # Enable package feed signing + self.gpg_home = tempfile.mkdtemp(prefix="oeqa-feed-sign-") + self.track_for_cleanup(self.gpg_home) + signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing') + runCmd('gpgconf --list-dirs --homedir %s; gpg -v --batch --homedir %s --import %s' % (self.gpg_home, self.gpg_home, os.path.join(signing_key_dir, 'key.secret')), native_sysroot=get_bb_var("RECIPE_SYSROOT_NATIVE", "gnupg-native"), shell=True) + features += 'INHERIT += "sign_package_feed"\n' + features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' + features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') + features += 'GPG_PATH = "%s"\n' % self.gpg_home + features += 'PSEUDO_IGNORE_PATHS .= ",%s"\n' % self.gpg_home + self.write_config(features) + + # Build core-image-sato and testimage + bitbake('core-image-full-cmdline socat') + bitbake('-c testimage core-image-full-cmdline') + def test_testimage_virgl_gtk_sdl(self): """ Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk and SDL frontends From patchwork Wed Apr 20 14:07:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6910 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 62229C5DF62 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web09.8105.1650463744069468413 for ; Wed, 20 Apr 2022 07:09:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4uOXpsC3; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id r83so1736807pgr.2 for ; Wed, 20 Apr 2022 07:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=tNhZuHULG7JNdHeZE43oB8sIeglsu41fD/fQAZX+qsg=; b=4uOXpsC3OoMC214BdGFDnVuJuEYYu37ug8+Z0Yr/KGl+AJhc2Ezd5RRqAByFzshW0k iDY8gO3nL48nBiaHjuCcV21u8ph782/nmd5WWJ8jhjAx+6loZ1nwQSt4y8ogBj3kJAv+ TBu5ZtfP94P1qjKYr/W5a933ui2o3yu22WpfsdJc8z06V2kAAGQXaRKM4Y2fJlGt1GFj NMc/U/p4YSmO1tgZwHB/cMUYWBEtkh+D3TxIuvUeGh6KYqhPIQj9WDruwqMU0qh+TB2U Cd1KBIzG61M8fstGM0WGPZYzzIa4JDwnGEJFe9FxvRAnEEZPWub5WhgA9YEvmnjJrQqQ DztQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tNhZuHULG7JNdHeZE43oB8sIeglsu41fD/fQAZX+qsg=; b=EzvUNWXz/CfxLrk0L5Xy/okdvOyZSpUW2EAV0gowG4ZEsYwlZgioTPwa4gURHFi3Ee nzOL02ayHWmWrw64cZ66we2qvf6kyTasXt/DtsKlTtfMM1muYn9py6l2iz37nPTpGYly bP4IsXEcJZFoqbRPPmaBr4w3u5oI0WBv5B8fb+KfVKlfIhMkcC01C1D2CVuxPkeCczT7 r/4hsljaEeEU/KPRfkcOt2B41iqzchJhORg4Z6NcmhACvClHul/RMSi0PpaXWoh3cok7 EXCMvGBel+I6MiHjBk/uFNwBoi7JwZI32ADuErM9wUuXWtB/cACiPsvcsoDYoSh33yVl TXdw== X-Gm-Message-State: AOAM531ljngH/awxsVVvkIh3f+4aOlYKQuQU/NN+4NQgFuodpVEZ84PC le8CxNo4IYnxTWZgkLgogV93Z9C37Q31lQVbQXA= X-Google-Smtp-Source: ABdhPJyGMdV5arDGBClalALftQMCjqdWReLevP/SFXPIHqBAsxPtwEZPsuJOJUVVMEW/kCtWeuOkVA== X-Received: by 2002:a65:5acd:0:b0:399:24bc:bbfd with SMTP id d13-20020a655acd000000b0039924bcbbfdmr19510139pgt.323.1650463743185; Wed, 20 Apr 2022 07:09:03 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/27] package_manager: fix missing dependency on gnupg when signing deb package feeds Date: Wed, 20 Apr 2022 04:07:59 -1000 Message-Id: <4163dd61e36d7f9a7c582f912be3a46e2eea64a4.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164679 From: Ferry Toth When signing the deb package feed gpg tools are a soft requirement. If gnupg-native is not declared a dependancy the version from hosttools is used. Unfortunately the gpg-agent version from Ubuntu 16.04 on the autobuilders is incompatible with the package_index task and fails during oe-selftest. Fix by making gnupg-native a dependency. Fixes: 0b4231b5 "package_manager: sign DEB package feeds" Reported-by: Alexandre Belloni Suggested-by: Richard Purdie Signed-off-by: Ferry Toth Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c063b658e30a24be9214abc23cd2a16c0260e93e) Signed-off-by: Steve Sakoman --- meta/classes/sign_package_feed.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/sign_package_feed.bbclass b/meta/classes/sign_package_feed.bbclass index 16bcd147aa..f1504c2225 100644 --- a/meta/classes/sign_package_feed.bbclass +++ b/meta/classes/sign_package_feed.bbclass @@ -27,6 +27,7 @@ inherit sanity PACKAGE_FEED_SIGN = '1' PACKAGE_FEED_GPG_BACKEND ?= 'local' PACKAGE_FEED_GPG_SIGNATURE_TYPE ?= 'ASC' +PACKAGEINDEXDEPS += "gnupg-native:do_populate_sysroot" # Make feed signing key to be present in rootfs FEATURE_PACKAGES_package-management:append = " signing-keys-packagefeed" From patchwork Wed Apr 20 14:08:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6911 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 65BA4C63684 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.8041.1650463746981079332 for ; Wed, 20 Apr 2022 07:09:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QyZRq3F1; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id q19so1718446pgm.6 for ; Wed, 20 Apr 2022 07:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=57D1BwVTmFgEsB3VMNEQIy/t80L9OntW3CsrI6USxR8=; b=QyZRq3F1/q1M+UsisaleSZt4nQCGfXk/VfjcgXLng6f6h9NAYRKQxZTzFDyOUyDJnM O7TsIL4vj5k21pYIpzsjtAT+MegOHbCwS4OG3YB7+IeIkws4JH05DyKq2Z6RGGrtCCHG v3/kYYbJ7qh8qFfpZ5RW+3V9yZZL9PN1z1CyuunI6BC8O52vNhBUyTVfJU61Oxr90Fjj irxjCxMsZETYRgB9M5ik64B10ghFik4/8+xXGVp/sK8QhCbQbsasiKV+5nvQIVic/PXv fLBBZA0zIaOuP8ysLNOlxQLGJsqVjdAhPOhzOZconkGoFzCmplsDqkgqSTuHomnr+9ve tbyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=57D1BwVTmFgEsB3VMNEQIy/t80L9OntW3CsrI6USxR8=; b=YZCXY/5EszBqy3nrp89CSl4K7f+Zahb4pQNAOmNDcwlxgRH+Gt7B8H+bndU7pulgX5 AsT9sgpe10J2iB9Qvu8KY7w5rzYfzFt0lr1z/C1dIUAANr8xfhw0/9q+2qyDmSaTh+L+ ntkUxUWXjyX0gvxHwDxV0oyxjz9lo4fbo5cNJq5DngIgDvxKVA3wG17WYwdCWdAKxSc6 lvN1/uKeAoLWhALkMOU2Uu2q4IJkh3/7q7KtQQ9yaIKE9DIGxwV42e0CVwoKtOPj+zgj bL3nhvxib+sIZGGipOgA3r6wure0woWraIVm4pgclKdUx8wO9BCJ5PeZfuJZCpjZMScv SfPQ== X-Gm-Message-State: AOAM5326Elcjh9m/gCstOUuQi7MrevVOG472YZl6LeIIsnEeNGMttzGZ 4m6Ax0qz4br1ZdIiwzgwq6cgDD51xfCsXUBvoYA= X-Google-Smtp-Source: ABdhPJw0Ih0mES6dmH6Gpkwp6G5S0fln61VHd1ca0I8+yydJFqrMrqF0/oSQMc2Z+gk4tJiozR7txg== X-Received: by 2002:a63:5847:0:b0:399:3452:ffe4 with SMTP id i7-20020a635847000000b003993452ffe4mr19544020pgm.406.1650463746026; Wed, 20 Apr 2022 07:09:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/27] git: correct license Date: Wed, 20 Apr 2022 04:08:00 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164680 From: Konrad Weihmann by default git pulls in several code fragments not being licensed under just GPL-2.0-only. obstack and poll are licensed under GPL-2.0-or-later reftable being BSD-3-Clause sha1dc and inet_ntop being MIT netmalloc being Bosst-1.0 aka BSL-1.0 regex being LGPL-2.1-or-later Signed-off-by: Konrad Weihmann Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 5184e651651ed949d198882a10f406cef5939b7b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.35.2.bb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/git/git_2.35.2.bb b/meta/recipes-devtools/git/git_2.35.2.bb index 9812549221..fe137d94af 100644 --- a/meta/recipes-devtools/git/git_2.35.2.bb +++ b/meta/recipes-devtools/git/git_2.35.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Distributed version control system" HOMEPAGE = "http://git-scm.com" DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." SECTION = "console/utils" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & BSL-1.0 & LGPL-2.1-or-later" DEPENDS = "openssl zlib" PROVIDES:append:class-native = " git-replacement-native" @@ -14,7 +14,16 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ S = "${WORKDIR}/git-${PV}" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1 \ + file://reftable/LICENSE;md5=1a6424cafc4c9c88c689848e165af33b \ + file://sha1dc/LICENSE.txt;md5=9bbe4c990a9e98ea4b98ef5d3bcb8a7a \ + file://compat/nedmalloc/License.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://compat/inet_ntop.c;md5=76593c6f74e8ced5b24520175688d59b;endline=16 \ + file://compat/obstack.h;md5=08ad25fee5428cd879ceef451ce3a22e;endline=18 \ + file://compat/poll/poll.h;md5=9fc00170a53b8e3e52157c91ac688dd1;endline=19 \ + file://compat/regex/regex.h;md5=30cc8af0e6f0f8a25acec6d8783bb763;beginline=4;endline=22 \ +" CVE_PRODUCT = "git-scm:git" From patchwork Wed Apr 20 14:08:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6904 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 68012C63697 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web09.8108.1650463749779980446 for ; Wed, 20 Apr 2022 07:09:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=JAyTNuZS; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id bo5so2040049pfb.4 for ; Wed, 20 Apr 2022 07:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=B3hCMvJQwgLcuQIirN3EgdPymlm3h/+yBusrOLKsnro=; b=JAyTNuZSnphLgGbHh6bKzJDM/guR+k03w6AsTC3AtTtfOZwUzD27McR0jvyC808aMW 1J0+mjN8dkN6e0kn7kIVPvKYB5I90s/BNm4Nr2J/cWHz4jur3nzLgX6KfUrirELem303 Xs2T4ln44uCdcdNKsF8gxmQ9GkGJOFotyTx0UeQxzVzsQdebn1tkNCrd92rXreGmtv0h dbBdSeUYL3zx8TQZPgrDK8sHC2se4EEI6vYY81E0iUnYsQmOvh2M2Ao7PA3366RcBu1i +RxOc9QlLwAWsgYjcbuAeWYAgSj99kZuuemVlJVN84k0eIsoiih6eiceNRWTNpuSZM7B goXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B3hCMvJQwgLcuQIirN3EgdPymlm3h/+yBusrOLKsnro=; b=WRwrVez/GS/q8z0M0d2wFY9+z5+NJCQynuCN6fnHuqCh7lEfCNOGMT1U5SflBjM9w5 tuDA36k8WsVp6Y20XYi9exzM7Zq+1mAhYZPAHbBRR2Oe7ZNJJVqRc7NT0rWRT/TmTaEm iuBlHMe3auL8TZdQBi1Jj6pZaqtZwhcDUamPPNr87TJ7/8+iFWL63dzqgUVf+SuU3G6X m1DdlqMJfkpgRW1KJovBjdpL3yWf3bJUO6OZOHbEtHAk7XhK2xE/FcJRZKJka8giBRjf ogzZfdb52Gyo5fEkZwjOEr42Rgi0V1CFRT16Rg0Gr4fQq241qkzrH9yoYTW5AKYKYTP4 gBMQ== X-Gm-Message-State: AOAM532JOnRdTT2SWnny7bSwTu27ST9vpZkUF/uSrkWbpgjH4qka260V SZ6LE3auzG49b1Y3jJ2lBjLFv5ciEYZe7841kyw= X-Google-Smtp-Source: ABdhPJyWoJhWkf1W7xpP6flL2cJ3CXcccvH42fS2fSDIACyLQpaGJeLAW1Jt9YzLL+rHWKeIKAjMmg== X-Received: by 2002:a63:7c06:0:b0:398:31d5:f759 with SMTP id x6-20020a637c06000000b0039831d5f759mr19593550pgc.513.1650463748850; Wed, 20 Apr 2022 07:09:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/27] ncurses: use COPYING file Date: Wed, 20 Apr 2022 04:08:01 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164681 From: Konrad Weihmann which has the same info as the in-file header used in before Signed-off-by: Konrad Weihmann Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8618589c10f85b7a92de01d93180751a804837ea) Signed-off-by: Steve Sakoman --- meta/recipes-core/ncurses/ncurses.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index a0ecd8a80b..7a7c7dd227 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" +LIC_FILES_CHKSUM = "file://COPYING;md5=9529289636145d1bf093c96af067695a;endline=27" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS:class-native = "" From patchwork Wed Apr 20 14:08:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6905 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 7508EC63686 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web09.8109.1650463752395112178 for ; Wed, 20 Apr 2022 07:09:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=S21QiAaH; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id q1so691173plx.13 for ; Wed, 20 Apr 2022 07:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sRtQqjcCjRPk9RcDoTzzkmTNnWXmqWD+phZLXn/0IQc=; b=S21QiAaHRSIFgcOIv+3ru63Np5MyAGH1ezvtuSJNxvlWHfax2fXWXqGDNuj/mFOj+n RdzVjmv0MkNHHCUAiCBes/wKThF6N60RosTK0tAHZKj0EkSGFOGoksBpt2NTZbwEToRs kMDinZ1kzq8btvV8M3fgvsRyL2vI18ICM7+5Wl8VvpLPQ2hmfoXKdPzfcliT84UQm5Hj oLHZ7q9g7ecEgYuid7x/nBbpoLnj1X7J7Ru7x1j4b6f5vm8xzvgvCrPP48T+0MKHb8c2 gVY3nrth4h3szjzjORi9Uxr/BuB2t9s70xDqzdxvCV+X6CmX9AU2GhBuwAqMEKvkHi9f o6dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sRtQqjcCjRPk9RcDoTzzkmTNnWXmqWD+phZLXn/0IQc=; b=fQn4+JFQdsLrTTrQIeaWJwX37cQhlYKK1sFMSbZZhZQ4dMWcv/1P0+plivmUNerxRq tOkj7brz8fvgkJrB92scDNqtGqzmf7Ese1O2gDjWaTaIPiwx6f9ml9dfcT9P8WimROvL +2fRKg8XHr+nVx46tUcuWqU0NjXXgVhbHZs/HuyZMbQ8AqkHVxoFkqzflwr4Ba+Nidfm +er4aO+N5YCvjD52MhgtL01oaB7RWQLKpnEaJXHtQTdI6ehvu3kwSHi+xpKp22yrp7fQ r1/IIc7S9gskIywCwI3cE9//QpLyOJyn4LMQkQ/zJh1THG3GABJDYOCvgSAaMjSo1S/Y THWA== X-Gm-Message-State: AOAM533DCwp++OFLm/imBZ6NS236qITJHeIZTZv1bnGho/RS2/Ky29n+ F3t+dQnLX/eP5NPWOuHhm/KxwIwRCT9u0enlWis= X-Google-Smtp-Source: ABdhPJxTST++lENtMXYlqh5kmwvLdVhDl8MgxJumR0H6JcCpkZ2JXjNvHcpnGg+iSLMBDh/7U74oRg== X-Received: by 2002:a17:90a:3d02:b0:1ca:7f92:1bf1 with SMTP id h2-20020a17090a3d0200b001ca7f921bf1mr4702656pjc.177.1650463751503; Wed, 20 Apr 2022 07:09:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/27] webkitgtk: adjust patch status Date: Wed, 20 Apr 2022 04:08:02 -1000 Message-Id: <14b13673c40884d6b84bb53c006b0ee01f896051.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164682 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e43558d5357aadf08521e7fb6170ad0bfd69f3f3) Signed-off-by: Steve Sakoman --- ...indGObjectIntrospection.cmake-prefix-variables-obta.patch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch index bccf74d9c9..2379924cc9 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -4,7 +4,10 @@ Date: Tue, 27 Oct 2015 16:02:19 +0200 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained from pkg-config with PKG_CONFIG_SYSROOT_DIR -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232933] +See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for +reasons why this is not approproiate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- From patchwork Wed Apr 20 14:08:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6920 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 79A95C63682 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web08.8223.1650463755412893270 for ; Wed, 20 Apr 2022 07:09:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=sRCaldGv; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id bg9so1710724pgb.9 for ; Wed, 20 Apr 2022 07:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=SsX4v0aYyOhJ3TrPP5/tUWFpDmwkq7CfsHJ8kH///B8=; b=sRCaldGvYlfbiusgL/0WmNl+uHaA+OQbcZ3CurqhRGhsVBSyUJRsDiZIBXt1P2RFEf oR8oIipo7yVINYvQI2wu97YbfpWs2zFc7LXwo5LZ/FpSg/1KUxsTg7i4wRSjGZPiv/Ki XrftpbiMcri7ghZfx67sTq93DBEnqmyLNmS77UQkAoaUJjdtFps8grEbcrlEe8zZHaDo 8352mhJJlO28YnZkhewfPc120ppwI+emw4QakgDcW4msE/9L5QSNpDSeEF8b5+jDSedY cIel0TO8qr5pSR8n9CcZJIbPDQ16WE/v0MLfw7hgHdxZQDieYZc2N5eLzNy1lK8ElpaQ pRHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SsX4v0aYyOhJ3TrPP5/tUWFpDmwkq7CfsHJ8kH///B8=; b=cwxMV6vU57csviFLBNK7WNk6oLwudYqfZoh2VBKkuxH+9v6V5p6MHKxwBQbcGvo4zD 724JLmZ9hHHwPMLPUWA11MAovnCxBov/tgJeK1g5fri8TxH8CjopHJFYYlOZ3IzEvsfs PzAA6z7NaOeulYX3/YmH5GQLpNUQvETrpjlGlhntjZJVQ4w/QS0bKB/DTiIonXR+Bs5r UnZxZdE1LvqysWaaVlV/udrfmp8hS0wFBgn+CtJ8zNPaNs23zudMTqsRGEuv4btCNe6U NgCk9XFSUQZffyF0qPDxJtH8ExnPN2nKRU9bZXVHPjhP46eelbc4vxkhw9IP/sI25xsb 2uyg== X-Gm-Message-State: AOAM532FeYto+3FQ+7W9RIX5EXNRwDpTb4UPK80WS/JpqXR+kp4eJ0Sl m8B5gQNxXVEXFGklv5z/JSLi8KDBc+kXbWYzuyE= X-Google-Smtp-Source: ABdhPJwZgOdecW4rXq1HEyNpClm8SxTLZb066XBuNeuWnmMZECEkKr++eMV58LZaYwHep9hBDst/yw== X-Received: by 2002:a65:4c4e:0:b0:39d:21c4:2381 with SMTP id l14-20020a654c4e000000b0039d21c42381mr19585641pgr.566.1650463754270; Wed, 20 Apr 2022 07:09:14 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/27] create-spdx: fix error when symlink cannot be created Date: Wed, 20 Apr 2022 04:08:03 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164683 From: Davide Gardenal If IMAGE_NAME and IMAGE_LINK_NAME are the same an exception is raised in image_combine_spdx because it cannot create a symlink with the same exact path of the original file. In that case there is no point in creating a link in the first place. Refactor image_combine_spdx to avoid code duplication Signed-off-by: Davide Gardenal Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 88f76bba705007a7fcda506c79f743060d8f2e52) Signed-off-by: Steve Sakoman --- meta/classes/create-spdx.bbclass | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 137db81a5b..47a8764bf0 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -835,16 +835,14 @@ python image_combine_spdx() { combine_spdx(d, image_name, imgdeploydir, img_spdxid, packages) - if image_link_name: - image_spdx_path = imgdeploydir / (image_name + ".spdx.json") - image_spdx_link = imgdeploydir / (image_link_name + ".spdx.json") - image_spdx_link.symlink_to(os.path.relpath(image_spdx_path, image_spdx_link.parent)) - def make_image_link(target_path, suffix): if image_link_name: link = imgdeploydir / (image_link_name + suffix) - link.symlink_to(os.path.relpath(target_path, link.parent)) + if link != target_path: + link.symlink_to(os.path.relpath(target_path, link.parent)) + image_spdx_path = imgdeploydir / (image_name + ".spdx.json") + make_image_link(image_spdx_path, ".spdx.json") spdx_tar_path = imgdeploydir / (image_name + ".spdx.tar.zst") make_image_link(spdx_tar_path, ".spdx.tar.zst") spdx_index_path = imgdeploydir / (image_name + ".spdx.index.json") From patchwork Wed Apr 20 14:08:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6903 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 79C80C636C8 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web08.8224.1650463758351154223 for ; Wed, 20 Apr 2022 07:09:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=J8VXqcDC; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id v12so1869942plv.4 for ; Wed, 20 Apr 2022 07:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8oSkE0eEbl2BxBCX5uk8tjTNqkTehLPmU+nDqCulut8=; b=J8VXqcDC7X39fa6MLXsyk1u1w7AzKfXztMWpk62tdET7PV5lBVVAl/PMp5nimgrxh8 gDPbvJhKpF2iYiPsbeUCRNDuyU67ZmM7V83f5W8NlEU7DZCV3UQq70sYqS4Xcxp71EoO BVAGm/HByrxTkEOMM7rT/S2ZfytZIM+CG28gkyYo8AYx4kp68yB3Rg1cfssT/XfC0t32 PuFRRh1Up4+Liwswy6UhUWY4tkzm/cOOaYW2pS3umrhc3L6IBFJ1vLjUbacZOwzlgvD8 hMTvbmpDRwitLLmX8VHIMiJwGlVFTuTRAl6W2/xTLP24BTT7I8ch9Ax1EX4G332kn3KR vEfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8oSkE0eEbl2BxBCX5uk8tjTNqkTehLPmU+nDqCulut8=; b=BOzOlsRDJ6NFKRqTVZ1d56CbZ6b8mwuED6E1Dhhx7h8gOAL8h2b20NNj5ddnRoWWLS +9YWSjOc67oP/ZpxNaOZW+MHRaGad3NsZ7XtnJAwAOoJqwDEVJXHc3l/lQEzzXEJC9jf Gq+6h7UWnKul3Xb9N3kV4OKxnM3oY7ZiWaMTYhczQ6xxtQQkVnZVay63sx0MEsuPlY6p vdqICsrPtYS6l6D2KEFl/k73GHA5v5gbZX+VLKrKenXF+P2k1ntEt6jDvRTLWOGBM2fl xATK9U6YE+27TUuMlkJx6+yRTT8GVoGxJENjUes6IvFNxQAEfOEOh4W3NOTOoxLXX8hR 71fA== X-Gm-Message-State: AOAM532BATSvok7KV/IncXaAIc0+YKD5GPrtQACostKi+FCeiTPRB31k Rf3/LkIWjRu205Kf6EElxUMHMWYb3dqg+aWv5+0= X-Google-Smtp-Source: ABdhPJwIimsuxNiwQF0qaENThPhjw7PmxCCzf+1U9LAEYE1pIbEbfNmyMitBy2niWkxH4DCk/MMLNw== X-Received: by 2002:a17:902:854c:b0:159:a70:deca with SMTP id d12-20020a170902854c00b001590a70decamr11520152plo.142.1650463757211; Wed, 20 Apr 2022 07:09:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/27] u-boot: Correct the SRC_URI Date: Wed, 20 Apr 2022 04:08:04 -1000 Message-Id: <2233e83da4fab1d6d34517f6ebf5860f4fd5b2a1.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164684 From: Peter Kjellerstedt This avoids a redirect. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 879bc5098943cf6977c32555ac31cb21be7b46ae) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/u-boot/u-boot-common.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 8e78ea4a75..488b923737 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -14,8 +14,7 @@ PE = "1" # repo during parse SRCREV = "d637294e264adfeb29f390dfc393106fd4d41b17" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - " +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" S = "${WORKDIR}/git" B = "${WORKDIR}/build" From patchwork Wed Apr 20 14:08:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6906 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 800C1C6369B for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web09.8110.1650463761109420334 for ; Wed, 20 Apr 2022 07:09:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RcBhkopm; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id j8-20020a17090a060800b001cd4fb60dccso2142437pjj.2 for ; Wed, 20 Apr 2022 07:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t1OWUsvW2VXUFLIa8kmXgv7r/FJJm81kZPCsNQ6HM+4=; b=RcBhkopmXKFcv0In7Y59nOKDZfvK8HsUAaATLdCPC45EMzxTZu6mFuW4a26j7a5eFn PmHRDf0Bex5VLo9h2iV9G5K8doa/VCK3v/a3q1ZYOBGwmxovDBXkEK79FaGbXEVT6nv0 BCzATgGvBWWDRzbov11agPF3nLLkztW91Dq/BLXOLZvR2dXRqxPtR7BHPVByGkkdq7qU MdM6IaC1tMN4A/rKt/n2rHnq60witgvzrIRc6k7s4oEr+eJMogJVh00HgytBT2hyGn48 Aaga/l6qroDiUKoqrv72+A2iqoiGaJrZcF2DbwkrWKuP8Z4HyI+km1/xS5lHQyYpf0Wi byxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t1OWUsvW2VXUFLIa8kmXgv7r/FJJm81kZPCsNQ6HM+4=; b=ZCdo+4hqAufRzlgdR4q8tqOG6F652vAxcn7IxgHFMN/JGbMkhlbgavuzz9rFRutAH2 aP/cZXFnF4ozJ6l5SsBSRufowHPQCofZ3Bv5/G+i4PJxfkg5cCtkawg1ifUKbPtK0ZsU z95T5J9ZbnvGADtpjrNEAVERKCc0o9u+urE+WYm7arCRGKkDUTCfOE9uGrTRsc5YJ5iZ q3hCg/EdqxBl1anhIVjI3OgojGUl1V/jiShberzEGglLYnkIq+V387+ujf1yymSn00TG 2fzkV2eYRxlZfMA/OYEXZXT+swnufafKFCVW/BVaqie6UqVyetfCe6mdOh8oiJHq+MkB thVA== X-Gm-Message-State: AOAM533vtgDJ4tRIrb03TmnkEl8nxwI5finxuugLY3X3twE2/VtW3Gg6 zzMdGdcOszkRqhGngDsolQ8ynli5DEZGdYf/Mlc= X-Google-Smtp-Source: ABdhPJy+shXWIx9p/2f3wqOg7G5zSdLk6Kf2HWT6lUJplGAwNF1Fc8cRjjkLzaUMvIo/7idbyow0WQ== X-Received: by 2002:a17:902:c104:b0:158:8b31:781b with SMTP id 4-20020a170902c10400b001588b31781bmr21072624pli.67.1650463760183; Wed, 20 Apr 2022 07:09:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/27] u-boot: Inherit pkgconfig Date: Wed, 20 Apr 2022 04:08:05 -1000 Message-Id: <969ef8800e13ffe78c88f2fdc26dec76d52d75df.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164685 From: Peter Kjellerstedt pkg-config is used by the Makefiles, and thus pkgconfig needs to be inherited. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 6148ac9bc5d3e0d0ffdbbd6695acd96ca1836b78) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/u-boot/u-boot-common.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 488b923737..d366f10398 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -18,4 +18,7 @@ SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" S = "${WORKDIR}/git" B = "${WORKDIR}/build" + +inherit pkgconfig + do_configure[cleandirs] = "${B}" From patchwork Wed Apr 20 14:08:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6909 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 84C96C636D5 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web09.8112.1650463764042431048 for ; Wed, 20 Apr 2022 07:09:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=dntRUd7u; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id p8so2021936pfh.8 for ; Wed, 20 Apr 2022 07:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vaZ0n1XyuoblimYdE2YOVBPX73nzPQP3pTU/zuxZDAk=; b=dntRUd7udAqiDEJyUWlyzLbgZyS0KD2hSwA+dkO5NPXgHAMTZi7ruqwD9SnjSO24Bl QI/2UEVarYXUH/FCLGmQAvqsEOaSllIRrrzRHQzXRgQz+mLhNfy8UhZ24m1CtzLk8fcT Gt3EZsqpCZNauBt7n7qu2rNb+h3s9fH4G+noJSBh8zafRb70IAuAg8Zkxc1ep4mngc6P SYZ03PU/5dfX8R0FhVJ7qx3PZ2VcN53AcwQj5hIrrwhPXbN+i63C9bmAwU76b16TbE8H jIKlUlAAiRe7l0PW6tJhKi3Eo/ifZXirLcfFGXVdAnJ7WhZmTNX0GYhm4r8UrFo+Cc/e UW5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vaZ0n1XyuoblimYdE2YOVBPX73nzPQP3pTU/zuxZDAk=; b=NV98R3Wpv74lpyGqsVO2GEFC3C80MbuIRMokTZAXwuv2T/xMg1WOscyQWUHXHRIfr6 TYMg9nf++Nh8yLWHoEvaXA8clc1G00wC4PvIQE3JlKoUSW1ugtqjfOC42RerKCDQ9Bx8 /KI3Gzd91iNQUXDg0wzbiiaCNRUU7/+ZVPpVskeKKShOZKpNkW9tGK7QYS5TLi/lmdZo dJ3egOv2DrvBjIaJVxr7BRnH6SO7NPDnwyj0D3tKXHh2tXXp6ll8puaAONC0ZIpKwI9a J1CrFS9bhoxNKY4PEthsHdrnVT853olabPdPuzo8MnzkiOJ++ff4KQTQadFdefzrq5+J UAkw== X-Gm-Message-State: AOAM531UgR0S+OM+58dsbtTh3WbdJ7/cNe+frisbta4QqOj2KwtHUn3S N1N36Z0SyZ8/JtpqJFAjMDRFEACKcJxASyeUbtY= X-Google-Smtp-Source: ABdhPJxCT5hYArdX3SQQXBIpq/HsRgzS0Vf2FVCJ3etYAr26ihAm2KpT3s5YEKb0nD2deRVHAj7+Rg== X-Received: by 2002:a05:6a00:c8d:b0:50a:62e5:6d30 with SMTP id a13-20020a056a000c8d00b0050a62e56d30mr19704031pfv.47.1650463763059; Wed, 20 Apr 2022 07:09:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/27] update_udev_hwdb: fix multilib issue with systemd Date: Wed, 20 Apr 2022 04:08:06 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164686 From: Kai Kang It duplicates udevadm in systemd recipe to make it could run update_udev_hwdb with multilib enabled. Since systemd last update, it deploys a shared library libsystemd-shared-250.so in /lib/systemd/. The library will be overwritten when multilib enabled. Then if both udev-hwdb and lib32-udev-hwdb are installed, it fails to run the multilib version postinstall intercept update_udev_hwdb: | /path/to/build/tmp-glibc/work/intel_x86_64-wrs-linux/wrlinux-image-small/1.0-r1/rootfs/usr/libexec/lib32-udevadm: error while loading shared libraries: libsystemd-shared-250.so: wrong ELF class: ELFCLASS64 `udevadm hwdb --update` just concatenates .hwdb files in dirs /etc/udev/hwdb.d and /lib/udev/hwdb.d. The output file hwdb.bin is identical with the one created by lib32-udevadm. So do NOT duplicate lib32-udevadm in systemd and eudev. And update intercept script update_udev_hwdb that re-run udevadm with same arch qemuwrapper if run ${binprefix}qemuwrapper failed. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit 3dba872a42c2be7d0865a30118984ab013850292) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd_250.4.bb | 5 ----- meta/recipes-core/udev/eudev_3.2.10.bb | 4 ---- scripts/postinst-intercepts/update_udev_hwdb | 5 ++++- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_250.4.bb b/meta/recipes-core/systemd/systemd_250.4.bb index 2b346113b5..15e2185dff 100644 --- a/meta/recipes-core/systemd/systemd_250.4.bb +++ b/meta/recipes-core/systemd/systemd_250.4.bb @@ -337,10 +337,6 @@ do_install() { # create link for existing udev rules ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm - # duplicate udevadm for postinst script - install -d ${D}${libexecdir} - ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm - # install default policy for presets # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset @@ -718,7 +714,6 @@ FILES:udev += "${base_sbindir}/udevd \ ${base_bindir}/systemd-hwdb \ ${base_bindir}/udevadm \ ${base_sbindir}/udevadm \ - ${libexecdir}/${MLPREFIX}udevadm \ ${datadir}/bash-completion/completions/udevadm \ ${systemd_system_unitdir}/systemd-hwdb-update.service \ " diff --git a/meta/recipes-core/udev/eudev_3.2.10.bb b/meta/recipes-core/udev/eudev_3.2.10.bb index dec16be046..ccc66ae131 100644 --- a/meta/recipes-core/udev/eudev_3.2.10.bb +++ b/meta/recipes-core/udev/eudev_3.2.10.bb @@ -51,10 +51,6 @@ do_install:append() { # hid2hci has moved to bluez4. removed in udev as of version 169 rm -f ${D}${base_libdir}/udev/hid2hci - - # duplicate udevadm for postinst script - install -d ${D}${libexecdir} - ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm } do_install:prepend:class-target () { diff --git a/scripts/postinst-intercepts/update_udev_hwdb b/scripts/postinst-intercepts/update_udev_hwdb index 8076b8ae6f..8b3f5de791 100644 --- a/scripts/postinst-intercepts/update_udev_hwdb +++ b/scripts/postinst-intercepts/update_udev_hwdb @@ -9,14 +9,17 @@ case "${PREFERRED_PROVIDER_udev}" in systemd) UDEV_EXTRA_ARGS="--usr" UDEVLIBDIR="${rootlibexecdir}" + UDEVADM="${base_bindir}/udevadm" ;; *) UDEV_EXTRA_ARGS="" UDEVLIBDIR="${sysconfdir}" + UDEVADM="${bindir}/udevadm" ;; esac rm -f $D${UDEVLIBDIR}/udev/hwdb.bin -PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}udevadm hwdb --update --root $D ${UDEV_EXTRA_ARGS} +PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D ${UDEV_EXTRA_ARGS} || + PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D ${UDEV_EXTRA_ARGS} chown root:root $D${UDEVLIBDIR}/udev/hwdb.bin From patchwork Wed Apr 20 14:08:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6907 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 84B8BC636C9 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web10.8049.1650463766782047457 for ; Wed, 20 Apr 2022 07:09:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7upek8/A; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id h5so1718001pgc.7 for ; Wed, 20 Apr 2022 07:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rqHTrAov0iKRsoEU/FZRGmoPGbzFyQe5FQx+tOzcA0E=; b=7upek8/AyOSz/4tC7vIG6q/6s+eLW4TvACk+gwDlhhnAOEF9WQ0F3rPhtDn79DSfNn A4tsczJzEXGtLSK4Es33tIOTaIzmZYcN3FIHVmKKSL8ON7ChqXp5YLl+3W+lSLA/EwB1 AaVkocMfY7ovhmTrZLhxpC+9vP7XygU4kltU8zCX4LigxxZrC0ytoOeZsMmYY7eIz4SK eUXNRMKUghosJH11arutd2Rl3Q86Rv/7Tt2D/T9cMzGiniZQyDLCMAITyM4/pFzItJAR 3q5Cn/krpYyx4Dz2lHa4XuL/QAm4tznYT/9lYO8dJ67ky0oxuvUbfAHacfciX+39i8eV Si1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rqHTrAov0iKRsoEU/FZRGmoPGbzFyQe5FQx+tOzcA0E=; b=hyN3e3Az5a4ebJPTdtCu6aCSI9QB29hcVvtVKtd5wYNTDGfJ5XiZVWWBpc/VjYhv5x mYudYRqPBBPnj8C0RVX450xK7K5atuAJJ6Zz4Wply3DAUjCR3nhorC+q6zc8Ygmc33e/ eOwKTIMYyt5Poq3XmbnPE5Xh65IcWUyeEAc8sZ8IEm4W9Tj6orgtzgJEDkg/kp8Rhefk RpG1gQmBaZ1HyjU5dLDKOhfjT4SxKv9jf1SMotbSmrKMg/s1uNO3iRyoP4QPtC+5xNYX MPGuQGefHO0nlgvWUFFkGbwfIDQjSM4iQY8pOX4Tj81mY6ij1uJQrDH5nnWEYVZC65Gx sWqg== X-Gm-Message-State: AOAM533u52132N9McHslE7BKPnJyBh4DEse9rAicy1bu1hrlR3xatM7Y ilml0y2qfO4zfhGqao63PjM9C0lrMNZW0y8uY2k= X-Google-Smtp-Source: ABdhPJwp3wd70dL8P4if5rmKPH3Jv3lubcEEgWtp0DEZSppA4m/G7Nk4J41NE9gHjWplFCSM7vh1RQ== X-Received: by 2002:a05:6a00:cd0:b0:50a:64d0:b90b with SMTP id b16-20020a056a000cd000b0050a64d0b90bmr19246898pfv.59.1650463765835; Wed, 20 Apr 2022 07:09:25 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/27] linux-firmware: upgrade 20220310 -> 20220411 Date: Wed, 20 Apr 2022 04:08:07 -1000 Message-Id: <4d7fc7ea9cf3ba8f29c197646c59eeefc0554883.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164687 From: wangmy License-Update: Version of driver files updated Added files for some drivers Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 01684df3a51be476081ee21eb54c24fef00acb3f) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20220310.bb => linux-firmware_20220411.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220310.bb => linux-firmware_20220411.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220310.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20220310.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb index fa0f906db0..c7d9e1126e 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220310.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb @@ -132,7 +132,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=45a9c4a92d152e9495db81e1192f2bdc \ + file://WHENCE;md5=4cf67d71a21887c682c3989a4318745e \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182" +SRC_URI[sha256sum] = "020b11f6412f4956f5a6f98de7d41867d2b30ea0ce81b1e2d206ec9840363849" inherit allarch From patchwork Wed Apr 20 14:08:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6915 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 8BEAFC636D9 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web08.8225.1650463769539512779 for ; Wed, 20 Apr 2022 07:09:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mSD6j3dm; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id z6-20020a17090a398600b001cb9fca3210so2149618pjb.1 for ; Wed, 20 Apr 2022 07:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Y0M/n48XUivNcHHq+vJ1n3QT0GZflxsF6YfPJT3aNzQ=; b=mSD6j3dmAP5BmcLZYAWTLfKBTJA9Spobrj2LIfpU7eDUstAv2YeRCaq3dG3YYvfY/v MAM2/XFlbrZtBjgIbs1s6JmTjlzBtljyloiFFNDwjMjzTxRpt6qQiykLM/7w8uiTppj3 03oblkvuhmP1NWVatXSCOR4Ydpix6Pe6wRWoo6K82H8vI2WBKcDJC6320q7RS3dWnzMV ek6j3nZGMxCn8iruaABFgzitG6PWfzdo2a00cx3IvYd5CXlUhYtQwKamPlozy3f7DLbF ybqUEqARS+l/Y/r7uotVwmgi3EiXLb6KV3kCjpUgmktNcXyJH12i7nWSYZYqwW6FiObT rqqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y0M/n48XUivNcHHq+vJ1n3QT0GZflxsF6YfPJT3aNzQ=; b=rwrH1GDdgSMtHPv0soky0DRLf4V5dGVuvRNvljSJii0mf5Aks8xNB1yoE6Q3QX8A5H TR8iBXNr5cMWYB7Fx9YQk+o+2/Xj1corQmkvk0kHDAPX6Fhl8sAFuc5v/aRJbM0Rwblk 6ZflYDrq6vTV8MEJxQ5x7xZTHxBa6ZVMjUbADPktVsQ6qPwa3OulIVP+ErQWY3bUypqn yKVCgIYq60wdUiNG7RCrMzUgSS8WVcZo2Oqllpyjrr4FB9w5jOqlJ6mO6X4FZP8oMoTN ImO6BCyl6phtlGhXEmtaC/KnAGunFhfciV2jBnaWgm6Au9c0SVehRqOhk5inDMGkIzlU fGGQ== X-Gm-Message-State: AOAM53357mzbiOTSrciCaI97lYuz669ud1e0f5uavbMnqE6cxC38MZir Kw1g6SwFVBAoYvetU4LWVD/MRvYV7b99UvEq0WA= X-Google-Smtp-Source: ABdhPJziRI/QbjkgCIPznKCPfAbXINeaxjv85IUakaQZeX92dDarvBhe9T5AtB4iPmulyMsUB8X6LA== X-Received: by 2002:a17:902:cf0a:b0:156:39c9:4c44 with SMTP id i10-20020a170902cf0a00b0015639c94c44mr20740896plg.124.1650463768512; Wed, 20 Apr 2022 07:09:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/27] wireless-regdb: upgrade 2022.02.18 -> 2022.04.08 Date: Wed, 20 Apr 2022 04:08:08 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164688 From: zhengruoqin Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie (cherry picked from commit c6ea7450a919f2b571746e7af350c1362e41f8e1) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2022.02.18.bb => wireless-regdb_2022.04.08.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.02.18.bb => wireless-regdb_2022.04.08.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb index 801a6f0584..cd42039680 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f" +SRC_URI[sha256sum] = "884ba2e3c1e8b98762b6dc25ff60b5ec75c8d33a39e019b3ed4aa615491460d3" inherit bin_package allarch From patchwork Wed Apr 20 14:08:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6914 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 9A745C636CF for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.8051.1650463772794502649 for ; Wed, 20 Apr 2022 07:09:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1LwPJJRP; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id k14so1757888pga.0 for ; Wed, 20 Apr 2022 07:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=prmqBsO0AhCu/fQEYlL2TH8E4SfNdzFVRcdxOnsdFic=; b=1LwPJJRPUPry+XzGsrSlAfWK8sb9k8SYaOUfbc+K7dfw5X6sPr+y+Jc7/WccdLf0mB O0ciPKaPtnWJbv0BWYkRHtnvijFz4ZTv++3IaEFF7DBRO/0yMbKq/7xue9nXBB4blIqM K3Tisx9j0dUU8DoEPJ4dMxnMyLBEPhPcRgreTayBL6XVpIODZVunQzlE7Y1E1RVp8zu6 9KztqRo541Y2XpUqYxKFw+Wul0QRn4XClCz04S1xO5QJqPGg9jf+sEwjJ2pMYRCApKJ0 m0OEFmPnW6yXSoUA7P4NciAc4fT5lvOIqqUeZaQP6jl6w4DjqQiUmBuDykfYM+Xu1dBn w02A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=prmqBsO0AhCu/fQEYlL2TH8E4SfNdzFVRcdxOnsdFic=; b=l3uSvdZW0a1MX510gIyLQIL0FndLNPoZaR3rdz+E1ZhMKtkH8cVczE0+yMytLYWdmb k7tCyl5zkaUamKV2UWZsi/2nxIzoF2BL8xSrgDAvCHsuhmHKZYic+s5MpTRMeQcI7cyG uEtLrrxwUxAu8E23MskqogUGqojXHH/PC/ZxC6jpAwfw7xNM8g+sOg+9PmHH5Cf6IyU9 4vp/WqNimaGdHaltsnV0EkwwtgRZqc+Ww+GdZ9pmmxiSp73NVfeqplHTxbGfO4pdUcEe DPIWm1ANt1xbBWezWRPPcfx95Rgc3kRy9GJ+ADqxj/lAMw8chO4WzD4gW+VNyLEwosw/ IF/w== X-Gm-Message-State: AOAM533Z+69JoVdH2kC3bPk8jNKb7siGAsRbAZwfmkFEA+SQfv7z9oBy x1JaZxBIHEOhKnGC0vCgmX4xw5WzH/3KC+brLdE= X-Google-Smtp-Source: ABdhPJzKYbEJoyuhSsuevVP4maPsHywTClnmiv9/gTkW7MEjKp4RiLUDcz9FPg6279r7sL+NPLMBZQ== X-Received: by 2002:a63:a804:0:b0:398:e7d7:29ab with SMTP id o4-20020a63a804000000b00398e7d729abmr18955763pgf.138.1650463771734; Wed, 20 Apr 2022 07:09:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/27] zlib: upgrade to 1.2.12 Date: Wed, 20 Apr 2022 04:08:09 -1000 Message-Id: <2fae9bc71734dc42b4a9b2551653e518e3ed04ba.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164689 From: Ross Burton First upstream release since 2017! - Fix a deflate bug when using the Z_FIXED strategy that can result in out-of-bound accesses. - Fix a deflate bug when the window is full in deflate_stored(). - Speed up CRC-32 computations by a factor of 1.5 to 3. - Use the hardware CRC-32 instruction on ARMv8 processors. - Speed up crc32_combine() with powers of x tables. - Add crc32_combine_gen() and crc32_combine_op() for fast combines. Drop CVE-2018-25032 as this is in the .12 release. Rebase 0001-configure-Pass-LDFLAGS-to-link-tests.patch to apply cleanly. Backport cc.patch to fix compilation with our CC. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 4055d9fc81661d375c1721ffd502536c1ba74e02) Signed-off-by: Steve Sakoman --- ...configure-Pass-LDFLAGS-to-link-tests.patch | 25 +- .../zlib/zlib/CVE-2018-25032.patch | 347 ------------------ meta/recipes-core/zlib/zlib/cc.patch | 27 ++ .../zlib/{zlib_1.2.11.bb => zlib_1.2.12.bb} | 7 +- 4 files changed, 43 insertions(+), 363 deletions(-) delete mode 100644 meta/recipes-core/zlib/zlib/CVE-2018-25032.patch create mode 100644 meta/recipes-core/zlib/zlib/cc.patch rename meta/recipes-core/zlib/{zlib_1.2.11.bb => zlib_1.2.12.bb} (83%) diff --git a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch index 91a1b4a09a..e6cc915ba5 100644 --- a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch +++ b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch @@ -1,4 +1,7 @@ -From 001971eef84485562f912d8edd4fc7688acfad91 Mon Sep 17 00:00:00 2001 +Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599] +Signed-off-by: Ross Burton + +From f15584918a7fbbe3cc794ad59100e5e8153ea9f6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Mar 2022 22:38:47 -0800 Subject: [PATCH] configure: Pass LDFLAGS to link tests @@ -9,18 +12,16 @@ using LDFLAGS on compiler commandline along with CFLAGS to ensure the tests perform correctly. Without this some tests may fail resulting in wrong confgure result, ending in miscompiling the package -Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599] - Signed-off-by: Khem Raj --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index e974d1f..69dfa3f 100755 +index 52ff4a0..d04ee59 100755 --- a/configure +++ b/configure -@@ -410,7 +410,7 @@ if test $shared -eq 1; then +@@ -427,7 +427,7 @@ if test $shared -eq 1; then echo Checking for shared library support... | tee -a configure.log # we must test in two steps (cc then ld), required at least on SunOS 4.x if try $CC -w -c $SFLAGS $test.c && @@ -29,7 +30,7 @@ index e974d1f..69dfa3f 100755 echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log elif test -z "$old_cc" -a -z "$old_cflags"; then echo No shared library support. | tee -a configure.log -@@ -492,7 +492,7 @@ int main(void) { +@@ -503,7 +503,7 @@ int main(void) { } EOF fi @@ -37,8 +38,8 @@ index e974d1f..69dfa3f 100755 + if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then sizet=`./$test` echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log - else -@@ -530,7 +530,7 @@ int main(void) { + CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" +@@ -537,7 +537,7 @@ int main(void) { return 0; } EOF @@ -47,7 +48,7 @@ index e974d1f..69dfa3f 100755 echo "Checking for fseeko... Yes." | tee -a configure.log else CFLAGS="${CFLAGS} -DNO_FSEEKO" -@@ -547,7 +547,7 @@ cat > $test.c < $test.c < int main() { return strlen(strerror(errno)); } EOF @@ -56,7 +57,7 @@ index e974d1f..69dfa3f 100755 echo "Checking for strerror... Yes." | tee -a configure.log else CFLAGS="${CFLAGS} -DNO_STRERROR" -@@ -654,7 +654,7 @@ int main() +@@ -661,7 +661,7 @@ int main() return (mytest("Hello%d\n", 1)); } EOF @@ -65,7 +66,7 @@ index e974d1f..69dfa3f 100755 echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log echo >> configure.log -@@ -744,7 +744,7 @@ int main() +@@ -751,7 +751,7 @@ int main() } EOF @@ -75,5 +76,5 @@ index e974d1f..69dfa3f 100755 echo >> configure.log -- -2.35.1 +2.25.1 diff --git a/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch b/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch deleted file mode 100644 index 5cb6183641..0000000000 --- a/meta/recipes-core/zlib/zlib/CVE-2018-25032.patch +++ /dev/null @@ -1,347 +0,0 @@ -CVE: CVE-2018-25032 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 -From: Mark Adler -Date: Tue, 17 Apr 2018 22:09:22 -0700 -Subject: [PATCH] Fix a bug that can crash deflate on some input when using - Z_FIXED. - -This bug was reported by Danilo Ramos of Eideticom, Inc. It has -lain in wait 13 years before being found! The bug was introduced -in zlib 1.2.2.2, with the addition of the Z_FIXED option. That -option forces the use of fixed Huffman codes. For rare inputs with -a large number of distant matches, the pending buffer into which -the compressed data is written can overwrite the distance symbol -table which it overlays. That results in corrupted output due to -invalid distances, and can result in out-of-bound accesses, -crashing the application. - -The fix here combines the distance buffer and literal/length -buffers into a single symbol buffer. Now three bytes of pending -buffer space are opened up for each literal or length/distance -pair consumed, instead of the previous two bytes. This assures -that the pending buffer cannot overwrite the symbol table, since -the maximum fixed code compressed length/distance is 31 bits, and -since there are four bytes of pending space for every three bytes -of symbol space. ---- - deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- - deflate.h | 25 +++++++++---------- - trees.c | 50 +++++++++++-------------------------- - 3 files changed, 79 insertions(+), 70 deletions(-) - -diff --git a/deflate.c b/deflate.c -index 425babc00..19cba873a 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - int wrap = 1; - static const char my_version[] = ZLIB_VERSION; - -- ushf *overlay; -- /* We overlay pending_buf and d_buf+l_buf. This works since the average -- * output size for (length,distance) codes is <= 24 bits. -- */ -- - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; -@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - - s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ - -- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); -- s->pending_buf = (uchf *) overlay; -- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); -+ /* We overlay pending_buf and sym_buf. This works since the average size -+ * for length/distance pairs over any compressed block is assured to be 31 -+ * bits or less. -+ * -+ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 -+ * extra bits, for lengths 131 to 257. The longest fixed distance codes are -+ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest -+ * possible fixed-codes length/distance pair is then 31 bits total. -+ * -+ * sym_buf starts one-fourth of the way into pending_buf. So there are -+ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol -+ * in sym_buf is three bytes -- two for the distance and one for the -+ * literal/length. As each symbol is consumed, the pointer to the next -+ * sym_buf value to read moves forward three bytes. From that symbol, up to -+ * 31 bits are written to pending_buf. The closest the written pending_buf -+ * bits gets to the next sym_buf symbol to read is just before the last -+ * code is written. At that time, 31*(n-2) bits have been written, just -+ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at -+ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 -+ * symbols are written.) The closest the writing gets to what is unread is -+ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and -+ * can range from 128 to 32768. -+ * -+ * Therefore, at a minimum, there are 142 bits of space between what is -+ * written and what is read in the overlain buffers, so the symbols cannot -+ * be overwritten by the compressed data. That space is actually 139 bits, -+ * due to the three-bit fixed-code block header. -+ * -+ * That covers the case where either Z_FIXED is specified, forcing fixed -+ * codes, or when the use of fixed codes is chosen, because that choice -+ * results in a smaller compressed block than dynamic codes. That latter -+ * condition then assures that the above analysis also covers all dynamic -+ * blocks. A dynamic-code block will only be chosen to be emitted if it has -+ * fewer bits than a fixed-code block would for the same set of symbols. -+ * Therefore its average symbol length is assured to be less than 31. So -+ * the compressed data for a dynamic block also cannot overwrite the -+ * symbols from which it is being constructed. -+ */ -+ -+ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); -+ s->pending_buf_size = (ulg)s->lit_bufsize * 4; - - if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || - s->pending_buf == Z_NULL) { -@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - deflateEnd (strm); - return Z_MEM_ERROR; - } -- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); -- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; -+ s->sym_buf = s->pending_buf + s->lit_bufsize; -+ s->sym_end = (s->lit_bufsize - 1) * 3; -+ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K -+ * on 16 bit machines and because stored blocks are restricted to -+ * 64K-1 bytes. -+ */ - - s->level = level; - s->strategy = strategy; -@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) - - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; - s = strm->state; -- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) -+ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) - return Z_BUF_ERROR; - do { - put = Buf_size - s->bi_valid; -@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) - #else - deflate_state *ds; - deflate_state *ss; -- ushf *overlay; - - - if (deflateStateCheck(source) || dest == Z_NULL) { -@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) - ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); - ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); - ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); -- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); -- ds->pending_buf = (uchf *) overlay; -+ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); - - if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || - ds->pending_buf == Z_NULL) { -@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) - zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); - - ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); -- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); -- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; -+ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; - - ds->l_desc.dyn_tree = ds->dyn_ltree; - ds->d_desc.dyn_tree = ds->dyn_dtree; -@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -diff --git a/deflate.h b/deflate.h -index 23ecdd312..d4cf1a98b 100644 ---- a/deflate.h -+++ b/deflate.h -@@ -217,7 +217,7 @@ typedef struct internal_state { - /* Depth of each subtree used as tie breaker for trees of equal frequency - */ - -- uchf *l_buf; /* buffer for literals or lengths */ -+ uchf *sym_buf; /* buffer for distances and literals/lengths */ - - uInt lit_bufsize; - /* Size of match buffer for literals/lengths. There are 4 reasons for -@@ -239,13 +239,8 @@ typedef struct internal_state { - * - I can't count above 4 - */ - -- uInt last_lit; /* running index in l_buf */ -- -- ushf *d_buf; -- /* Buffer for distances. To simplify the code, d_buf and l_buf have -- * the same number of elements. To use different lengths, an extra flag -- * array would be necessary. -- */ -+ uInt sym_next; /* running index in sym_buf */ -+ uInt sym_end; /* symbol table full when sym_next reaches this */ - - ulg opt_len; /* bit length of current block with optimal trees */ - ulg static_len; /* bit length of current block with static trees */ -@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, - - # define _tr_tally_lit(s, c, flush) \ - { uch cc = (c); \ -- s->d_buf[s->last_lit] = 0; \ -- s->l_buf[s->last_lit++] = cc; \ -+ s->sym_buf[s->sym_next++] = 0; \ -+ s->sym_buf[s->sym_next++] = 0; \ -+ s->sym_buf[s->sym_next++] = cc; \ - s->dyn_ltree[cc].Freq++; \ -- flush = (s->last_lit == s->lit_bufsize-1); \ -+ flush = (s->sym_next == s->sym_end); \ - } - # define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (uch)(length); \ - ush dist = (ush)(distance); \ -- s->d_buf[s->last_lit] = dist; \ -- s->l_buf[s->last_lit++] = len; \ -+ s->sym_buf[s->sym_next++] = dist; \ -+ s->sym_buf[s->sym_next++] = dist >> 8; \ -+ s->sym_buf[s->sym_next++] = len; \ - dist--; \ - s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ - s->dyn_dtree[d_code(dist)].Freq++; \ -- flush = (s->last_lit == s->lit_bufsize-1); \ -+ flush = (s->sym_next == s->sym_end); \ - } - #else - # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) -diff --git a/trees.c b/trees.c -index 4f4a65011..decaeb7c3 100644 ---- a/trees.c -+++ b/trees.c -@@ -416,7 +416,7 @@ local void init_block(s) - - s->dyn_ltree[END_BLOCK].Freq = 1; - s->opt_len = s->static_len = 0L; -- s->last_lit = s->matches = 0; -+ s->sym_next = s->matches = 0; - } - - #define SMALLEST 1 -@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) - - Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", - opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, -- s->last_lit)); -+ s->sym_next / 3)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - -@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) - unsigned dist; /* distance of matched string */ - unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ - { -- s->d_buf[s->last_lit] = (ush)dist; -- s->l_buf[s->last_lit++] = (uch)lc; -+ s->sym_buf[s->sym_next++] = dist; -+ s->sym_buf[s->sym_next++] = dist >> 8; -+ s->sym_buf[s->sym_next++] = lc; - if (dist == 0) { - /* lc is the unmatched char */ - s->dyn_ltree[lc].Freq++; -@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) - s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; - s->dyn_dtree[d_code(dist)].Freq++; - } -- --#ifdef TRUNCATE_BLOCK -- /* Try to guess if it is profitable to stop the current block here */ -- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { -- /* Compute an upper bound for the compressed length */ -- ulg out_length = (ulg)s->last_lit*8L; -- ulg in_length = (ulg)((long)s->strstart - s->block_start); -- int dcode; -- for (dcode = 0; dcode < D_CODES; dcode++) { -- out_length += (ulg)s->dyn_dtree[dcode].Freq * -- (5L+extra_dbits[dcode]); -- } -- out_length >>= 3; -- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", -- s->last_lit, in_length, out_length, -- 100L - out_length*100L/in_length)); -- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; -- } --#endif -- return (s->last_lit == s->lit_bufsize-1); -- /* We avoid equality with lit_bufsize because of wraparound at 64K -- * on 16 bit machines and because stored blocks are restricted to -- * 64K-1 bytes. -- */ -+ return (s->sym_next == s->sym_end); - } - - /* =========================================================================== -@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) - { - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ -- unsigned lx = 0; /* running index in l_buf */ -+ unsigned sx = 0; /* running index in sym_buf */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - -- if (s->last_lit != 0) do { -- dist = s->d_buf[lx]; -- lc = s->l_buf[lx++]; -+ if (s->sym_next != 0) do { -+ dist = s->sym_buf[sx++] & 0xff; -+ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; -+ lc = s->sym_buf[sx++]; - if (dist == 0) { - send_code(s, lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); -@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) - } - } /* literal or match pair ? */ - -- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ -- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, -- "pendingBuf overflow"); -+ /* Check that the overlay between pending_buf and sym_buf is ok: */ -+ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); - -- } while (lx < s->last_lit); -+ } while (sx < s->sym_next); - - send_code(s, END_BLOCK, ltree); - } diff --git a/meta/recipes-core/zlib/zlib/cc.patch b/meta/recipes-core/zlib/zlib/cc.patch new file mode 100644 index 0000000000..8fb974ded4 --- /dev/null +++ b/meta/recipes-core/zlib/zlib/cc.patch @@ -0,0 +1,27 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.12.bb similarity index 83% rename from meta/recipes-core/zlib/zlib_1.2.11.bb rename to meta/recipes-core/zlib/zlib_1.2.12.bb index f8bcc0abcf..95e873584b 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.12.bb @@ -6,16 +6,15 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" -SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://zlib.net/${BP}.tar.xz \ + file://cc.patch \ file://ldflags-tests.patch \ file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \ - file://CVE-2018-25032.patch \ file://run-ptest \ " UPSTREAM_CHECK_URI = "http://zlib.net/" -SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68" -SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066" +SRC_URI[sha256sum] = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18" CFLAGS += "-D_REENTRANT" From patchwork Wed Apr 20 14:08:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6908 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 8F45EC636F4 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web12.8127.1650463775443068402 for ; Wed, 20 Apr 2022 07:09:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cZRMzmzv; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id md4so2036089pjb.4 for ; Wed, 20 Apr 2022 07:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=K0RpokRBAhs+MpWmMsipdS/cM6eQ/YI8AGBFAMFoM7U=; b=cZRMzmzv4s99Pc7umB/0+tlqn5Uw0eLv/Yw53x/Dd7MHoS797EqAVygfZSnQpXPYeb Hix20C1CQWkxOBqkK0ntkGWzG5euLJk803qF8XDzQ0m5n78Vdmd/DlXbURS9x6/83DXM UFxPa7iffbgX/e2YCEyUDRmB2Q5WGRTLlIVA2rn3YV2faZjN00vzpRaInCLoJSmBEGk3 BzJhBKJScBIkeD4noPmmedkbcBSZLv9hoQE1HO4LWypuVPN8xdsuxk08oIahKwDRy2cu 8RVP1jzsq3cMHFunSjHJAkiN0WkKVgucevDQJRewSysxOcmViUzcS/rag8WwnKpvBIFn hlcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K0RpokRBAhs+MpWmMsipdS/cM6eQ/YI8AGBFAMFoM7U=; b=qn31IYdc4PebL1UrmMaP9vDhpfTtasi/ihEKP3maDO1rJROGHeh2+rxYUupxl9KqaW EflcMB/prjaryfmLVvmSuP0MLqrA6Iv95Jz6VaXFMp4ZiXl2MyjqcrY8T/DHrY85BG+B 34thiv1wQoQoRl9zvMfxZ2siggYm2Vumbsdaq8ZpZagBtQ9e/BspXE2yl6JMM5uNr6pf wVxn1hArrnKQezqccCUJ1gCr5VF18j+YIhYB1WeYJ35khN9Sq4oBhFhU3QGP2cf8tYbb WYDzU7kTKg9rsqN2H4aiFtjfEnnZvuZ1j9XoFOX++0RyUvS0VqCju/zFpqmNCmXGGrfb 3c6g== X-Gm-Message-State: AOAM5339TyFDxJzIPlO+597xXWpBT1LprLjcL0sZBlpTkGKJKfzfpMlO HbMdrEYfp4Uv5FKiFYB5BHqkpCMd0zcKCtYIf1s= X-Google-Smtp-Source: ABdhPJwTfBbM15ev2LaJqg/sYlwpl5fnjLVbFfz80SsjEQjpG9KzLl+e6cYoJb8HX5covlRnJu4gsQ== X-Received: by 2002:a17:90b:4f85:b0:1d2:828f:9860 with SMTP id qe5-20020a17090b4f8500b001d2828f9860mr4695378pjb.54.1650463774529; Wed, 20 Apr 2022 07:09:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/27] libsoup: upgrade 3.0.5 -> 3.0.6 Date: Wed, 20 Apr 2022 04:08:10 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164690 From: wangmy Changelog: ========= * Misc HTTP/2 fixes * Add PUT/POST support to examples/get * Add `--user-agent` option to examples/get * Misc meson improvements * Fix build with Visual Studio Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0ee1c748af7520f50275b8dfb32f41de7f5e14c7) Signed-off-by: Steve Sakoman --- .../libsoup/{libsoup_3.0.5.bb => libsoup_3.0.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libsoup/{libsoup_3.0.5.bb => libsoup_3.0.6.bb} (94%) diff --git a/meta/recipes-support/libsoup/libsoup_3.0.5.bb b/meta/recipes-support/libsoup/libsoup_3.0.6.bb similarity index 94% rename from meta/recipes-support/libsoup/libsoup_3.0.5.bb rename to meta/recipes-support/libsoup/libsoup_3.0.6.bb index d2535c91a2..17825ae6a4 100644 --- a/meta/recipes-support/libsoup/libsoup_3.0.5.bb +++ b/meta/recipes-support/libsoup/libsoup_3.0.6.bb @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[sha256sum] = "f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145" +SRC_URI[sha256sum] = "b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6" PROVIDES = "libsoup-3.0" CVE_PRODUCT = "libsoup" From patchwork Wed Apr 20 14:08:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6918 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 A0709C636F7 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web09.8120.1650463779272202233 for ; Wed, 20 Apr 2022 07:09:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=R4gMlRJe; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id p3so695244pfw.0 for ; Wed, 20 Apr 2022 07:09:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JAm0T6jp7fAMKlJ3/RuLQkWCWQTZridZ5iMHuSblosM=; b=R4gMlRJeZdeoryhFYMUoR5Mz1N27RRuToHTVddluTBohNvM48nzpZjlFbJDEgkL1mQ ePTpK+dKyd/0CD2AQ+KV7ZIYWTWb/TRZHxeKgYg8LLM0k5dpRZpkdAeLEDUGvYIVx+br pfnm0OKsXzje72TDPKuLl20VYCw7aJ49KaHE1cQNsOdpsoKmgQwyVcEOFlkobu7MJUdC mZGk2IyUW4oRM9PANVhYdJIYLLX4SK1tpWOpJ7grzCpihNI9v9P6hJRMy3bEjlRFahMG gHYECsO84P8pEVWj1GhtKjr6uMSCHbL3KSXWYG/chyqY6sMzTNXWHyx+hagt9jEXtiBV wsPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JAm0T6jp7fAMKlJ3/RuLQkWCWQTZridZ5iMHuSblosM=; b=UuRDfML8fQznuawhYwh+ckwVagcM+fqLOmmfjjAjPjnNnUIS8K2852RWoeFihJcFTh wUJUIVqFTei0A6M1qrcDzRgNIWRtcNfPu+RFb0xRhOiW/1R6TQRbeg624vnXYxcdJBt8 NwOAtze35zVGtVLcqGAxkOyernWylv5VvSJ5c45Vb8DUAVG02frX1i1jyZhgWOoEHzPZ N9rvjQcmh8NPPnIBCf1wI5jhhv4FOfMeAB94wxq/tWqq7yciHQfU1gWumxXRdEKEPYhq q0yuvX8b0kRRz3kFYuTwMXPZHLGMSSNgUhhsnGFwYAjh6puLcZm6EQOVJX4lMFsGQlbk 4mXQ== X-Gm-Message-State: AOAM533LSJpiaHUPLrrEqsiUkqql9ls/Z4KWCqt+oArdNLDJKFz6QiLR 42+m9RK8HSXAEJ5QKg3gQUzpOnML6afYaKBgko4= X-Google-Smtp-Source: ABdhPJwohILKwpoz/NFjmJMHo+Ky51e7tqODUo5BUoY3nL+lWlmZWr0/8egPVIVWOUQzz+RZgHG3Qg== X-Received: by 2002:a05:6a00:1304:b0:4e1:2338:f11e with SMTP id j4-20020a056a00130400b004e12338f11emr23712064pfu.24.1650463778401; Wed, 20 Apr 2022 07:09:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/27] apt: upgrade 2.4.3 -> 2.4.4 Date: Wed, 20 Apr 2022 04:08:11 -1000 Message-Id: <3b334123a631cedacf6dceb1b019d4dcac1eb569.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164691 From: wangmy apt (2.4.4) * Recognize Static-Built-Using and order it below Built-Using (Closes: #1008759) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c63741294c6322e6657f485034e434aab9fe2d8d) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/{apt_2.4.3.bb => apt_2.4.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/apt/{apt_2.4.3.bb => apt_2.4.4.bb} (97%) diff --git a/meta/recipes-devtools/apt/apt_2.4.3.bb b/meta/recipes-devtools/apt/apt_2.4.4.bb similarity index 97% rename from meta/recipes-devtools/apt/apt_2.4.3.bb rename to meta/recipes-devtools/apt/apt_2.4.4.bb index 27e455747f..9faf1e7ea9 100644 --- a/meta/recipes-devtools/apt/apt_2.4.3.bb +++ b/meta/recipes-devtools/apt/apt_2.4.4.bb @@ -25,7 +25,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "5a7215ca924302da0b2205862cd2d651326eea222a589184ec6ce663885729f7" +SRC_URI[sha256sum] = "d6d83d122ddd7cc83b2c2f839a55940c13ab93e5cf6024a010d6a6b4110dcf0e" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale From patchwork Wed Apr 20 14:08:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6917 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 A4823C636F6 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.8165.1650463781926620588 for ; Wed, 20 Apr 2022 07:09:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3ULqIP6d; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id bo5so2041414pfb.4 for ; Wed, 20 Apr 2022 07:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=E4csr6at3uzgxfeqmWCEM3wMczRTKvT5rFpuXO+vNqE=; b=3ULqIP6dHfdpjAzE12jOuFMq4O4XU2RbTqWh2fIOwn0oMV2IKv/gOpW78n365Kkhqx 15GQIDjWQCBBFQWoVPbC1k9zWn/i6Du3X1n0CZ3EVeoLGRjCGbf5huo0JNxtWNlJrcE3 wM+74ooPzupIuccHao7rvDVqmSnCxYxHyo1u/VexRYQEElVdQIe1L39q+Zv5RuJPTc2J rinDtR71KFTq6oWMxsgObEJmqA4FAAJiq0F1h3yA6LFgT5ZzJ2aK/HM5OvPwj9lNqmIW gLoneUcmKyrh/3hHoe2Q69B0vbnMEAFVeY7ohRR3kRHCzvqhlsONS5kM7WF/SBJjnViL dMIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E4csr6at3uzgxfeqmWCEM3wMczRTKvT5rFpuXO+vNqE=; b=XVYpv/IuGBGPQ845JxfFeZaQwGMsGYMMcHUq6BZlpdX97/hvjBBEyEnNrLEyBTx0SG xOqJP3LEONr8jbJ/cvdMfwtwrDN/KMqrvGSmEOccDwgL3gZctI52C2t76ezD17CWgWZy FMedhF9kfaL1i18O+A3yRgMqYt0vy6dFFxC9ZRZi5Op59kKoZg4IziAzHI9BEZOZKCLC 9ihjeM/+60bqOIj66akLVeG3LGIfaFmRgw/RsOM4m+1HX+7IH/9tuJbl3k8kqZBLCz3c k0svPW6f4c248q+RZ58rV0KlJVn6aidB+Ox5RgUrS4ej7FsUGsU4QTMLsduBPLeps0tk RXPA== X-Gm-Message-State: AOAM531NED2vAZK4QacsJkBtXlY1rEX5Y5qi3RtakdsmwNHd/inLykgo r28qnhx9tdA8Qt+rWA18drFTQZb992MpnpvTWR8= X-Google-Smtp-Source: ABdhPJxUtlY62wAu1KUrLEtp2REqMFNLNkjOb6MrNSK+34wVOYK3GlttDqm3KvnXROcnUMT5E8bzFg== X-Received: by 2002:a05:6a00:198b:b0:50a:90fd:59f8 with SMTP id d11-20020a056a00198b00b0050a90fd59f8mr10928038pfl.22.1650463781055; Wed, 20 Apr 2022 07:09:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/27] libusb1: upgrade 1.0.25 -> 1.0.26 Date: Wed, 20 Apr 2022 04:08:12 -1000 Message-Id: <9329fd3b1c705b7711adc71bdbf8f9e33f1058a8.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164692 From: wangmy Changelog: ========== * Fix regression with transfer free's after closing device * Fix regression with destroyed context if API is misused * Workaround for applications using missing default context * Fix hotplog enumeration regression * Fix Windows isochronous transfer regression since 1.0.24 * Fix macOS exit crash in some multi-context cases * Build fixes for various platforms and configurations * Fix Windows HID multi-interface product string retrieval * Update isochronous OUT packet actual lengths on Windows * Add interface bound checking for broken devices * Add umockdev tests on Linux Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 7353489980600af07d0771654da6a8a3b0df7572) Signed-off-by: Steve Sakoman --- .../libusb/{libusb1_1.0.25.bb => libusb1_1.0.26.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libusb/{libusb1_1.0.25.bb => libusb1_1.0.26.bb} (94%) diff --git a/meta/recipes-support/libusb/libusb1_1.0.25.bb b/meta/recipes-support/libusb/libusb1_1.0.26.bb similarity index 94% rename from meta/recipes-support/libusb/libusb1_1.0.25.bb rename to meta/recipes-support/libusb/libusb1_1.0.26.bb index 64cc19e47d..fd63e7adc2 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.25.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.26.bb @@ -16,7 +16,7 @@ SRC_URI = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases" -SRC_URI[sha256sum] = "8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849" +SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" S = "${WORKDIR}/libusb-${PV}" From patchwork Wed Apr 20 14:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6919 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 AB492C636F8 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web09.8123.1650463784565751599 for ; Wed, 20 Apr 2022 07:09:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nSESclBR; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id ga4-20020a17090b038400b001d4b33c74ccso1178830pjb.1 for ; Wed, 20 Apr 2022 07:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=W2RFX6/DnSjDDedG6Q1DmOnxh29eKfYCH4gV4nzTuxU=; b=nSESclBRBCqQr4qxjmW825E8vx10Tu3NHogc5Lnx79OxZMh2Mqsj0MZh1vQLPnuWn+ yyT4oOuoh+JEE78MGvxsfru8H6Ta59RlayTdGs6DYASIuQiSzyupxSxghEHF9WFTVKAM 1TXmJ5CcehLF2+Emy1v7Liueko3Lf8Akb4YxTe6lapIRZbQXbEIBs+DagKf/Z5FjYKO2 8TDpuojgu3Ss8RW1bk70yzTlK6kWzxFXBA0WRlw2N4VlSaxcWu/IJgafdt1xa22i8Bcq Me/NfaXNwpFEhsQKNKKJok4fM34oIfqBGa8T58Nu3JLOWJF6kgY5vZYPDNfnkaDxTXZS AL8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W2RFX6/DnSjDDedG6Q1DmOnxh29eKfYCH4gV4nzTuxU=; b=2rBLbsZkchGt8aTv4Y14OLGc/EVqGyuibx9xapR7S4M3f1nlpnb5W8nJYB0Uf06VBa C1J3KQTXSAdn5E9jyq/rifC9htMCBTpn+hs5x5gYnyypH1nzqSYrZizyBpIGZ3vAOwdg VBPwkMcQrshQJ5D6NeUY3Akwv5TxgC4XCt8Xd6/RxPdgYqBPhIj34M7/q27uUldeXlWi +s66HfhUfU0SVnqDv7n0UcA1j/nXGuaN2CGl0efNAft04CBan3ge2nxrZzIxerVrio/s LDY13IHJMakn36toNHxmPxPtn80oloTnZ1OZ1M8DzNulsHCXIjRNw6wqvoE8JiOxK/ei yqGQ== X-Gm-Message-State: AOAM530YgWyndvBkwM3vzXE0cFTlJVcjNiKCEEkehj/nQ2OevlxtpxHl TNb1Zhv5/eH881kEBwa9/8OeW8naSS3Ws2zM6zA= X-Google-Smtp-Source: ABdhPJz4VQcyxvPD22hUVR2kLET5zLgijBhACBBHDQGkxdURdZjW5Zl+EMX+0xZjgrlzs74eSrrAtw== X-Received: by 2002:a17:902:ed83:b0:158:c459:ab59 with SMTP id e3-20020a170902ed8300b00158c459ab59mr20999685plj.161.1650463783633; Wed, 20 Apr 2022 07:09:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/27] libgit2: upgrade 1.4.2 -> 1.4.3 Date: Wed, 20 Apr 2022 04:08:13 -1000 Message-Id: <5469986c79c95279715559acf33e921f2baa791e.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164693 From: wangmy Changelog: ========= Validate repository directory ownership (v1.4) midx: Fix an undefined behavior (left-shift signed overflow) fetch: support OID refspec without dst Fix crash when regenerating a patch with unquoted spaces in filename Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit bef09c61ee32df214fb8cf6000e0314ff3a38156) Signed-off-by: Steve Sakoman --- .../libgit2/{libgit2_1.4.2.bb => libgit2_1.4.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/libgit2/{libgit2_1.4.2.bb => libgit2_1.4.3.bb} (91%) diff --git a/meta/recipes-support/libgit2/libgit2_1.4.2.bb b/meta/recipes-support/libgit2/libgit2_1.4.3.bb similarity index 91% rename from meta/recipes-support/libgit2/libgit2_1.4.2.bb rename to meta/recipes-support/libgit2/libgit2_1.4.3.bb index 88bf5a8520..7e27b5b018 100644 --- a/meta/recipes-support/libgit2/libgit2_1.4.2.bb +++ b/meta/recipes-support/libgit2/libgit2_1.4.3.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e5a9227de4cb6afb5d35ed7b0fdf480d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.4;protocol=https" -SRCREV = "182d0d1ee933de46bf0b5a6ec269bafa77aba9a2" +SRCREV = "465bbf88ea939a965fbcbade72870c61f815e457" S = "${WORKDIR}/git" From patchwork Wed Apr 20 14:08:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6913 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 ABF09C636FA for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.8166.1650463786901087408 for ; Wed, 20 Apr 2022 07:09:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=YgAAeuAp; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id bg24so2060887pjb.1 for ; Wed, 20 Apr 2022 07:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GvaEbjQQHqdMf8gqlM3FKhzsJw2zGvEp0bB3CSnZ9x0=; b=YgAAeuAp4ArRCFRKm3Pi32oYezSavUtOIMijQbXZq/PbIqp5nJFmDLwMrT0SMk8F+q jTIrYChKuROh/18jgVKW558W/iNQcu4zetcfNIX/5z+I0lFDaEgoTPSCbF6irfhndmdM yvsj4VXD/q3pxE6GHUu4LLKBLOljnr0i4S62B8FjYg7xqQfpTFXOLpIHS+kCUDI4LtbE cCTd0onaTxvqFMhZuRawbyoCOS6lhM/1Wm30RRIPC3ZE+MHpK3IFjmhPSuxalUKH3pls Cflfts7P6stwTY901KMIEsvmrwnitF2klFeWT+2seWvnjUFxRBYMGRhyq9M2poE/jZsm 306w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GvaEbjQQHqdMf8gqlM3FKhzsJw2zGvEp0bB3CSnZ9x0=; b=qrr0Uu9woUwBxVIrKCpzEPClsGcqguHYpR5syFN1yCG8RZwEEXlV7P5TQZNXoQXwto a6NGPirzJMGJyNIE36q9/DAvjYh0T9sxUXl/N3PTbczHB+ZH6dgRlj0UQL3EdSKsU28F W7G8KioRgu1lSCNjQpcIf+/uXs/5KGRduIBeErUNn5mVh8dfFwUBYdGTOrSU0v0bEGns a8P9Qrr3PY4R8c//K7MSmt+caRjJiFCl6Y/KkLZvHsG4bScE3YYyVv+0cjElngsmP8th 5TnQTzfqszE5YOqd0whutu6ZgXTaqEM9HV/l95RbUxaIBW47QoohP+xqBbSkPdytTnDo 17Hw== X-Gm-Message-State: AOAM530b+cJ09KaIDKoeR6x7NrSZKKMU6C7KpR0efVcsisxAomQX1r+k B/l5OljGHL1SBT1UxjIEtCeTTbUPz+QQ5bRSYt4= X-Google-Smtp-Source: ABdhPJyGyhqCW39FAWreinowZZQsXw/mtQ7K2s5+eFgJXxydB1z5EAWxt8UU4tFBm5kmVYIvE21JNQ== X-Received: by 2002:a17:903:11d0:b0:156:6c35:9588 with SMTP id q16-20020a17090311d000b001566c359588mr20548984plh.50.1650463786032; Wed, 20 Apr 2022 07:09:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/27] git: upgrade 2.35.2 -> 2.35.3 Date: Wed, 20 Apr 2022 04:08:14 -1000 Message-Id: <02a238208accc35a7a7882435fd6e2c6e04b7d91.1650463004.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164694 From: zhengruoqin Bug fix release: 0f85c4a30b setup: opt-out of check with safe.directory=* bb50ec3cc3 setup: fix safe.directory key not being checked e47363e5a8 t0033: add tests for safe.directory Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie (cherry picked from commit 457b5d4dad3e6fa77e80bed66666c36caa452380) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/{git_2.35.2.bb => git_2.35.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.35.2.bb => git_2.35.3.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.35.2.bb b/meta/recipes-devtools/git/git_2.35.3.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.35.2.bb rename to meta/recipes-devtools/git/git_2.35.3.bb index fe137d94af..68981d4fde 100644 --- a/meta/recipes-devtools/git/git_2.35.2.bb +++ b/meta/recipes-devtools/git/git_2.35.3.bb @@ -165,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "0decc02a47e792f522df3183c38a61ad8fbb38927502ca6781467a6599a888cb" +SRC_URI[tarball.sha256sum] = "cad708072d5c0b390c71651f5edb44143f00b357766973470bf9adebc0944c03" From patchwork Wed Apr 20 14:08:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 6916 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 AEFB2C636F9 for ; Thu, 21 Apr 2022 16:46:08 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web12.8134.1650463789583245619 for ; Wed, 20 Apr 2022 07:09:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=52Cgv1Br; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id z16so2041721pfh.3 for ; Wed, 20 Apr 2022 07:09:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NY0ijhF2sdr1EtA0RqQLqVp4T9OGtGccwKPKuQG8T0Q=; b=52Cgv1BrLC8W8hAlGGlp9RWLvNmaEzXY71oZPNMSLtoWTTE+SWEshgZSoY/Z5ANmiK VA0XtC91C+CHP89YDB6XvS/vRIWFuRaEkvJbjmQ1ZjuUQCZwAZqHOX98SN+eCF76pNKm Lb7QM/LSTVER+NUf17wAi9QFuptzeM4Vv3fvIDi0BuMvhpNInxX09e/TjhXEzXagje8G uPIbBHAEBjWsgzOwSUeeG/6fLfI++STUXaFIRaxQ0apBQZGJKs41mZa5lWBmkVm3rTlI y22KU3BApvo95Nq/G/VCLL4lttmZ6A2UFFkcM/eNKYMVtUXPKMXseyZeTkMwivwxPMtb ybCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NY0ijhF2sdr1EtA0RqQLqVp4T9OGtGccwKPKuQG8T0Q=; b=O0bUG/eGRou7gyMnKLMvMySAw5RHCvQ+8BYTgOVGKfQMaYuytaTvE++Y0t6nwv5tH8 xbIT4RGwsfDSj7wLVZBP6Ggz9c0INgLFnuEDozbS1Basvux319b4KY9SPKUDd3HI7HFq 4iAUWg2AVbf7vlAU4EVti77UykBdTyZojQttODeL/rdeawgjjahkA2/PlS3sL45Bdma0 YnI7oIf2nhC8lJnqzclUGUTIc4KFCdfYMt6tJBhBv/LhLIsq8vNT7MHYiwBoFQYTgfHN 7JCWbVNQ7eISwPt1nNs53vVX0R2np9PwMDbqQesPX7EB4sjUd1PlKciO6FRoNA9u+YUZ kWkQ== X-Gm-Message-State: AOAM531snwCKcsP0UB4NkXDAyMF5jAvUoUmacwJD9pAClh9ge3WLw6Yc BinZLWWzFoRhjdSYnkB6by/mJiH6/SwaFtxZ4CU= X-Google-Smtp-Source: ABdhPJzVqOJvTK4UV6w20TWF0YrDnT3Yuuqd1tD2H1aOepD+NO8dJhGW7Smdjy10z9o+YDZV38H6BA== X-Received: by 2002:a63:7cf:0:b0:399:58f3:9acc with SMTP id 198-20020a6307cf000000b0039958f39accmr5958793pgh.149.1650463788578; Wed, 20 Apr 2022 07:09:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 96-20020a17090a09e900b001cb62ee05besm22941091pjo.55.2022.04.20.07.09.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 07:09:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/27] ruby: upgrade 3.1.1 -> 3.1.2 Date: Wed, 20 Apr 2022 04:08:15 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 21 Apr 2022 16:46:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164695 From: zhengruoqin Ruby 3.1.2 has been released. This release includes security fixes. CVE-2022-28738: Double free in Regexp compilation CVE-2022-28739: Buffer overrun in String-to-Float conversion Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie (cherry picked from commit 1306c732a39070e12306b0b7a393e2a482c8b326) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/ruby/{ruby_3.1.1.bb => ruby_3.1.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/ruby/{ruby_3.1.1.bb => ruby_3.1.2.bb} (97%) diff --git a/meta/recipes-devtools/ruby/ruby_3.1.1.bb b/meta/recipes-devtools/ruby/ruby_3.1.2.bb similarity index 97% rename from meta/recipes-devtools/ruby/ruby_3.1.1.bb rename to meta/recipes-devtools/ruby/ruby_3.1.2.bb index d8fddfa520..38ba46731b 100644 --- a/meta/recipes-devtools/ruby/ruby_3.1.1.bb +++ b/meta/recipes-devtools/ruby/ruby_3.1.2.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ " -SRC_URI[sha256sum] = "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" +SRC_URI[sha256sum] = "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"