From patchwork Fri Feb 10 06:42:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19314 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 0695BC636D6 for ; Fri, 10 Feb 2023 06:42:44 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.8402.1676011361482388390 for ; Thu, 09 Feb 2023 22:42:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qtSlreyg; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id m14so4019355wrg.13 for ; Thu, 09 Feb 2023 22:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=p0VAuyHh/0zCKgo1n9wajvD9JBpF+Blj73U8XRdHRnE=; b=qtSlreygHaH7QSs6B0IR4x2qlFQMpBGTmxEqJ4/6qTjinx5y1iMhY3ByuY3kUIk0A9 8OyHaa6xdmiapi9gipvHh5fm1qD6cbOKb+7E2mDICTjnuAlz5i8wz3/Pd0baSKbADQq1 h3q8OuVjMZWahM6SIBlQwz/TS9j1Fr2HmIDggh4DMPYsxTnFN06fuW5p5PWfJXOQXzhS RyPvTvTS2Ay8IL76xYSjutoP/zMH05CoGkFVTxagtxKkke4hNdtZ8q5eMDhPf36jD1Xn awBUQm/TpMEyA17uD/Leaeuuw3lPnTzCGT+f0IE/kX50kxmTPEBlNVNvPXOU7fkTgNNB BSRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=p0VAuyHh/0zCKgo1n9wajvD9JBpF+Blj73U8XRdHRnE=; b=iW4c3Nruh6jv3EGAJOpIZLQLdn9E5EtIgQsGjgBJVyr8z2PA3B6VIHQWWVh5Lq6KA/ z6gcZS4kwbl5g0LND/Ojd1D40a3pY7XJG8nkLUBzAyAFvLIAWNGR6WOuuV8itV3+zB5H eZGRw5IEAg0ilYCYPzgiBH0jPHDwp5w+3a0+a0bM0BhM7KCQ/U+BQYUb+bImXEB67eIX 6uoIbOPG22Ik/tVI0rRUv9cMTtzY8Cn4j5GvbKyucZrshJCTsQt3tTjkbw9IN0WeLGDO mAT2vMXxLFIhHSEh2ZlZBcYTo2dypCAhQpXifhrOVaWIgCLsGvvegF9uSv4NeI7FtOFj PVrg== X-Gm-Message-State: AO0yUKVw/7fya5dYOGaLWfFHJS9aL0VS+qEO9APjZVfxU91B0Kz8U8xV lfEP3l1ozNvHhPqwey5WD01EfC6sejk= X-Google-Smtp-Source: AK7set+M3u2swE2MNYrilFRBwBA6rcjbG0NsYTeuoNYoxkygX9M0b3nXhX7WjjIXkVxgddSxb7KCeg== X-Received: by 2002:a05:6000:12cb:b0:2c3:ddd2:feda with SMTP id l11-20020a05600012cb00b002c3ddd2fedamr13368380wrx.63.1676011359928; Thu, 09 Feb 2023 22:42:39 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:39 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer , Alexander Kanavin Subject: [PATCH 1/8] bblayers/setupwriters/oe-setup-layers: create dir if not exists Date: Fri, 10 Feb 2023 07:42:09 +0100 Message-Id: <20230210064216.4123807-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176975 From: Adrian Freihofer Without this patch: $ bitbake-layers create-layers-setup /home/adrian/temp/poky-clone NOTE: Starting bitbake server... Traceback (most recent call last): File "/home/adrian/projects/poky/bitbake/lib/bb/process.py", line 169, in run pipe = Popen(cmd, **options) File "/home/adrian/projects/poky/bitbake/lib/bb/process.py", line 73, in __init__ subprocess.Popen.__init__(self, *args, **options) File "/usr/lib64/python3.10/subprocess.py", line 971, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/usr/lib64/python3.10/subprocess.py", line 1847, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: '/home/adrian/temp/poky-clone' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/adrian/projects/poky/bitbake/bin/bitbake-layers", line 95, in ret = main() File "/home/adrian/projects/poky/bitbake/bin/bitbake-layers", line 88, in main return args.func(args) File "/home/adrian/projects/poky/meta/lib/bblayers/makesetup.py", line 90, in do_make_setup p.do_write(self, args) File "/home/adrian/projects/poky/meta/lib/bblayers/setupwriters/oe-setup-layers.py", line 36, in do_write repos = parent.make_repo_config(args.destdir, args.include_layer_repo) File "/home/adrian/projects/poky/meta/lib/bblayers/makesetup.py", line 55, in make_repo_config destdir_repo = self._get_repo_path(destdir) File "/home/adrian/projects/poky/meta/lib/bblayers/makesetup.py", line 30, in _get_repo_path repo_path, _ = bb.process.run('git rev-parse --show-toplevel', cwd=layer_path) File "/home/adrian/projects/poky/bitbake/lib/bb/process.py", line 172, in run raise NotFoundError(cmd) bb.process.NotFoundError: Execution of 'git rev-parse --show-toplevel' failed: command not found with this patch: $ bitbake-layers create-layers-setup /home/adrian/temp/poky-clone NOTE: Starting bitbake server... NOTE: Created /home/adrian/temp/poky-clone/setup-layers.json NOTE: Created /home/adrian/temp/poky-clone/setup-layers Signed-off-by: Alexander Kanavin --- meta/lib/bblayers/setupwriters/oe-setup-layers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/bblayers/setupwriters/oe-setup-layers.py b/meta/lib/bblayers/setupwriters/oe-setup-layers.py index f6a484b766..d5bc19a8cb 100644 --- a/meta/lib/bblayers/setupwriters/oe-setup-layers.py +++ b/meta/lib/bblayers/setupwriters/oe-setup-layers.py @@ -33,6 +33,8 @@ class OeSetupLayersWriter(): def do_write(self, parent, args): """ Writes out a python script and a json config that replicate the directory structure and revisions of the layers in a current build. """ + if not os.path.exists(args.destdir): + os.makedirs(args.destdir) repos = parent.make_repo_config(args.destdir) json = {"version":"1.0","sources":repos} if not repos: From patchwork Fri Feb 10 06:42:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19312 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 04174C636CD for ; Fri, 10 Feb 2023 06:42:44 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.8291.1676011362174896044 for ; Thu, 09 Feb 2023 22:42:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MT52Q+sY; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id bk16so4023907wrb.11 for ; Thu, 09 Feb 2023 22:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qJOIgMk9OPAiUoUQmukJ5yj+UQJmx5d31uYRZ23+Mwg=; b=MT52Q+sY2SSCkftZbZtLVfKjxVL1kmrxuvIrmcQCHegePAftb0UNgjPmkmJXgzXx30 Irbtx5WiaiO4cHq5saerWOOOfzxKGFjrXjsxWxf87RAw5SbgrE/Qy9Jx2K8mVG/tdUqE jKA41TjWbTkAkDm8dSGrDrR3v0saCKl0zHJ5OJ6vzEzB0zH049BF443SMJ2SHU+Nss/X /79l7zj1RW2y58Hfs649VLOsS8C3aE4Ngmv64tACGOXInpaAIf1RNNL3a6a/9K/Ah/D1 6kr6E/GDe2AQUjkjHMbdqD8Cvgrue4hVzq7KECEbpvuan0YFgP6bvv5a2NMweif+H0zz Oppw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qJOIgMk9OPAiUoUQmukJ5yj+UQJmx5d31uYRZ23+Mwg=; b=kjUwvUWXQPvtfqOzlPKyVeLYpVarQbt+D08PCzs4keJ6ZCIZQf6FqFR7M12c9cywlM nfMVSreeXy7S1oeJ6YdH56790d9NGKu01JI6pB+im0BxzudCcKRGgfKL5606zRj9hWqx KUyedVo98pQJkovnpTxVXCTG/JnJMX23svYqPa4QAke1/8ydP1gRUAHxtR/IIE4kz8jq 8oCo50GL7oHJeorkHpPwFe+/dxfwnqorp0PPPLYKhkHwJAMFMs+2fu/R5B//IVKH5Z7l WcIQjEnnlv7Qn3OH1sXrsEP0R96Xnuc+wJW1y4SrBrzyxJ6pakI0KvkUrHr70nCGmfBk 6W2Q== X-Gm-Message-State: AO0yUKWlamHkU1uiDDFNKJLHYOXYF2KvqJlbGgp9I6QNRv/mkxA4IHqz gYRVhto2msp5uXq4/qccee3UwLMTq6g= X-Google-Smtp-Source: AK7set9lLL//CkmgxweOsoD9eZZ2/DFrg9IcInqQ/dHGCe6LfRclWPQGRaLn8XDdofXjDZrAWHQRiA== X-Received: by 2002:a5d:654d:0:b0:2c4:f55b:a1db with SMTP id z13-20020a5d654d000000b002c4f55ba1dbmr3935349wrv.12.1676011360573; Thu, 09 Feb 2023 22:42:40 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:40 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/8] bblayers/makesetup: skip git repos that are submodules Date: Fri, 10 Feb 2023 07:42:10 +0100 Message-Id: <20230210064216.4123807-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176976 Signed-off-by: Alexander Kanavin --- meta/lib/bblayers/makesetup.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index 834e9338bc..5fb6f1469e 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py @@ -45,6 +45,13 @@ class MakeSetupPlugin(LayerPlugin): return "" return describe.strip() + def _is_submodule(self, repo_path): + # This is slightly brittle: git does not offer a way to tell whether + # a given repo dir is a submodule checkout, so we need to rely on .git + # being a file (rather than a dir like it is in standalone checkouts). + # The file typically contains a gitdir pointer to elsewhere. + return os.path.isfile(os.path.join(repo_path,".git")) + def make_repo_config(self, destdir): """ This is a helper function for the writer plugins that discovers currently configured layers. The writers do not have to use it, but it can save a bit of work and avoid duplicated code, hence it is @@ -63,6 +70,9 @@ class MakeSetupPlugin(LayerPlugin): logger.error("Layer {name} in {path} has uncommitted modifications or is not in a git repository.".format(name=l_name,path=l_path)) return repo_path = self._get_repo_path(l_path) + + if self._is_submodule(repo_path): + continue if repo_path not in repos.keys(): repos[repo_path] = {'path':os.path.basename(repo_path),'git-remote':{'rev':l_rev, 'branch':l_branch, 'remotes':self._get_remotes(repo_path), 'describe':self._get_describe(repo_path)}} if repo_path == destdir_repo: From patchwork Fri Feb 10 06:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19315 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 12D79C05027 for ; Fri, 10 Feb 2023 06:42:44 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.8403.1676011362717378795 for ; Thu, 09 Feb 2023 22:42:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Pl9OBeOc; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id f47-20020a05600c492f00b003dc584a7b7eso5549138wmp.3 for ; Thu, 09 Feb 2023 22:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zJQ1tSU9D9GtxjgfsTo3qEcmoDARoNRwacvFi828ybY=; b=Pl9OBeOc0NwT0YLoQfzDfnN3kCQ7yD57F1YZ+UvsWFSeSawgbMrR+PNxBuopxbHnSO 0QqTWEW85li1aw6xsGZHW9Q7xOLc3X9pdtNk+NroxWq0Y8YjB4eTeZz4d3N80e/5dMlk yFD+xXICMw9vQ+90yni5JWPJRnF03WstAv27z0HoJvZt4Mlw7jMUXHz/Y8+FdxRBc1BV 9LsiOqscHg0gp34ytuzdForZsunud8vZZ7ysUgosYKe3Wm5fDSvjFhDas6lHpbaPisQ4 Dr4oH7xj3j9wIRlFv6LlOuuOybBEaxUZlf9rqMMJBuvlDxW+HcP01XTauMN2rNIoOEx9 mn4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zJQ1tSU9D9GtxjgfsTo3qEcmoDARoNRwacvFi828ybY=; b=DDH73/8xRpRaEJ7JQsFJ4BJC699DnP4QbGqmBCZpkNH6qurTGPxxa7laiov8yHlwos G3lBvEAwKmED5KQvLPuaaW8KpT60lCG+J9Ekpd6EbG79ISEsyaFzARc2eltJSgniMwk3 wIC82o/P9bpkspmA/9KM5+eC052VmJ86yNpGKu9DP8FBRl+tDse2OUMwIzFmIMrYYcYm Ngt36mBFfNXu9z9jPT26xgA5GjGws6QlTylBoxBAeVIuzHvYzwpCEnIsBZMNRmZRdTah Xt5niR53638UKs+NAf2xc3GdkMUsJFJVS482E6mIUNhK8x/AAQEo4OMUFwzaMVE5Efae fjpA== X-Gm-Message-State: AO0yUKUQ4Q+d0c9I+T26iFhWQ8Frrt+3PCw8sIDMCxQttkCXFEcXS60Q Smbm/7OuJZaq/uUx+M4k0gUZf3Buids= X-Google-Smtp-Source: AK7set8l+V67SiLaSdhWU6oGyg4Qo916aXe4xx6dlTV6QzKBfKWckg0avWjerW56Z1Ej8bPptQQXrQ== X-Received: by 2002:a05:600c:331c:b0:3dc:9ecc:22a with SMTP id q28-20020a05600c331c00b003dc9ecc022amr12320314wmp.8.1676011361224; Thu, 09 Feb 2023 22:42:41 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:40 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/8] scripts/oe-setup-layers: print a note about submodules if present Date: Fri, 10 Feb 2023 07:42:11 +0100 Message-Id: <20230210064216.4123807-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176977 Signed-off-by: Alexander Kanavin --- scripts/oe-setup-layers | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers index d0bc9f1667..461560de9f 100755 --- a/scripts/oe-setup-layers +++ b/scripts/oe-setup-layers @@ -46,6 +46,9 @@ def _is_layer_at_remote_uri(layerdir, remote, uri): pass return False +def _contains_submodules(layerdir): + return os.path.exists(os.path.join(layerdir,".gitmodules")) + def _do_checkout(args, json): layers = json['sources'] for l_name in layers: @@ -90,6 +93,9 @@ def _do_checkout(args, json): print("Running '{}' in {}".format(cmd, layerdir)) subprocess.check_output(cmd, shell=True, cwd=layerdir) + if _contains_submodules(layerdir): + print("Repo {} contains submodules, use 'git submodule update' to ensure they are up to date".format(layerdir)) + parser = argparse.ArgumentParser(description="A self contained python script that fetches all the needed layers and sets them to correct revisions using data in a json format from a separate file. The json data can be created from an active build directory with 'bitbake-layers create-layers-setup destdir' and there's a sample file and a schema in meta/files/") parser.add_argument('--force-bootstraplayer-checkout', action='store_true', From patchwork Fri Feb 10 06:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19318 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 CFF7AC636D4 for ; Fri, 10 Feb 2023 06:42:53 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web11.8292.1676011363664622361 for ; Thu, 09 Feb 2023 22:42:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ukkpt5HE; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id j25so4053380wrc.4 for ; Thu, 09 Feb 2023 22:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x3XW09C4hp34AsYvgJNq1oVuLxfd8UV7A1g8vd9dhps=; b=Ukkpt5HEOnaFFLURoB03pA0XeXw/DAZ5Wj67aTtIOTE3m/DFf8QZg6SlDkWhjQy0rW kiob9nP+PZa25On2l6SUDqEUT1KxzFkw6Vxnzhyv8HI9JTZ4x7Th7xl8lt48kA/P9O2k s4mRDf0bDrxJ7N3y33VSusVvsiNVbbZqJ7WPNOnO94Twpp7ojiFC4Iju2FuQlGvSW7RU A+hD9vsOGHKEiowdnJEgn2Jk4EcCDIcrwAAQ4vPVRYxak24eP33+i7u+JrJ27xBKnUIi 1euekjuwVTLj7EReaicqjByI4b1eUFwPH4BsPZn/VKNSEm4ySOgLp9CC2Fxp05uJ/e+8 D5tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x3XW09C4hp34AsYvgJNq1oVuLxfd8UV7A1g8vd9dhps=; b=PRBQ/q4QMJ0udl4Dilo0Wkk/rHTZHivfR9Us8enYhBnQ6rO6VrTm1q4woi+w5ToRiO v17v9i5RdOF+xFF19MamBTyJ3AOVktkrrXe6UTDoMugOzp6oTSHepNeBfFb20lmnjfZn bMb2BhTs6UTZmyMjzwqcNZowmc9BUyAYQYr6wLid1Zu26uiHLI2WDG+rB+a48nWfG9op cYhBTD/m0x6RIdNilW3Kb30z9kMOeMgOs3260xsgmorsYXwkZEaltbTB9i7KxkCxOyvQ z/OZAfftAEEGlXlJN9wZWowtdGdY1BWrb4CHPbAL6CNvVs0BiEB7yoprW1c6g1fqghT5 0F5w== X-Gm-Message-State: AO0yUKUoCqxbZwY4vwE/3E48HE76Qw30aRUY4VdO6lY/9Hu+FJRWFFJi vj1pGV6+259yXkoHbLXxFBjAnYCDkUc= X-Google-Smtp-Source: AK7set+3rjEWEoxK4Yf+kd37fr9eTVzXD3Bxk6vR9VPUUBER6WiX85lzry7ZeVTAfqCpvQzJnS+xCQ== X-Received: by 2002:a5d:4a42:0:b0:2c4:68e:7391 with SMTP id v2-20020a5d4a42000000b002c4068e7391mr7192377wrs.21.1676011361921; Thu, 09 Feb 2023 22:42:41 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:41 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/8] go: update 1.19.4 -> 1.20 Date: Fri, 10 Feb 2023 07:42:12 +0100 Message-Id: <20230210064216.4123807-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176979 No longer package go-runtime-staticdev into sdk packagegroup, as go-runtime 1.20 doesn't build the static bits anymore (possibly can be enabled via build config, if proven necessary). Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../packagegroup-go-sdk-target.bb | 1 - meta/recipes-devtools/go/go-1.19.4.inc | 18 ------- meta/recipes-devtools/go/go-1.20.inc | 18 +++++++ ...ive_1.19.4.bb => go-binary-native_1.20.bb} | 6 +-- ...an_1.19.4.bb => go-cross-canadian_1.20.bb} | 0 .../{go-cross_1.19.4.bb => go-cross_1.20.bb} | 0 ...crosssdk_1.19.4.bb => go-crosssdk_1.20.bb} | 0 ...{go-native_1.19.4.bb => go-native_1.20.bb} | 0 ...o-runtime_1.19.4.bb => go-runtime_1.20.bb} | 0 ...ent-based-hash-generation-less-pedan.patch | 52 ++++++++++--------- ...OLDIR-to-be-overridden-in-the-envir.patch} | 35 +++++++------ ...-ld-add-soname-to-shareable-objects.patch} | 16 +++--- ...e-CC-when-building-dist-and-go_boot.patch} | 17 +++--- ...ist-separate-host-and-target-builds.patch} | 52 +++++++++---------- ...-go-make-GOROOT-precious-by-default.patch} | 29 +++++++---- ...ot-write-linker-flags-into-buildids.patch} | 13 +++-- ...dgo.go-do-not-hardcode-host-compile.patch} | 15 ++++-- ...ild-paths-on-staticly-linked-arches.patch} | 16 +++--- .../go/{go_1.19.4.bb => go_1.20.bb} | 0 20 files changed, 160 insertions(+), 130 deletions(-) delete mode 100644 meta/recipes-devtools/go/go-1.19.4.inc create mode 100644 meta/recipes-devtools/go/go-1.20.inc rename meta/recipes-devtools/go/{go-binary-native_1.19.4.bb => go-binary-native_1.20.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.19.4.bb => go-cross-canadian_1.20.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.19.4.bb => go-cross_1.20.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.19.4.bb => go-crosssdk_1.20.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.19.4.bb => go-native_1.20.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.19.4.bb => go-runtime_1.20.bb} (100%) rename meta/recipes-devtools/go/go/{0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch => 0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch} (59%) rename meta/recipes-devtools/go/go/{0004-ld-add-soname-to-shareable-objects.patch => 0003-ld-add-soname-to-shareable-objects.patch} (80%) rename meta/recipes-devtools/go/go/{0005-make.bash-override-CC-when-building-dist-and-go_boot.patch => 0004-make.bash-override-CC-when-building-dist-and-go_boot.patch} (79%) rename meta/recipes-devtools/go/go/{0006-cmd-dist-separate-host-and-target-builds.patch => 0005-cmd-dist-separate-host-and-target-builds.patch} (89%) rename meta/recipes-devtools/go/go/{0007-cmd-go-make-GOROOT-precious-by-default.patch => 0006-cmd-go-make-GOROOT-precious-by-default.patch} (75%) rename meta/recipes-devtools/go/go/{0001-exec.go-do-not-write-linker-flags-into-buildids.patch => 0007-exec.go-do-not-write-linker-flags-into-buildids.patch} (70%) rename meta/recipes-devtools/go/go/{0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch => 0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch} (79%) rename meta/recipes-devtools/go/go/{filter-build-paths.patch => 0009-go-Filter-build-paths-on-staticly-linked-arches.patch} (85%) rename meta/recipes-devtools/go/{go_1.19.4.bb => go_1.20.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 9236f8bf37..76e30aa002 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%" QEMUVERSION ?= "7.2%" -GOVERSION ?= "1.19%" +GOVERSION ?= "1.20%" LLVMVERSION ?= "15.%" RUSTVERSION ?= "1.67%" diff --git a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb index 61629d273c..c03918acc8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb @@ -6,7 +6,6 @@ RDEPENDS:${PN} = " \ go \ go-runtime \ go-runtime-dev \ - go-runtime-staticdev \ " COMPATIBLE_HOST = "^(?!riscv32).*" diff --git a/meta/recipes-devtools/go/go-1.19.4.inc b/meta/recipes-devtools/go/go-1.19.4.inc deleted file mode 100644 index 49349ba6ec..0000000000 --- a/meta/recipes-devtools/go/go-1.19.4.inc +++ /dev/null @@ -1,18 +0,0 @@ -require go-common.inc - -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" - -SRC_URI += "\ - file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \ - file://0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch \ - file://0004-ld-add-soname-to-shareable-objects.patch \ - file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \ - file://0006-cmd-dist-separate-host-and-target-builds.patch \ - file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ - file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \ - file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ - file://filter-build-paths.patch \ -" -SRC_URI[main.sha256sum] = "eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368" diff --git a/meta/recipes-devtools/go/go-1.20.inc b/meta/recipes-devtools/go/go-1.20.inc new file mode 100644 index 0000000000..139f8d1f3c --- /dev/null +++ b/meta/recipes-devtools/go/go-1.20.inc @@ -0,0 +1,18 @@ +require go-common.inc + +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" + +SRC_URI += "\ + file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \ + file://0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch \ + file://0003-ld-add-soname-to-shareable-objects.patch \ + file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ + file://0005-cmd-dist-separate-host-and-target-builds.patch \ + file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ + file://0007-exec.go-do-not-write-linker-flags-into-buildids.patch \ + file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ + file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ +" +SRC_URI[main.sha256sum] = "3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33" diff --git a/meta/recipes-devtools/go/go-binary-native_1.19.4.bb b/meta/recipes-devtools/go/go-binary-native_1.20.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.19.4.bb rename to meta/recipes-devtools/go/go-binary-native_1.20.bb index 8dc8bdf8e2..ee6b84c4f5 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.19.4.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.20.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "c9c08f783325c4cf840a94333159cc937f05f75d36a8b307951d5bd959cf2ab8" -SRC_URI[go_linux_arm64.sha256sum] = "9df122d6baf6f2275270306b92af3b09d7973fb1259257e284dba33c0db14f1b" -SRC_URI[go_linux_ppc64le.sha256sum] = "fbc6c7d1d169bbdc82223d861d2fadc6add01c126533d3efbba3fdca9b362035" +SRC_URI[go_linux_amd64.sha256sum] = "5a9ebcc65c1cce56e0d2dc616aff4c4cedcfbda8cc6f0288cc08cda3b18dcbf1" +SRC_URI[go_linux_arm64.sha256sum] = "17700b6e5108e2a2c3b1a43cd865d3f9c66b7f1c5f0cec26d3672cc131cc0994" +SRC_URI[go_linux_ppc64le.sha256sum] = "bccbf89c83e0aab2911e57217159bf0fc49bb07c6eebd2c23ae30af18fc5368b" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.19.4.bb b/meta/recipes-devtools/go/go-cross-canadian_1.20.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.19.4.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.20.bb diff --git a/meta/recipes-devtools/go/go-cross_1.19.4.bb b/meta/recipes-devtools/go/go-cross_1.20.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.19.4.bb rename to meta/recipes-devtools/go/go-cross_1.20.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.19.4.bb b/meta/recipes-devtools/go/go-crosssdk_1.20.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.19.4.bb rename to meta/recipes-devtools/go/go-crosssdk_1.20.bb diff --git a/meta/recipes-devtools/go/go-native_1.19.4.bb b/meta/recipes-devtools/go/go-native_1.20.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.19.4.bb rename to meta/recipes-devtools/go/go-native_1.20.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.19.4.bb b/meta/recipes-devtools/go/go-runtime_1.20.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.19.4.bb rename to meta/recipes-devtools/go/go-runtime_1.20.bb diff --git a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch index 43be5cd2e8..56487e34e3 100644 --- a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -1,7 +1,7 @@ -From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001 +From 10766ca6f4007b96e3f6bf4fb496e5df74397eb9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 28 Mar 2022 10:59:03 -0700 -Subject: [PATCH] cmd/go: make content-based hash generation less pedantic +Subject: [PATCH 1/9] cmd/go: make content-based hash generation less pedantic Go 1.10's build tool now uses content-based hashes to determine when something should be built or re-built. @@ -25,19 +25,18 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alex Kube Signed-off-by: Matt Madison Signed-off-by: Khem Raj - --- src/cmd/go/internal/envcmd/env.go | 2 +- - src/cmd/go/internal/work/exec.go | 42 ++++++++++++++++++++++++------- - 2 files changed, 34 insertions(+), 10 deletions(-) + src/cmd/go/internal/work/exec.go | 44 ++++++++++++++++++++++++------- + 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 81ee859..2db3898 100644 +index 66ef5ce..fb7448a 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar { - func ExtraEnvVarsCostly() []cfg.EnvVar { - b := work.NewBuilder("") +@@ -183,7 +183,7 @@ func ExtraEnvVarsCostly() []cfg.EnvVar { + } + }() - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) @@ -45,10 +44,10 @@ index 81ee859..2db3898 100644 // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index c88b315..a06455c 100644 +index d6fa847..7e4fcb3 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -213,6 +213,8 @@ func (b *Builder) Do(ctx context.Context, root *Action) { +@@ -223,6 +223,8 @@ func (b *Builder) Do(ctx context.Context, root *Action) { writeActionGraph() } @@ -57,7 +56,7 @@ index c88b315..a06455c 100644 // buildActionID computes the action ID for a build action. func (b *Builder) buildActionID(a *Action) cache.ActionID { p := a.Package -@@ -234,7 +236,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { +@@ -244,7 +246,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { if p.Module != nil { fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) } @@ -66,7 +65,7 @@ index c88b315..a06455c 100644 // The Go compiler always hides the exact value of $GOROOT // when building things in GOROOT. // -@@ -266,9 +268,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { +@@ -276,9 +278,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { } if len(p.CgoFiles)+len(p.SwigFiles)+len(p.SwigCXXFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -78,14 +77,14 @@ index c88b315..a06455c 100644 fmt.Fprintf(h, "CC=%q %q %q %q\n", ccExe, cppflags, cflags, ldflags) // Include the C compiler tool ID so that if the C // compiler changes we rebuild the package. -@@ -281,14 +283,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - } +@@ -286,14 +288,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + fmt.Fprintf(h, "CC ID=%q\n", ccID) } if len(p.CXXFiles)+len(p.SwigCXXFiles) > 0 { - cxxExe := b.cxxExe() + cxxExe := filterCompilerFlags(b.cxxExe(), true) fmt.Fprintf(h, "CXX=%q %q\n", cxxExe, cxxflags) - if cxxID, err := b.gccToolID(cxxExe[0], "c++"); err == nil { + if cxxID, _, err := b.gccToolID(cxxExe[0], "c++"); err == nil { fmt.Fprintf(h, "CXX ID=%q\n", cxxID) } } @@ -93,9 +92,9 @@ index c88b315..a06455c 100644 - fcExe := b.fcExe() + fcExe := filterCompilerFlags(b.fcExe(), true) fmt.Fprintf(h, "FC=%q %q\n", fcExe, fflags) - if fcID, err := b.gccToolID(fcExe[0], "f95"); err == nil { + if fcID, _, err := b.gccToolID(fcExe[0], "f95"); err == nil { fmt.Fprintf(h, "FC ID=%q\n", fcID) -@@ -305,7 +307,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { +@@ -310,7 +312,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { } } if p.Internal.BuildInfo != "" { @@ -104,7 +103,7 @@ index c88b315..a06455c 100644 } // Configuration specific to compiler toolchain. -@@ -2705,8 +2707,25 @@ func envList(key, def string) []string { +@@ -2970,8 +2972,25 @@ func envList(key, def string) []string { return args } @@ -128,11 +127,11 @@ index c88b315..a06455c 100644 // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. -func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) { +func (b *Builder) CFlags(p *load.Package, filtered bool) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) { - defaults := "-g -O2" - if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2724,6 +2743,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l - if ldflags, err = buildFlags("LDFLAGS", defaults, p.CgoLDFLAGS, checkLinkerFlags); err != nil { + return + } +@@ -2987,6 +3006,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l + if ldflags, err = buildFlags("LDFLAGS", defaultCFlags, p.CgoLDFLAGS, checkLinkerFlags); err != nil { return } + if filtered { @@ -145,7 +144,7 @@ index c88b315..a06455c 100644 return } -@@ -2739,7 +2765,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -3002,7 +3028,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -154,7 +153,7 @@ index c88b315..a06455c 100644 if err != nil { return nil, nil, err } -@@ -3246,7 +3272,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -3510,7 +3536,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -163,3 +162,6 @@ index c88b315..a06455c 100644 if err != nil { return "", "", err } +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch similarity index 59% rename from meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch index 30068d8e74..6abd424733 100644 --- a/meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch @@ -1,7 +1,8 @@ -From 7e0136a882757da0a374ab8592209586eced0e1c Mon Sep 17 00:00:00 2001 +From 5cca2fa5997292a87302bdc7e7ed3231371e98bd Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:15:37 +0430 -Subject: [PATCH] cmd/go: Allow GOTOOLDIR to be overridden in the environment +Subject: [PATCH 2/9] cmd/go: Allow GOTOOLDIR to be overridden in the + environment to allow for split host/target build roots @@ -12,14 +13,13 @@ Matt Madison . Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube - --- src/cmd/dist/build.go | 4 +++- src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 7c44c4a..3024d0c 100644 +index c36a12e..5d31718 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -264,7 +264,9 @@ func xinit() { @@ -34,19 +34,22 @@ index 7c44c4a..3024d0c 100644 // compilerEnv returns a map from "goos/goarch" to the diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index c6ddfe5..605adb1 100644 +index 3257140..bb46253 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -162,7 +162,11 @@ func SetGOROOT(goroot string) { - // variables. This matches the initialization of ToolDir in - // go/build, except for using BuildContext.GOROOT rather than - // runtime.GOROOT. -- build.ToolDir = filepath.Join(goroot, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+ if s := os.Getenv("GOTOOLDIR"); s != "" { -+ build.ToolDir = filepath.Clean(s) -+ } else { -+ build.ToolDir = filepath.Join(goroot, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+ } +@@ -229,7 +229,11 @@ func SetGOROOT(goroot string, isTestGo bool) { + // This matches the initialization of ToolDir in go/build, except for + // using ctxt.GOROOT and the installed GOOS and GOARCH rather than the + // GOROOT, GOOS, and GOARCH reported by the runtime package. +- build.ToolDir = filepath.Join(GOROOTpkg, "tool", installedGOOS+"_"+installedGOARCH) ++ if s := os.Getenv("GOTOOLDIR"); s != "" { ++ build.ToolDir = filepath.Clean(s) ++ } else { ++ build.ToolDir = filepath.Join(GOROOTpkg, "tool", installedGOOS+"_"+installedGOARCH) ++ } + } } } - +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch similarity index 80% rename from meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch index b700634910..2bc7d194bb 100644 --- a/meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch @@ -1,7 +1,7 @@ -From 68867eae5d3a51f32b2a2e16374323338408781e Mon Sep 17 00:00:00 2001 +From c7536a820f713013ab1d4acef74a4c8bd970bf8f Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:16:32 +0430 -Subject: [PATCH] ld: add soname to shareable objects +Subject: [PATCH 3/9] ld: add soname to shareable objects so that OE's shared library dependency handling can find them. @@ -13,16 +13,15 @@ Matt Madison . Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube - --- src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 18910dd..b2e1d36 100644 +index c073017..e60d39a 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1459,6 +1459,7 @@ func (ctxt *Link) hostlink() { +@@ -1491,6 +1491,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -30,7 +29,7 @@ index 18910dd..b2e1d36 100644 if ctxt.HeadType == objabi.Hwindows { argv = addASLRargs(argv, *flagAslr) } else { -@@ -1474,6 +1475,7 @@ func (ctxt *Link) hostlink() { +@@ -1506,6 +1507,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -38,7 +37,7 @@ index 18910dd..b2e1d36 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1482,6 +1484,7 @@ func (ctxt *Link) hostlink() { +@@ -1514,6 +1516,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -46,3 +45,6 @@ index 18910dd..b2e1d36 100644 } } +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 79% rename from meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch index 608f1eb5a0..85e42f7660 100644 --- a/meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -1,7 +1,8 @@ -From 8f020921c464e95ded850950382115154448580a Mon Sep 17 00:00:00 2001 +From 31ff609cc3d3bfcc2f2257fda1dbaafaec31eb0b Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:17:16 +0430 -Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap +Subject: [PATCH 4/9] make.bash: override CC when building dist and + go_bootstrap for handling OE cross-canadian builds. @@ -12,16 +13,15 @@ Matt Madison . Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube - --- src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/make.bash b/src/make.bash -index ab2ce19..37ec1fb 100755 +index c07f39b..6ca7242 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -198,7 +198,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -194,7 +194,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then exit 1 fi rm -f cmd/dist/dist @@ -30,12 +30,15 @@ index ab2ce19..37ec1fb 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -223,7 +223,7 @@ fi +@@ -219,7 +219,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. - # Throw ours, built with Go 1.4, away after bootstrap. + # Throw ours, built with the bootstrap toolchain, away after bootstrap. -./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" +CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch similarity index 89% rename from meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch index 2c864baa0e..29598449da 100644 --- a/meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch @@ -1,7 +1,7 @@ -From ef5fddafdec78cab9963d21736e64d71ca520bcc Mon Sep 17 00:00:00 2001 +From 7a191e5191c8b813e929caedb3f3918bb08692a1 Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:18:12 +0430 -Subject: [PATCH] cmd/dist: separate host and target builds +Subject: [PATCH 5/9] cmd/dist: separate host and target builds Upstream-Status: Inappropriate [OE specific] @@ -34,16 +34,15 @@ the meta/recipes-devtools/go tree by Matt Madison . Signed-off-by: Alexander J Kube - --- - src/cmd/dist/build.go | 154 ++++++++++++++++++++++++++++++------------ - 1 file changed, 112 insertions(+), 42 deletions(-) + src/cmd/dist/build.go | 152 +++++++++++++++++++++++++++++++----------- + 1 file changed, 113 insertions(+), 39 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 3024d0c..45ebee0 100644 +index 5d31718..1c7f308 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -45,6 +45,7 @@ var ( +@@ -44,6 +44,7 @@ var ( goexperiment string workdir string tooldir string @@ -52,9 +51,9 @@ index 3024d0c..45ebee0 100644 oldgoarch string exe string @@ -55,6 +56,7 @@ var ( - rebuildall bool defaultclang bool + noOpt bool + crossBuild bool vflag int // verbosity @@ -69,17 +68,17 @@ index 3024d0c..45ebee0 100644 // compilerEnv returns a map from "goos/goarch" to the @@ -468,8 +472,10 @@ func setup() { - p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) + goosGoarch := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { - xremoveall(p) + xremoveall(goosGoarch) + xremoveall(build_tooldir) } - xmkdirall(p) + xmkdirall(goosGoarch) + xmkdirall(build_tooldir) - - if goos != gohostos || goarch != gohostarch { - p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1248,17 +1254,35 @@ func cmdbootstrap() { + xatexit(func() { + if files := xreaddir(goosGoarch); len(files) == 0 { + xremove(goosGoarch) +@@ -1276,17 +1282,35 @@ func cmdbootstrap() { var noBanner, noClean bool var debug bool @@ -116,23 +115,25 @@ index 3024d0c..45ebee0 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1326,8 +1350,13 @@ func cmdbootstrap() { +@@ -1354,9 +1378,14 @@ func cmdbootstrap() { xprintf("\n") } - gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now +- setNoOpt() - goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now + // For split host/target cross/cross-canadian builds, we don't + // want to be setting these flags until after we have compiled + // the toolchain that runs on the build host. + if !crossBuild { + gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now ++ setNoOpt() + goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now + } goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gorootBin) if debug { -@@ -1356,7 +1385,11 @@ func cmdbootstrap() { +@@ -1385,7 +1414,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -144,10 +145,10 @@ index 3024d0c..45ebee0 100644 + } // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT. os.Setenv("GOEXPERIMENT", goexperiment) - goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) -@@ -1395,50 +1428,84 @@ func cmdbootstrap() { + goInstall(goBootstrap, toolchain...) +@@ -1421,46 +1454,84 @@ func cmdbootstrap() { + copyfile(pathf("%s/compile3", tooldir), pathf("%s/compile", tooldir), writeExec) } - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - if goos == oldgoos && goarch == oldgoarch { - // Common case - not setting up for cross-compilation. @@ -251,22 +252,18 @@ index 3024d0c..45ebee0 100644 - xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) - } - targets := []string{"std", "cmd"} -- if goos == "js" && goarch == "wasm" { -- // Skip the cmd tools for js/wasm. They're not usable. -- targets = targets[:1] -- } - goInstall(goBootstrap, targets...) +- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - checkNotStale(goBootstrap, targets...) - checkNotStale(cmdGo, targets...) - if debug { - run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) } // Check that there are no new files in $GOROOT/bin other than -@@ -1455,8 +1522,11 @@ func cmdbootstrap() { +@@ -1477,8 +1548,11 @@ func cmdbootstrap() { } } @@ -280,3 +277,6 @@ index 3024d0c..45ebee0 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch similarity index 75% rename from meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch index 534d431045..38b28b9877 100644 --- a/meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch @@ -1,7 +1,7 @@ -From 9ba507e076c744f4d394418e4a849e68cd426a4a Mon Sep 17 00:00:00 2001 +From efab470498bb0a30ee2d00455a0c8c10459f6347 Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:18:56 +0430 -Subject: [PATCH 7/9] cmd/go: make GOROOT precious by default +Subject: [PATCH 6/9] cmd/go: make GOROOT precious by default Upstream-Status: Inappropriate [OE specific] @@ -27,9 +27,11 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) +diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go +index 8beb134..68a8cfe 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -673,6 +673,9 @@ func (b *Builder) addTransitiveLinkDeps( +@@ -718,6 +718,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -39,9 +41,11 @@ Signed-off-by: Alexander J Kube haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime +diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +index 2f2860a..8cc6166 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -197,6 +197,8 @@ See also: go install, go get, go clean. +@@ -217,6 +217,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -50,10 +54,10 @@ Signed-off-by: Alexander J Kube func init() { // break init cycle CmdBuild.Run = runBuild -@@ -209,6 +211,10 @@ func init() { - - AddBuildFlags(CmdBuild, DefaultBuildFlags) - AddBuildFlags(CmdInstall, DefaultBuildFlags) +@@ -230,6 +232,10 @@ func init() { + AddCoverFlags(CmdBuild, nil) + AddCoverFlags(CmdInstall, nil) + } + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -61,9 +65,11 @@ Signed-off-by: Alexander J Kube } // Note that flags consulted by other parts of the code +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index 7e4fcb3..d83b31b 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -535,6 +535,23 @@ func (b *Builder) build(ctx context.Cont +@@ -527,6 +527,23 @@ func (b *Builder) build(ctx context.Context, a *Action) (err error) { return errors.New("binary-only packages are no longer supported") } @@ -87,7 +93,7 @@ Signed-off-by: Alexander J Kube if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1585,6 +1602,14 @@ func (b *Builder) linkShared(ctx context +@@ -1624,6 +1641,14 @@ func (b *Builder) linkShared(ctx context.Context, a *Action) (err error) { return err } @@ -102,3 +108,6 @@ Signed-off-by: Alexander J Kube if err := b.Mkdir(a.Objdir); err != nil { return err } +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch b/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch similarity index 70% rename from meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch rename to meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch index f117152f2a..a821cf02fc 100644 --- a/meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch +++ b/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch @@ -1,7 +1,7 @@ -From bdd69b55387f80c8df18d0af5008bf5e1a66be6a Mon Sep 17 00:00:00 2001 +From 0ba747e6a4b251a0d9eed0cfd8f8c491bb508040 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 23 Nov 2020 19:22:04 +0000 -Subject: [PATCH] exec.go: do not write linker flags into buildids +Subject: [PATCH 7/9] exec.go: do not write linker flags into buildids The flags can contain build-specific paths, breaking reproducibility. @@ -14,9 +14,11 @@ Signed-off-by: Alexander Kanavin src/cmd/go/internal/work/exec.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index d83b31b..a646fbb 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -1274,7 +1274,7 @@ func (b *Builder) linkActionID(a *Action +@@ -1312,7 +1312,7 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID { } // Toolchain-dependent configuration, shared with b.linkSharedActionID. @@ -25,7 +27,7 @@ Signed-off-by: Alexander Kanavin // Input files. for _, a1 := range a.Deps { -@@ -1568,7 +1568,7 @@ func (b *Builder) linkSharedActionID(a * +@@ -1607,7 +1607,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID { fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) // Toolchain-dependent configuration, shared with b.linkActionID. @@ -34,3 +36,6 @@ Signed-off-by: Alexander Kanavin // Input files. for _, a1 := range a.Deps { +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch b/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch similarity index 79% rename from meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch rename to meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch index ef1cc6716a..fe830ce35c 100644 --- a/meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch +++ b/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch @@ -1,8 +1,8 @@ -From 2055a46b396e272616c0b2273903e02c3b49a2ff Mon Sep 17 00:00:00 2001 +From 1cbb416538a9c7c3fbedcb23f4d90d5c48becca8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 10 Nov 2020 16:33:27 +0000 -Subject: [PATCH] src/cmd/dist/buildgo.go: do not hardcode host compilers into - target binaries +Subject: [PATCH 8/9] src/cmd/dist/buildgo.go: do not hardcode host compilers + into target binaries These come from $CC/$CXX on the build host and are not useful on targets; additionally as they contain host specific paths, this helps reproducibility. @@ -13,9 +13,11 @@ Signed-off-by: Alexander Kanavin src/cmd/dist/buildgo.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go +index 29b0167..63a49f0 100644 --- a/src/cmd/dist/buildgo.go +++ b/src/cmd/dist/buildgo.go -@@ -34,8 +34,8 @@ func mkzdefaultcc(dir, file string) { +@@ -33,8 +33,8 @@ func mkzdefaultcc(dir, file string) { fmt.Fprintf(&buf, "package cfg\n") fmt.Fprintln(&buf) fmt.Fprintf(&buf, "const DefaultPkgConfig = `%s`\n", defaultpkgconfig) @@ -26,7 +28,7 @@ Signed-off-by: Alexander Kanavin writefile(buf.String(), file, writeSkipSame) return } -@@ -46,8 +46,8 @@ func mkzdefaultcc(dir, file string) { +@@ -45,8 +45,8 @@ func mkzdefaultcc(dir, file string) { fmt.Fprintf(&buf, "package main\n") fmt.Fprintln(&buf) fmt.Fprintf(&buf, "const defaultPkgConfig = `%s`\n", defaultpkgconfig) @@ -37,3 +39,6 @@ Signed-off-by: Alexander Kanavin writefile(buf.String(), file, writeSkipSame) } +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go/filter-build-paths.patch b/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch similarity index 85% rename from meta/recipes-devtools/go/go/filter-build-paths.patch rename to meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch index 280f911a21..705c922141 100644 --- a/meta/recipes-devtools/go/go/filter-build-paths.patch +++ b/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch @@ -1,7 +1,7 @@ -From 3bdbce685c688a27eece36ccc8be9b50b4849498 Mon Sep 17 00:00:00 2001 +From 18011f72125bbea273d07ee5d792ac0ce6059572 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 2 Jul 2022 23:08:13 +0100 -Subject: [PATCH] go: Filter build paths on staticly linked arches +Subject: [PATCH 9/9] go: Filter build paths on staticly linked arches Filter out build time paths from ldflags and other flags variables when they're embedded in the go binary so that builds are reproducible regardless of build @@ -11,16 +11,15 @@ on mips/ppc. Upstream-Status: Submitted [https://github.com/golang/go/pull/56410] Signed-off-by: Richard Purdie - --- src/cmd/go/internal/load/pkg.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go -index 046f508..353cbc4 100644 +index 56a4e5e..22edbdb 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go -@@ -2256,6 +2256,17 @@ func (p *Package) collectDeps() { +@@ -2266,6 +2266,17 @@ func (p *Package) collectDeps() { // to their VCS information (vcsStatusError). var vcsStatusCache par.Cache @@ -38,7 +37,7 @@ index 046f508..353cbc4 100644 // setBuildInfo gathers build information, formats it as a string to be // embedded in the binary, then sets p.Internal.BuildInfo to that string. // setBuildInfo should only be called on a main package with no errors. -@@ -2353,7 +2364,7 @@ func (p *Package) setBuildInfo(includeVCS bool) { +@@ -2372,7 +2383,7 @@ func (p *Package) setBuildInfo(autoVCS bool) { if gcflags := BuildGcflags.String(); gcflags != "" && cfg.BuildContext.Compiler == "gc" { appendSetting("-gcflags", gcflags) } @@ -47,7 +46,7 @@ index 046f508..353cbc4 100644 // https://go.dev/issue/52372: only include ldflags if -trimpath is not set, // since it can include system paths through various linker flags (notably // -extar, -extld, and -extldflags). -@@ -2392,7 +2403,7 @@ func (p *Package) setBuildInfo(includeVCS bool) { +@@ -2418,7 +2429,7 @@ func (p *Package) setBuildInfo(autoVCS bool) { // subset of flags that are known not to be paths? if cfg.BuildContext.CgoEnabled && !cfg.BuildTrimpath { for _, name := range []string{"CGO_CFLAGS", "CGO_CPPFLAGS", "CGO_CXXFLAGS", "CGO_LDFLAGS"} { @@ -56,3 +55,6 @@ index 046f508..353cbc4 100644 } } appendSetting("GOARCH", cfg.BuildContext.GOARCH) +-- +2.30.2 + diff --git a/meta/recipes-devtools/go/go_1.19.4.bb b/meta/recipes-devtools/go/go_1.20.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.19.4.bb rename to meta/recipes-devtools/go/go_1.20.bb From patchwork Fri Feb 10 06:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19313 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 0570EC636D4 for ; Fri, 10 Feb 2023 06:42:44 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.8402.1676011361482388390 for ; Thu, 09 Feb 2023 22:42:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Y+9XYhIA; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id m14so4019403wrg.13 for ; Thu, 09 Feb 2023 22:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dO2rTNt9M5SPTdraxmdJFgA/SLf6Ox8Ag3V+sourfoA=; b=Y+9XYhIAhdmh1vqxAJfAtrtNvuJSUdyo4frRdsn/jzHalX063LcedcO0ZFTKfelbOV CKEwaKQOGwmDXNQIcOI/+s/G8M72l81j69bSPDjjYkiovTeWQbd6JFtmqfuivn9kTZIc qlGJ8eJp2FOL6xpBZkmjWnWAApGyS0HHH0t19oMf3uPwdI3xZhQ/zlXPusLJcyF5Ai1n LwurlQkygyKmcxPkvm2jzcxkLovhIPxyirQbUXeBlw/uAjOOuXev0LpfFbtD3xJRdbYn 5vu1nxUZlFEU0B2Qm8krQyNkSbaRBkeK+Ev1l+uOgdqlwOwFnh/F9zTNAJq88Z00lhOq QTMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dO2rTNt9M5SPTdraxmdJFgA/SLf6Ox8Ag3V+sourfoA=; b=kHdyuCAw3QH8JXOuLlrQOjHg1RGOSiMeMCv9PfUapLsNEKgNimMLrxfthRsJvsQQhx W2nRR5OZlcaY5cZ5F5Reow9n5WGf87PRz5sn7AhnMX2FZM7GWh8JFYjKRgptr6eALHrH 5j6Sc0oBn/MJRxrqSToumACJvNn1Hr4vE6I/aos3pvRsUxM/UTd68iAvqJ7lU8DFrRhQ gk9jAv6IoeW0tYrl8Vb6qbOfm3VrCBKPt8DqRJBITbAHg8SjUF+bwuOLQ9SJrpqAQM4p 17krgbSq0VnGoXg2k5IR8/kcfCgyJliHOGSk/fbfcNtKoeVdeQCCHd8MjbvA6PWQivOZ DCNw== X-Gm-Message-State: AO0yUKWTF5MuFIjSCVZLQwaT7uHY3R9XwxllqVIkVtnCb1hgtLOJBFnT TkC8Ph2SE9yedl5IxDAvj8rQEps4ax0= X-Google-Smtp-Source: AK7set+ngTV+OO8iocxeDdOQpxGB19xxQhq1hArJppGpJ9Ju4KEdbz6HVmHOjEiDLMsEp1W7aCBMaA== X-Received: by 2002:a5d:4107:0:b0:2c5:4add:9e46 with SMTP id l7-20020a5d4107000000b002c54add9e46mr511948wrp.28.1676011362568; Thu, 09 Feb 2023 22:42:42 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:42 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/8] go-cross-canadian: use gcc-crosssdk, not gcc-native Date: Fri, 10 Feb 2023 07:42:13 +0100 Message-Id: <20230210064216.4123807-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176978 The recipe was building native go against build host headers and libraries, and then installing it as a nativesdk item, which is entirely incorrect. This has been working by coincidence (go generally uses C and C libraries lightly) but with go 1.20 this turned into hard breakage. Also nativesdk sysroot was being passed in incorrectly. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/go/go-cross-canadian.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc index c1aa987427..5a80ceffa3 100644 --- a/meta/recipes-devtools/go/go-cross-canadian.inc +++ b/meta/recipes-devtools/go/go-cross-canadian.inc @@ -21,10 +21,10 @@ export GO_LDFLAGS = '-linkmode external -extld ${HOST_PREFIX}gcc -extldflags "-- do_configure[noexec] = "1" do_compile() { - export CC_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gcc --sysroot=${STAGING_DIR_HOST}${SDKPATHNATIVE} ${SECURITY_NOPIE_CFLAGS}" - export CXX_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gxx --sysroot=${STAGING_DIR_HOST}${SDKPATHNATIVE} ${SECURITY_NOPIE_CFLAGS}" + export CC_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gcc --sysroot=${STAGING_DIR_HOST} ${SECURITY_NOPIE_CFLAGS}" + export CXX_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gxx --sysroot=${STAGING_DIR_HOST} ${SECURITY_NOPIE_CFLAGS}" cd src - ./make.bash --host-only --no-banner + ./make.bash --target-only --no-banner cd ${B} } do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" From patchwork Fri Feb 10 06:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19316 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 C7D0DC05027 for ; Fri, 10 Feb 2023 06:42:53 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web11.8293.1676011364576996530 for ; Thu, 09 Feb 2023 22:42:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VodqQonh; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so3296186wmb.5 for ; Thu, 09 Feb 2023 22:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3PVeZGpbBzjMW0pgPBcvZGBuTgf1zb3TOqe0H74QY0Y=; b=VodqQonh5Dx5ntjHxfakgUn92RRGOPw6e0t9JPArK+IYX9AAS4NFsJ8oxKpcMrNKRs AmKNikb2Tsr3QZctnQbz7sjVhKmn2z7qxLxnX/aYFGaYSszJ/IwMARhE0bqYkAcj8XBl YtStL00/sSyTl9CDGj3arAf39odwgGKkf6+UY5fq9UKmAXWWRLrR/H4FqR3IPnu3XV9Z WP33G0nPe3Qz7ODZvJxAF0KAvwAkDQbOGAmYaf0KMpKcFVTR5+ODsk8gPAuc1VfEMRSL CqNmvdcn4JzD7TjULAtnEywHo3BUcH/nXV9f8fWDjmpjZEcVZt5J/eq/4hGIlcpl3tyE 37wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3PVeZGpbBzjMW0pgPBcvZGBuTgf1zb3TOqe0H74QY0Y=; b=nRJdS/77o17xm8n0pcLElvViHIzjXK88x+N0i2u6Q+YO9C4DNOZKnhItPeMB172ocm rCYFgD6ISHtVeatMfZehdnkxVMJ6posANWV1ar6T1VVuznzKWHKZlQ04PBiO1aNP80/C iO10KjMyQFUJ/SVWLjdnY8jJJgJwQzLA1uvx8ZWV12OcqEmywlc1phiLrGK+1Cxe5SIw sdSyId2OU/SRHBXLZEQ88d7UYdmZSvRDD7rZgm1fupjN8b8FBuEHLq3pg+/cWRWnfbsJ KwJeM3VQkr5Z4aECyKD66tYyjfeSdg91sdGPyZ7L0I9zq5fJBIpYueWIk+FBZlzroA7s r1uw== X-Gm-Message-State: AO0yUKW7Y0SSZC+TI6P353zJyQuvfTX4bdpmOzSY9IPGSpe8Vgu3/LZ1 Z1JLoN25nqH0jQAxd4SNdiNA8Yb4vCo= X-Google-Smtp-Source: AK7set8UmDzOylC/Cd1voGd5DObKn1IilZpPgaxGJYMfyNaUefNQrbSGS2nRh0g74lz0pjwszOuaUg== X-Received: by 2002:a05:600c:704:b0:3df:d8c5:ec18 with SMTP id i4-20020a05600c070400b003dfd8c5ec18mr12313371wmn.13.1676011363154; Thu, 09 Feb 2023 22:42:43 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:42 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/8] vim: update 9.0.1211 -> 9.0.1293 to resolve open CVEs Date: Fri, 10 Feb 2023 07:42:14 +0100 Message-Id: <20230210064216.4123807-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176980 Signed-off-by: Alexander Kanavin --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 9bc6881fce..fcb5cf6334 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1211" -SRCREV = "f7d1c6e1884c76680980571f1cf15e0928d247b5" +PV .= ".1293" +SRCREV = "0caaf1e46511f7a92e036f05e6aa9d5992540117" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Feb 10 06:42:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19319 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 DC02CC636D6 for ; Fri, 10 Feb 2023 06:42:53 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.8291.1676011362174896044 for ; Thu, 09 Feb 2023 22:42:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ia7h0aw8; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id bk16so4023994wrb.11 for ; Thu, 09 Feb 2023 22:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xr3lqtsBjfJxHPa9jAHFsI2UA7TtKe9tpujBGhAjmzs=; b=ia7h0aw8nb6o+VEKWCArJ2ZsA4YRerGJgdD/JDcFMfA1/tVFcXSE1U+9hhUnvTrpZt a9E0j0lod/aiu4YyKNxdsEYADYGAGY96tJ8D2TLs3YSWBiEAraJL72mwgTY4ykwrHKEF p7hmgzW91EiHvtWWIGrCw5PnUhHYbPp8xwWy4D+jP7zstbVEcR0/HQUIbLcOEeOHTKYT zsZ2RWN0kLSLWxoHoaGjUpH9YOtyFTYwTCh09ibVbGh+xmlYDZhx7M7GFbgMiR4kabq0 HKEMuFoj61J2Tkjp+fn4cXqH+l9VnfmlL5nKxZiXOJrBV+l5uChQBmkmuoggpDVIB7Rl IgxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xr3lqtsBjfJxHPa9jAHFsI2UA7TtKe9tpujBGhAjmzs=; b=HuxPXjgMR3/nkqGqX/B09k1TexKDtHJU8NZ5tFgGB7ZhU4qnqmOrk3QtMVnSqF29ya MIfzhZh+iBFa+hgZiiWGACJWtorXu8y7OrwsdBZpa8GKYmvw82Iq7XPL/HU3oXroHTov 620tP5INOfh28Gv8XOfxG8XCYAZzbmmoaZsOqrjBLFaCvwNqXuTvfhGrPRllOWnXUeYR L3YoqIvAfGPHejsyudEDXVQCczS1lSeV11ZZmNqomvrDVuVK6MS9roJgTUFMJ5lLdxAx 04L6+qdmQsIZVhVaIJg/EhKIInAPTdA0hJ79nyiwvDPhnhbMKzaLFZ+MpHpR76nLSD67 +sAQ== X-Gm-Message-State: AO0yUKW9PXHxGxrjeKdl89oRllkdjW6MBlLCO2mtdrwYEXwLWryd58nC NstX0lc+zA6t68mBH8jOqVfBaiJsbho= X-Google-Smtp-Source: AK7set8FD640I9hnKNmAI+mLnxoIeOcWcJaGJgfEBT7NJVwv95byF1i8cYZA1q3g9w/xAtjMTqbrMg== X-Received: by 2002:adf:fa83:0:b0:2bf:ae16:817c with SMTP id h3-20020adffa83000000b002bfae16817cmr13197473wrr.29.1676011363769; Thu, 09 Feb 2023 22:42:43 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:43 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/8] gstreamer1.0: update 1.20.5 -> 1.22.0 Date: Fri, 10 Feb 2023 07:42:15 +0100 Message-Id: <20230210064216.4123807-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176981 Drop xingmux license snippet from plugins-ugly as it moved to plugins-good; the license was LGPL in any case: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/d132592423be64ec18a223b67810ac89f391277e/subprojects/gst-plugins-good/tests/check/elements/xingmux.c videoconvert/videoscale plgins were merged into one. Signed-off-by: Alexander Kanavin --- ...tools_1.20.5.bb => gst-devtools_1.22.0.bb} | 2 +- ...1.20.5.bb => gstreamer1.0-libav_1.22.0.bb} | 2 +- .../gstreamer/gstreamer1.0-meta-base.bb | 3 +- ...x_1.20.5.bb => gstreamer1.0-omx_1.22.0.bb} | 2 +- ....bb => gstreamer1.0-plugins-bad_1.22.0.bb} | 2 +- ...bb => gstreamer1.0-plugins-base_1.22.0.bb} | 2 +- ...bb => gstreamer1.0-plugins-good_1.22.0.bb} | 2 +- ...bb => gstreamer1.0-plugins-ugly_1.22.0.bb} | 4 +- ....20.5.bb => gstreamer1.0-python_1.22.0.bb} | 2 +- ....bb => gstreamer1.0-rtsp-server_1.22.0.bb} | 2 +- ...1.20.5.bb => gstreamer1.0-vaapi_1.22.0.bb} | 21 +- ...spect-the-idententaion-used-in-meson.patch | 24 +- ...ts-add-support-for-install-the-tests.patch | 56 ++-- ...005-bin-Fix-race-conditions-in-tests.patch | 300 ------------------ ...er1.0_1.20.5.bb => gstreamer1.0_1.22.0.bb} | 7 +- 15 files changed, 66 insertions(+), 365 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.20.5.bb => gst-devtools_1.22.0.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.20.5.bb => gstreamer1.0-libav_1.22.0.bb} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.20.5.bb => gstreamer1.0-omx_1.22.0.bb} (95%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.20.5.bb => gstreamer1.0-plugins-bad_1.22.0.bb} (98%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.20.5.bb => gstreamer1.0-plugins-base_1.22.0.bb} (97%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.20.5.bb => gstreamer1.0-plugins-good_1.22.0.bb} (97%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.20.5.bb => gstreamer1.0-plugins-ugly_1.22.0.bb} (88%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.20.5.bb => gstreamer1.0-python_1.22.0.bb} (91%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.20.5.bb => gstreamer1.0-rtsp-server_1.22.0.bb} (90%) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.20.5.bb => gstreamer1.0-vaapi_1.22.0.bb} (70%) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.20.5.bb => gstreamer1.0_1.22.0.bb} (93%) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.0.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.22.0.bb index 9db31c18e4..3e9a789d24 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.0.bb @@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "5684436121b8bae07fd00b74395f95e44b5f26323dce4fa045fa665676807bba" +SRC_URI[sha256sum] = "4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS:${PN} = "git" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb index e5925c6510..625a52ea55 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "b152e3cc49d014899f53c39d8a6224a44e1399b4cf76aa5f9a903fdf9793c3cc" +SRC_URI[sha256sum] = "0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb index 57a9adbaec..6cc11e1928 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb @@ -34,8 +34,7 @@ RDEPENDS:gstreamer1.0-meta-base = "\ gstreamer1.0-plugins-base-audioconvert \ gstreamer1.0-plugins-base-audioresample \ gstreamer1.0-plugins-base-typefindfunctions \ - gstreamer1.0-plugins-base-videoscale \ - gstreamer1.0-plugins-base-videoconvert \ + gstreamer1.0-plugins-base-videoconvertscale \ gstreamer1.0-plugins-good-autodetect \ gstreamer1.0-plugins-good-soup" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.bb index ec5efcd408..ed4c44583e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[sha256sum] = "bcccbc02548cdc123fd49944dd44a4f1adc5d107e36f010d320eb526e2107806" +SRC_URI[sha256sum] = "dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341" S = "${WORKDIR}/gst-omx-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb index 2f1793d1ce..b9fc17f3e9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb @@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363" +SRC_URI[sha256sum] = "3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1" S = "${WORKDIR}/gst-plugins-bad-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb index c37b542c57..01ef63c104 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb @@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ " -SRC_URI[sha256sum] = "11f911ef65f3095d7cf698a1ad1fc5242ac3ad6c9270465fb5c9e7f4f9c19b35" +SRC_URI[sha256sum] = "f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d" S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb similarity index 97% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb index 0bd953743e..85f8a247b1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb @@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ " -SRC_URI[sha256sum] = "e83ab4d12ca24959489bbb0ec4fac9b90e32f741d49cda357cb554b2cb8b97f9" +SRC_URI[sha256sum] = "582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0" S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb similarity index 88% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb index f765e626c9..9c384fea5c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" + " LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" LICENSE_FLAGS = "commercial" @@ -14,7 +14,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "af67d8ba7cab230f64d0594352112c2c443e2aa36a87c35f9f98a43d11430b87" +SRC_URI[sha256sum] = "a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c" S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.bb similarity index 91% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.bb index 05e9ace276..b6782a842d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "27487652318659cfd7dc42784b713c78d29cc7a7df4fb397134c8c125f65e3b2" +SRC_URI[sha256sum] = "6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.bb index c9cf42903d..f943c829c4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.bb @@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "ba398a7ddd559cce56ef4b91f448d174e0dccad98a493563d2d59c41a2ef39c5" +SRC_URI[sha256sum] = "aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed" S = "${WORKDIR}/${PNREAL}-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.bb similarity index 70% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.bb index 716f50ebe1..8a703f533e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "510c6fb4ff3f676d7946ce1800e04ccf5aabe5a586d4e164d1961808fab8c94b" +SRC_URI[sha256sum] = "593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" @@ -40,14 +40,21 @@ PACKAGECONFIG ??= "drm encoders \ ${PACKAGECONFIG_GL} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" -PACKAGECONFIG[drm] = "-Dwith_drm=yes,-Dwith_drm=no,udev libdrm" -PACKAGECONFIG[egl] = "-Dwith_egl=yes,-Dwith_egl=no,virtual/egl" -PACKAGECONFIG[encoders] = "-Dwith_encoders=yes,-Dwith_encoders=no" -PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/libgl" -PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland wayland-protocols" -PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxrandr libxrender" +PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,udev libdrm" +PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl" +PACKAGECONFIG[encoders] = "-Dencoders=enabled,-Dencoders=disabled" +PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/libgl" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxrandr libxrender" FILES:${PN} += "${libdir}/gstreamer-*/*.so" FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug" FILES:${PN}-dev += "${libdir}/gstreamer-*/*.a" FILES:${PN}-tests = "${bindir}/*" + +# correct .pc install location - fixed in upstream trunk +do_install:append() { + mkdir -p ${D}/${libdir}/pkgconfig + mv ${D}/${libdir}/gstreamer-1.0/pkgconfig/*.pc ${D}/${libdir}/pkgconfig + rmdir ${D}/${libdir}/gstreamer-1.0/pkgconfig/ +} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch index 312c04fbfd..1b9278db04 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch @@ -1,20 +1,21 @@ -From 1eb77a4ea5a3967c688d8f1192f99c605badc7e2 Mon Sep 17 00:00:00 2001 +From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 11 Apr 2021 19:48:13 +0100 -Subject: [PATCH 1/4] tests: respect the idententaion used in meson +Subject: [PATCH] tests: respect the idententaion used in meson Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] Signed-off-by: Jose Quaresma + --- - subprojects/gstreamer/tests/check/meson.build | 10 +++++----- + tests/check/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build -index 9c4228b6e4..506606684d 100644 ---- a/subprojects/gstreamer/tests/check/meson.build -+++ b/subprojects/gstreamer/tests/check/meson.build -@@ -146,11 +146,11 @@ foreach t : core_tests +diff --git a/tests/check/meson.build b/tests/check/meson.build +index 9787b0a..16caac7 100644 +--- a/tests/check/meson.build ++++ b/tests/check/meson.build +@@ -145,11 +145,11 @@ foreach t : core_tests if not skip_test exe = executable(test_name, fname, @@ -22,15 +23,12 @@ index 9c4228b6e4..506606684d 100644 - cpp_args : gst_c_args + test_defines, - include_directories : [configinc], - link_with : link_with_libs, -- dependencies : test_deps + glib_deps + gst_deps, +- dependencies : gst_deps + test_deps, + c_args : gst_c_args + test_defines, + cpp_args : gst_c_args + test_defines, + include_directories : [configinc], + link_with : link_with_libs, -+ dependencies : test_deps + glib_deps + gst_deps, ++ dependencies : gst_deps + test_deps, ) env = environment() --- -2.33.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index d18c19c397..568e38cbf1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch @@ -1,7 +1,7 @@ -From 62f5bb7bfc2498219df7280e73480d8ed2378ce5 Mon Sep 17 00:00:00 2001 +From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Sun, 11 Apr 2021 19:48:13 +0100 -Subject: [PATCH 2/4] tests: add support for install the tests +Subject: [PATCH] tests: add support for install the tests This will provide to run the tests using the gnome-desktop-testing [1] @@ -10,19 +10,20 @@ This will provide to run the tests using the gnome-desktop-testing [1] Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] Signed-off-by: Jose Quaresma + --- - subprojects/gstreamer/meson.build | 4 ++++ - subprojects/gstreamer/meson_options.txt | 1 + - subprojects/gstreamer/tests/check/meson.build | 22 ++++++++++++++++++- - .../gstreamer/tests/check/template.test.in | 3 +++ + meson.build | 4 ++++ + meson_options.txt | 1 + + tests/check/meson.build | 22 +++++++++++++++++++++- + tests/check/template.test.in | 3 +++ 4 files changed, 29 insertions(+), 1 deletion(-) - create mode 100644 subprojects/gstreamer/tests/check/template.test.in + create mode 100644 tests/check/template.test.in -diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build -index d20fe0040f..b595d8f990 100644 ---- a/subprojects/gstreamer/meson.build -+++ b/subprojects/gstreamer/meson.build -@@ -562,6 +562,10 @@ if bashcomp_dep.found() +diff --git a/meson.build b/meson.build +index f9f591d..3906fb3 100644 +--- a/meson.build ++++ b/meson.build +@@ -606,6 +606,10 @@ if bashcomp_dep.found() endif endif @@ -33,10 +34,10 @@ index d20fe0040f..b595d8f990 100644 plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') pkgconfig = import('pkgconfig') -diff --git a/subprojects/gstreamer/meson_options.txt b/subprojects/gstreamer/meson_options.txt -index 7363bdb7a1..a34ba37dad 100644 ---- a/subprojects/gstreamer/meson_options.txt -+++ b/subprojects/gstreamer/meson_options.txt +diff --git a/meson_options.txt b/meson_options.txt +index 7363bdb..a34ba37 100644 +--- a/meson_options.txt ++++ b/meson_options.txt @@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso option('memory-alignment', type: 'combo', choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], @@ -45,10 +46,10 @@ index 7363bdb7a1..a34ba37dad 100644 # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') -diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build -index 506606684d..00a138a568 100644 ---- a/subprojects/gstreamer/tests/check/meson.build -+++ b/subprojects/gstreamer/tests/check/meson.build +diff --git a/tests/check/meson.build b/tests/check/meson.build +index 16caac7..f2d400f 100644 +--- a/tests/check/meson.build ++++ b/tests/check/meson.build @@ -124,10 +124,16 @@ test_defines = [ '-UG_DISABLE_ASSERT', '-UG_DISABLE_CAST_CHECKS', @@ -67,16 +68,16 @@ index 506606684d..00a138a568 100644 # sanity checking if get_option('check').disabled() if get_option('tests').enabled() -@@ -151,6 +157,8 @@ foreach t : core_tests +@@ -150,6 +156,8 @@ foreach t : core_tests include_directories : [configinc], link_with : link_with_libs, - dependencies : test_deps + glib_deps + gst_deps, + dependencies : gst_deps + test_deps, + install_dir: installed_tests_execdir, + install: installed_tests_enabled, ) env = environment() -@@ -162,6 +170,18 @@ foreach t : core_tests +@@ -161,6 +169,18 @@ foreach t : core_tests env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') @@ -95,15 +96,12 @@ index 506606684d..00a138a568 100644 test(test_name, exe, env: env, timeout : 3 * 60) endif endforeach -diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in +diff --git a/tests/check/template.test.in b/tests/check/template.test.in new file mode 100644 -index 0000000000..f701627f87 +index 0000000..f701627 --- /dev/null -+++ b/subprojects/gstreamer/tests/check/template.test.in ++++ b/tests/check/template.test.in @@ -0,0 +1,3 @@ +[Test] +Type=session +Exec=@installed_tests_dir@/@program@ --- -2.33.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch deleted file mode 100644 index f1fac2df57..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch +++ /dev/null @@ -1,300 +0,0 @@ -From e1e2d8d58c1e09e065849cdb1f6466c0537a7c51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Tue, 21 Jun 2022 11:51:35 +0300 -Subject: [PATCH] bin: Fix race conditions in tests - -The latency messages are non-deterministic and can arrive before/after -async-done or during state-changes as they are posted by e.g. sinks from -their streaming thread but bins are finishing asynchronous state changes -from a secondary helper thread. - -To solve this, expect latency messages at any time and assert that we -receive one at some point during the test. - -Part-of: - -Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2643] -Signed-off-by: Jose Quaresma ---- - .../gstreamer/tests/check/gst/gstbin.c | 132 ++++++++++++------ - 1 file changed, 92 insertions(+), 40 deletions(-) - -diff --git a/subprojects/gstreamer/tests/check/gst/gstbin.c b/subprojects/gstreamer/tests/check/gst/gstbin.c -index e366d5fe20f..88ff44db0c3 100644 ---- a/subprojects/gstreamer/tests/check/gst/gstbin.c -+++ b/subprojects/gstreamer/tests/check/gst/gstbin.c -@@ -27,50 +27,95 @@ - #include - - static void --pop_async_done (GstBus * bus) -+pop_async_done (GstBus * bus, gboolean * had_latency) - { - GstMessage *message; -+ GstMessageType types = GST_MESSAGE_ASYNC_DONE; -+ -+ if (!*had_latency) -+ types |= GST_MESSAGE_LATENCY; - - GST_DEBUG ("popping async-done message"); -- message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1); - -- fail_unless (message && GST_MESSAGE_TYPE (message) -- == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -+ do { -+ message = gst_bus_poll (bus, types, -1); - -- gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ fail_unless (message); -+ GST_DEBUG ("popped message %s", -+ gst_message_type_get_name (GST_MESSAGE_TYPE (message))); -+ -+ if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) { -+ fail_unless (*had_latency == FALSE); -+ *had_latency = TRUE; -+ gst_clear_message (&message); -+ types &= ~GST_MESSAGE_LATENCY; -+ continue; -+ } -+ -+ fail_unless (GST_MESSAGE_TYPE (message) -+ == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -+ -+ gst_clear_message (&message); -+ break; -+ } while (TRUE); - } - - static void --pop_latency (GstBus * bus) -+pop_latency (GstBus * bus, gboolean * had_latency) - { - GstMessage *message; - -- GST_DEBUG ("popping async-done message"); -+ if (*had_latency) -+ return; -+ -+ GST_DEBUG ("popping latency message"); - message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); - -- fail_unless (message && GST_MESSAGE_TYPE (message) -+ fail_unless (message); -+ fail_unless (GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); - -- gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped message %s", -+ gst_message_type_get_name (GST_MESSAGE_TYPE (message))); -+ gst_clear_message (&message); -+ -+ *had_latency = TRUE; - } - - static void --pop_state_changed (GstBus * bus, int count) -+pop_state_changed (GstBus * bus, int count, gboolean * had_latency) - { - GstMessage *message; -- -+ GstMessageType types = GST_MESSAGE_STATE_CHANGED; - int i; - -+ if (!*had_latency) -+ types |= GST_MESSAGE_LATENCY; -+ - GST_DEBUG ("popping %d messages", count); - for (i = 0; i < count; ++i) { -- message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); -- -- fail_unless (message && GST_MESSAGE_TYPE (message) -- == GST_MESSAGE_STATE_CHANGED, "did not get GST_MESSAGE_STATE_CHANGED"); -- -- gst_message_unref (message); -+ do { -+ message = gst_bus_poll (bus, types, -1); -+ -+ fail_unless (message); -+ GST_DEBUG ("popped message %s", -+ gst_message_type_get_name (GST_MESSAGE_TYPE (message))); -+ -+ if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_LATENCY) { -+ fail_unless (*had_latency == FALSE); -+ *had_latency = TRUE; -+ gst_clear_message (&message); -+ types &= ~GST_MESSAGE_LATENCY; -+ continue; -+ } -+ -+ fail_unless (GST_MESSAGE_TYPE (message) -+ == GST_MESSAGE_STATE_CHANGED, -+ "did not get GST_MESSAGE_STATE_CHANGED"); -+ -+ gst_message_unref (message); -+ break; -+ } while (TRUE); - } - GST_DEBUG ("popped %d messages", count); - } -@@ -538,6 +583,7 @@ GST_START_TEST (test_message_state_changed_children) - GstBus *bus; - GstStateChangeReturn ret; - GstState current, pending; -+ gboolean had_latency = FALSE; - - pipeline = GST_PIPELINE (gst_pipeline_new (NULL)); - fail_unless (pipeline != NULL, "Could not create pipeline"); -@@ -576,7 +622,7 @@ GST_START_TEST (test_message_state_changed_children) - ASSERT_OBJECT_REFCOUNT (sink, "sink", 2); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 2); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - fail_if (gst_bus_have_pending (bus), "unexpected pending messages"); - - ASSERT_OBJECT_REFCOUNT (bus, "bus", 2); -@@ -619,9 +665,9 @@ GST_START_TEST (test_message_state_changed_children) - * its state_change message */ - ASSERT_OBJECT_REFCOUNT_BETWEEN (pipeline, "pipeline", 3, 4); - -- pop_state_changed (bus, 3); -- pop_async_done (bus); -- pop_latency (bus); -+ pop_state_changed (bus, 3, &had_latency); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - fail_if ((gst_bus_pop (bus)) != NULL); - - ASSERT_OBJECT_REFCOUNT_BETWEEN (bus, "bus", 2, 3); -@@ -648,7 +694,7 @@ GST_START_TEST (test_message_state_changed_children) - ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 4); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - fail_if ((gst_bus_pop (bus)) != NULL); - - ASSERT_OBJECT_REFCOUNT (bus, "bus", 2); -@@ -669,7 +715,7 @@ GST_START_TEST (test_message_state_changed_children) - ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 3, 4); - ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); - -- pop_state_changed (bus, 6); -+ pop_state_changed (bus, 6, &had_latency); - fail_if ((gst_bus_pop (bus)) != NULL); - - ASSERT_OBJECT_REFCOUNT (src, "src", 1); -@@ -696,6 +742,7 @@ GST_START_TEST (test_watch_for_state_change) - GstElement *src, *sink, *bin; - GstBus *bus; - GstStateChangeReturn ret; -+ gboolean had_latency = FALSE; - - bin = gst_element_factory_make ("bin", NULL); - fail_unless (bin != NULL, "Could not create bin"); -@@ -722,9 +769,9 @@ GST_START_TEST (test_watch_for_state_change) - GST_CLOCK_TIME_NONE); - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); - -- pop_state_changed (bus, 6); -- pop_async_done (bus); -- pop_latency (bus); -+ pop_state_changed (bus, 6, &had_latency); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - - fail_unless (gst_bus_have_pending (bus) == FALSE, - "Unexpected messages on bus"); -@@ -732,16 +779,17 @@ GST_START_TEST (test_watch_for_state_change) - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - -+ had_latency = FALSE; - /* this one might return either SUCCESS or ASYNC, likely SUCCESS */ - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); - gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE); - -- pop_state_changed (bus, 3); -+ pop_state_changed (bus, 3, &had_latency); - if (ret == GST_STATE_CHANGE_ASYNC) { -- pop_async_done (bus); -- pop_latency (bus); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - } - - fail_unless (gst_bus_have_pending (bus) == FALSE, -@@ -898,6 +946,7 @@ GST_START_TEST (test_children_state_change_order_flagged_sink) - GstStateChangeReturn ret; - GstState current, pending; - GstBus *bus; -+ gboolean had_latency = FALSE; - - pipeline = gst_pipeline_new (NULL); - fail_unless (pipeline != NULL, "Could not create pipeline"); -@@ -951,10 +1000,11 @@ GST_START_TEST (test_children_state_change_order_flagged_sink) - ASSERT_STATE_CHANGE_MSG (bus, sink, GST_STATE_READY, GST_STATE_PAUSED, 107); - #else - -- pop_state_changed (bus, 2); /* pop remaining ready => paused messages off the bus */ -+ pop_state_changed (bus, 2, &had_latency); /* pop remaining ready => paused messages off the bus */ - ASSERT_STATE_CHANGE_MSG (bus, pipeline, GST_STATE_READY, GST_STATE_PAUSED, - 108); -- pop_async_done (bus); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - #endif - /* PAUSED => PLAYING */ - GST_DEBUG ("popping PAUSED -> PLAYING messages"); -@@ -972,8 +1022,8 @@ GST_START_TEST (test_children_state_change_order_flagged_sink) - fail_if (ret != GST_STATE_CHANGE_SUCCESS, "State change to READY failed"); - - /* TODO: do we need to check downwards state change order as well? */ -- pop_state_changed (bus, 4); /* pop playing => paused messages off the bus */ -- pop_state_changed (bus, 4); /* pop paused => ready messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop playing => paused messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop paused => ready messages off the bus */ - - while (GST_OBJECT_REFCOUNT_VALUE (pipeline) > 1) - THREAD_SWITCH (); -@@ -1002,6 +1052,7 @@ GST_START_TEST (test_children_state_change_order_semi_sink) - GstStateChangeReturn ret; - GstState current, pending; - GstBus *bus; -+ gboolean had_latency = FALSE; - - /* (2) Now again, but check other code path where we don't have - * a proper sink correctly flagged as such, but a 'semi-sink' */ -@@ -1056,10 +1107,11 @@ GST_START_TEST (test_children_state_change_order_semi_sink) - ASSERT_STATE_CHANGE_MSG (bus, src, GST_STATE_READY, GST_STATE_PAUSED, 206); - ASSERT_STATE_CHANGE_MSG (bus, sink, GST_STATE_READY, GST_STATE_PAUSED, 207); - #else -- pop_state_changed (bus, 2); /* pop remaining ready => paused messages off the bus */ -+ pop_state_changed (bus, 2, &had_latency); /* pop remaining ready => paused messages off the bus */ - ASSERT_STATE_CHANGE_MSG (bus, pipeline, GST_STATE_READY, GST_STATE_PAUSED, - 208); -- pop_async_done (bus); -+ pop_async_done (bus, &had_latency); -+ pop_latency (bus, &had_latency); - - /* PAUSED => PLAYING */ - GST_DEBUG ("popping PAUSED -> PLAYING messages"); -@@ -1076,8 +1128,8 @@ GST_START_TEST (test_children_state_change_order_semi_sink) - fail_if (ret != GST_STATE_CHANGE_SUCCESS, "State change to READY failed"); - - /* TODO: do we need to check downwards state change order as well? */ -- pop_state_changed (bus, 4); /* pop playing => paused messages off the bus */ -- pop_state_changed (bus, 4); /* pop paused => ready messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop playing => paused messages off the bus */ -+ pop_state_changed (bus, 4, &had_latency); /* pop paused => ready messages off the bus */ - - GST_DEBUG ("waiting for pipeline to reach refcount 1"); - while (GST_OBJECT_REFCOUNT_VALUE (pipeline) > 1) --- -GitLab - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb similarity index 93% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.5.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb index ce9c1c116f..2f80b9ee3e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb @@ -17,13 +17,12 @@ S = "${WORKDIR}/gstreamer-${PV}" SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ file://run-ptest \ - file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \ - file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \ + file://0001-tests-respect-the-idententaion-used-in-meson.patch \ + file://0002-tests-add-support-for-install-the-tests.patch \ file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ - file://0005-bin-Fix-race-conditions-in-tests.patch;striplevel=3 \ " -SRC_URI[sha256sum] = "5a19083faaf361d21fc391124f78ba6d609be55845a82fa8f658230e5fa03dff" +SRC_URI[sha256sum] = "78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ From patchwork Fri Feb 10 06:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 19317 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 C7DBEC636CD for ; Fri, 10 Feb 2023 06:42:53 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.8402.1676011361482388390 for ; Thu, 09 Feb 2023 22:42:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=X1oWS+pQ; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id m14so4019448wrg.13 for ; Thu, 09 Feb 2023 22:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wHw6JqItf2/bJH3AFlfEx04CzsL9lAFOdMoOFikqC0g=; b=X1oWS+pQV0yEPwvA3V9JU/Godb8S7NkR/X26Q7+HmxgERYFB73JJ/bXfUeGHvdKPRU hoSXZtk7tp0I8b2QCnc8ouH9Ft8nZC54tyArqSzoWQlm1SNOqwNk+kWjb4PUoVTxF2I9 gBiSE2GAyIuUr8ydC+TcpMCj+nH8DajZmCJ3e5fikmjmteRAqfmZ1IjFZ4vB1eu52hUX v2Sz+mggXGwkPUtLLjEvXfN6fjliIBp39ETg60Bq7JI1+R4NikpPInnx8GgSgTnOZkpw t71RZiQmlvLYEhP4Dp6GO8fQRKNZzJuRo37oeo5L5SdT/YpP13uMbTXq5mYguHb7s+Iz k3hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wHw6JqItf2/bJH3AFlfEx04CzsL9lAFOdMoOFikqC0g=; b=WzSql1zgCkuuPdscw4iPQyPu0Mavf2imGY2qw2yZC02qI/B89PXIV2ZnaQgLg3J2Se KmhyKXHWWpmbG1mR4+XxQKf9ucTKyf3GQv9Nnl86X1s7D5Eb185YDEbOEf7Q0yEtUcVe rD/KtrvIZxIaofLntowY0JjUY+7kWjcWs2q3uxyDCUeCRcDSwT177sSPX+EqZ/FTg53G OmKASPxF0pH7BTqNOB5ak9sZ03nBL8+DnSDPGyGFLFf5OCsUpVbL1tesNKXDgwfroqDb 9bRAVsiF0WFxqToLgyR3I+SRzKWbxOFFNqhlZ89Xrvyg9ODmA1UAhORZTIcttnD7XprY bDag== X-Gm-Message-State: AO0yUKU23EaTOA4S1KIFVpty9ZRBvzrkcZ4uwK/06YwpYzQWp4JfJu16 gqdat0dCDrHevOp9skwwoizgvnfSZOU= X-Google-Smtp-Source: AK7set/+YqhEddemTj27o7k6xlG1VJ/F3HT7GV5xPEWSjwev/4IIl29gvdGXeM/L7kHiLF/EsKEWtA== X-Received: by 2002:adf:fbc2:0:b0:2c3:d707:7339 with SMTP id d2-20020adffbc2000000b002c3d7077339mr6020791wrs.6.1676011364348; Thu, 09 Feb 2023 22:42:44 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id y15-20020adfee0f000000b002c3efca57e1sm2896993wrn.110.2023.02.09.22.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:42:44 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 8/8] mesa: update 22.3.3 -> 22.3.5 Date: Fri, 10 Feb 2023 07:42:16 +0100 Message-Id: <20230210064216.4123807-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210064216.4123807-1-alex@linutronix.de> References: <20230210064216.4123807-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Feb 2023 06:42:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/176982 Signed-off-by: Alexander Kanavin --- ...ove-fix-ALWAYS_INLINE-compiler-error.patch | 36 ------------------- .../{mesa-gl_22.3.3.bb => mesa-gl_22.3.5.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 3 +- .../mesa/{mesa_22.3.3.bb => mesa_22.3.5.bb} | 0 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch rename meta/recipes-graphics/mesa/{mesa-gl_22.3.3.bb => mesa-gl_22.3.5.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_22.3.3.bb => mesa_22.3.5.bb} (100%) diff --git a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch b/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch deleted file mode 100644 index 1cf23492fe..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00 2001 -From: t0b3 -Date: Sat, 10 Dec 2022 14:32:53 +0100 -Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error - -Reviewed-by: Iago Toral Quiroga -Reviewed-by: Adam Jackson -Closes: #6825 -Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ") -Part-of: - -Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911] ---- - src/compiler/nir/nir_opt_move.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c -index 81bcde5c436..9aeb9f4cf86 100644 ---- a/src/compiler/nir/nir_opt_move.c -+++ b/src/compiler/nir/nir_opt_move.c -@@ -51,13 +51,13 @@ - * lower register pressure. - */ - --static ALWAYS_INLINE bool -+static inline bool - src_is_ssa(nir_src *src, void *state) - { - return src->is_ssa; - } - --static ALWAYS_INLINE bool -+static inline bool - instr_reads_register(nir_instr *instr) - { - return !nir_foreach_src(instr, src_is_ssa, NULL); diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index cc4aa5eeab..0a3dc1dd62 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -19,10 +19,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ - file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \ " -SRC_URI[sha256sum] = "bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922" +SRC_URI[sha256sum] = "3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_22.3.3.bb b/meta/recipes-graphics/mesa/mesa_22.3.5.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_22.3.3.bb rename to meta/recipes-graphics/mesa/mesa_22.3.5.bb