From patchwork Thu Oct 14 11:59:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 14135 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C6A27BDC71 for ; Thu, 14 Oct 2021 11:59:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2459468F4E; Thu, 14 Oct 2021 13:59:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="KuXS04m9"; dkim-atps=neutral Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 38E2E68541 for ; Thu, 14 Oct 2021 13:59:54 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id m22so18834170wrb.0 for ; Thu, 14 Oct 2021 04:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wn0k1jb3JpDatHv71gxYFAtMMTF1tCKRPaOtn+GFKoQ=; b=KuXS04m9kSXXt2lnqz7wL5SLPzbpQ3ad+NUwXRxvHUz4qKlVuXUvljBnPWGE2eBWP3 jo7NyimVEswP4NQIFAb9WEfKeLpFR9NrVTkxdmYeH30fqECUCSdamYMitevR8eh6C8xD OtgMO8MMg9ghCNiyl79ZA7cVxGZf6FssOT/FOQJnD1XKtwnd2a5LHEzyaPaQW0SH27KH pWb6RXKx78wqdWmuhzlvjFiQ5hep3PK93CeL4XDDe1hdXTCia6wc9sTj+1wwKtOGsOY/ IRJHQ+4hRmjsrcwMmwCTvALPZ2MsgEDLf7+aYQjjUpBqwi07Vz9SpNH3QDrjh9zMmpIW kSoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wn0k1jb3JpDatHv71gxYFAtMMTF1tCKRPaOtn+GFKoQ=; b=OOHg98m5VEBXFIvEa8+is1wnNe2TX8UP1hYvm8HZXtjkD6aMR6hPsa8+accpdo+LlV 4dDvTUWk5/4MVlR4MlawGxI10TUKtiS1GrF3BNHkfkxAjIcX5R4tBYm6Z4YOQmpK7FIB 5bMl3DJcMbLAuS+sbC4V9nm/YC8jaLOVXbRG35uY7zW3dkisF2wWRluaa8uPwEyzzMpz qxCERTufZnZ8A8Q1NWZwTvuuO6LVqEeYQdHtnK//851N+4VYuSs+9omZGf17Gr2ru3IS T+oOoXPpmDZEpEnWSgv6KnrDqYOlvaU4chgihKY7xno16RxSdaYlZlu3HNvh9ZMdV472 HZtA== X-Gm-Message-State: AOAM533fHdjB6z/2WZFNV7Budm4cnZ9ILt5x82guuOTgWiPNG2M1pv4v 065QQe/OjeVrfCcyWF2K0JBVOejLh9XljEhW X-Google-Smtp-Source: ABdhPJzdpSpdGQLhx+Je8BXNyErETIhP0wLPV5wI87/7ikeGTxopJX90ePEbaMXUvhEdfwBGGvqXZQ== X-Received: by 2002:a1c:3b06:: with SMTP id i6mr5389649wma.172.1634212793625; Thu, 14 Oct 2021 04:59:53 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:26af:fb8f:5d03:5eab]) by smtp.gmail.com with ESMTPSA id y191sm8658324wmc.36.2021.10.14.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 04:59:53 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Thu, 14 Oct 2021 12:59:49 +0100 Message-Id: <20211014115951.2996808-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 0/2] Preserve SHA1 versioning X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Hi, This is version 4 of this series. In this revision, I have reverted back to using vcs_tag() to generate the version string. My reason for the original change from vcs_tag() to configure_file() was so that I could use the MESON_SOURCE_ROOT env variable in the gen-version.sh. This does not seem to get set when called from vcs_tag(), but does with configure_file()! I have added a commit in (1/2) to this series that passes the source root explicitly as a parameter to gen-version.sh to work around this problem. Thanks, Naush Naushir Patuck (2): utils: gen-version: Pass the meson source root to the gen-version.sh script build: Preserve upstream git versioning using meson dist meson.build | 6 +++++- src/libcamera/meson.build | 2 +- utils/gen-version.sh | 13 +++++++++++-- utils/run-dist.sh | 11 +++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 utils/run-dist.sh Reviewed-by: Laurent Pinchart Reviewed-by: Laurent Pinchart