{"id":18377,"url":"https://patchwork.libcamera.org/api/1.1/patches/18377/?format=json","web_url":"https://patchwork.libcamera.org/patch/18377/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20230309172115.15216-1-laurent.pinchart@ideasonboard.com>","date":"2023-03-09T17:21:15","name":"[libcamera-devel] meson: Fix git version parsing","commit_ref":"d34cefad17918a37e48c2a9fadd63480e6661d6e","pull_url":null,"state":"accepted","archived":false,"hash":"5788cb848fe84f32bb69b781d9fa6e1a8783bfc1","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18377/mbox/","series":[{"id":3797,"url":"https://patchwork.libcamera.org/api/1.1/series/3797/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3797","date":"2023-03-09T17:21:15","name":"[libcamera-devel] meson: Fix git version parsing","version":1,"mbox":"https://patchwork.libcamera.org/series/3797/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18377/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18377/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BDF1CBE080\n\tfor ;\n\tThu, 9 Mar 2023 17:21:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 19B7F626B2;\n\tThu, 9 Mar 2023 18:21:14 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6570361ED7\n\tfor ;\n\tThu, 9 Mar 2023 18:21:12 +0100 (CET)","from pendragon.ideasonboard.com\n\t(117.145-247-81.adsl-dyn.isp.belgacom.be [81.247.145.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F1A09589;\n\tThu, 9 Mar 2023 18:21:11 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1678382474;\n\tbh=bZyqzXMdRevwV1hSrLiVO/prhd+lkRTKsb+AUEEegUQ=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=b55mt6YcIc+m46/j0fAD+57qct2+ivRtUNE4c178+5DJRz3fDFwMFFzUjPwXyIhSc\n\tz08Y5FkBwPVtTPy0P8D4Q0vjwZ9lnSrunJxz8KcnhzzFC/KcFWNEDw/KfVVDhWOyFK\n\tLAKzEfeP/7GDxp4qIJdoOuJ7GjTW2klWslnmKQe7iEXRjYKAumPvyHx1ohovBJgTRW\n\t3/3AYDpWCqy0sX66i3/phPiuVYsmt93EL7rsyn7RSkcCT9P+qtdYdUpEMpPPJ3Fj/R\n\tsu3wNPYSKujXKngyXUaWlyqcjbUsDkVgBKB73sMwLMiM5IzpMTKpgR6R+VJAJjDpV0\n\tpyiVNHqygIFdg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1678382472;\n\tbh=bZyqzXMdRevwV1hSrLiVO/prhd+lkRTKsb+AUEEegUQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=uSsLcUNVqwaiedBaCjkPJdvbGu2NQ5EO3KQZLAvNtWyDnbJO0EAz4BSQjWTmqSoSK\n\t+pWBmgq+oyYxoG3TaA3cNLZZPARotv2V3nugPOQMcdI36fTxTQ4bfuKa7jA3clslhC\n\t5SbPcknElMSORTBZ/kv4Xbn+pcpMca9FlJWqsS1w="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"uSsLcUNV\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Mar 2023 19:21:15 +0200","Message-Id":"<20230309172115.15216-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.39.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] meson: Fix git version parsing","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When extracting the build metadata from the git version, we use the\nstring strip() method to remove the version prefix. This is incorrect,\nas the strip() method takes a set of characters to be removed, not a\nliteral string. Fix it by splitting the git version string on the '+'\ncharacter and keeping the suffix.\n\nFixes: 02518e598e8f (\"meson: Rewrite .replace usage\")\nSigned-off-by: Laurent Pinchart \n---\n meson.build | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\n\nbase-commit: f852b7fbc4960ea83bab49b75408fb13462db8ba","diff":"diff --git a/meson.build b/meson.build\nindex 0f89b45a0169..189e97736d90 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -41,8 +41,8 @@ if libcamera_version != project_version\n \n # Replace the version components reported by git with the release version,\n # but keep all trailing information supplied by git.\n- libcamera_git_version = (project_version +\n- libcamera_git_version.strip(libcamera_version))\n+ libcamera_git_version = (project_version + '+' +\n+ libcamera_git_version.split('+')[1])\n libcamera_version = project_version\n \n # Append a marker to show we have modified this version string\n","prefixes":["libcamera-devel"]}