From nobody Thu Mar 28 21:03:24 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1579616822; cv=none; d=zohomail.com; s=zohoarc; b=V7qPnHaQxUJOFMySAa/0OUtI1zpTo74/+nvgCGsvq8cedpzLUaAgziJ74/enGJIRO4qaO1DEJDLKAk8Ngg/H1JwQw+TpZ3bfPC+UJLy8fmcAOdf05SnNZFA3La8nGVPVRwJ2w2/BctkiUvJTul0ctTylSghZtowObYRR7OcTEz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579616822; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:To; bh=FMkmW3450F2nmNk1iXaNmVeqdPyp+TgbTxQT1ZL9WzI=; b=bVKKKmgJM0e5SqAwxS57+QHfez6LSYAfBg6+ey2/bZXceAzpEK+XU22nkyCPerjZozmpaBWgFLVIlzvGGKktFqCr60W4xrHV3OwN4TXEqZexrsATVyPjYOibyQXcyesi1FmL3a5+huDevZumMdD88WnbMBdgFO/oV/PQ2QjJhkw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1579616822801725.6309909476315; Tue, 21 Jan 2020 06:27:02 -0800 (PST) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 1800821B7C; Tue, 21 Jan 2020 14:26:59 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 087AA2011C for ; Tue, 21 Jan 2020 14:26:36 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id E371A2E1497; Tue, 21 Jan 2020 17:26:35 +0300 (MSK) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by mxbackcorp1o.mail.yandex.net (mxbackcorp/Yandex) with ESMTP id Ce84ZpnzQn-QZMGnIxL; Tue, 21 Jan 2020 17:26:35 +0300 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by vla5-58875c36c028.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id YnwEdo5MvU-QZU0uUe3; Tue, 21 Jan 2020 17:26:35 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1579616795; bh=T+iPg10eDyCGfynpfVbN4LdGSXSrw9i5n7strEj3aJk=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=jvCu12AO4zny8AL5ujYZ/9RQ3wk7D3jLS5O8ZKjMPbAGyNufZ88xafkPk1Fz0jhZ9 KCfCq4Zrvh5hQOLJhuB3/7TVfHgSx2HH/rA/PvwBv+CGoC8saz2MPphmWD/mR79ZSE gDaafDxF1YTzZmWuF3m0KuuqWDmzh1doXt2gLqZw= From: Alexey Kirillov To: seabios@seabios.org Date: Tue, 21 Jan 2020 17:26:06 +0300 Message-Id: <20200121142606.12165-2-lekiravi@yandex-team.ru> In-Reply-To: <20200121142606.12165-1-lekiravi@yandex-team.ru> References: <20200121142606.12165-1-lekiravi@yandex-team.ru> X-Spam-Level: *** Message-ID-Hash: XEXMCI4MITCB6KVKZ22QGNEYUUDVRYAP X-Message-ID-Hash: XEXMCI4MITCB6KVKZ22QGNEYUUDVRYAP X-MailFrom: lekiravi@yandex-team.ru X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: yc-core@yandex-team.ru, Alexey Kirillov X-Mailman-Version: 3.3.1 Subject: [SeaBIOS] [PATCH 1/1] build: increase .version priority over git List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: / X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" To simplify the process of building release versions in a directory under git, we will give priority to the file .version and not the version in git. Signed-off-by: Alexey Kirillov --- scripts/buildversion.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/buildversion.py b/scripts/buildversion.py index 8875497..8e5c17b 100755 --- a/scripts/buildversion.py +++ b/scripts/buildversion.py @@ -113,17 +113,22 @@ def main(): =20 cleanbuild, toolstr =3D tool_versions(options.tools) =20 - ver =3D git_version() - cleanbuild =3D cleanbuild and 'dirty' not in ver - if not ver: - ver =3D file_version() + # If there are correct .version file, use it. + # Othervise look for version in git. + ver =3D file_version() + if ver: # We expect the "extra version" to contain information on the - # distributor and distribution package version (if - # applicable). It is a "clean" build if this is a build from + # distributor and distribution package version (if applicable). + # It is a "clean" build if this is a build from # an official release tarball and the above info is present. cleanbuild =3D cleanbuild and ver and options.extra !=3D "" - if not ver: + else: + ver =3D git_version() + if ver: + cleanbuild =3D cleanbuild and 'dirty' not in ver + else: ver =3D "?" + if not cleanbuild: btime =3D time.strftime("%Y%m%d_%H%M%S") hostname =3D socket.gethostname() --=20 2.17.1 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org