From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qMs5OWHwTGGmCAAAgWs5BA (envelope-from ) for ; Thu, 23 Sep 2021 23:23:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id muPaNGHwTGFCDQAAB5/wlQ (envelope-from ) for ; Thu, 23 Sep 2021 21:23:45 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5AADE29E1B for ; Thu, 23 Sep 2021 23:23:45 +0200 (CEST) Received: from localhost ([::1]:46964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTWC0-0006WY-Fc for larch@yhetil.org; Thu, 23 Sep 2021 17:23:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTWBW-0006T8-Mu for emacs-orgmode@gnu.org; Thu, 23 Sep 2021 17:23:16 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:38827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTWBU-0002V2-Sf for emacs-orgmode@gnu.org; Thu, 23 Sep 2021 17:23:14 -0400 Received: by mail-qk1-x731.google.com with SMTP id q81so21989437qke.5 for ; Thu, 23 Sep 2021 14:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=user-agent:from:to:cc:subject:in-reply-to:date:message-id :mime-version; bh=CVzOf0U/NCUr3rYYsJOIIAiK+gJNgHKTbEUruGKDVSQ=; b=al0LBl0a2sG/uv5u3pfSCCdsDwnV4Cg/OsentTxC5Mk1alFWJsZll9EPt7YIu/ns+U /yT2NfUilZDq3jhYyht3EV7V4IUcWNccfLW1oCD50FfS9CFCrrg9cgs7ffzHs6ZiY/Dd /E9felluR+8z2dVqbkvBWoUpf0cYGEIEHyQSSVGVhWE+KtPL9p32TS1Wibem7zLxJQ9p WfXAWUR53LZgNJtPdAps0U7r4YO3ZsYVXO0jN3Suq/Hkry8LBTz08dWm681bhQoSxpg9 gOYLj+KvOkFzXNO3cUbOW68ioLHMSX8HmX2fCnmv2SkmsYIX40AS5YitQqmGTDFSNtz5 vB1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=CVzOf0U/NCUr3rYYsJOIIAiK+gJNgHKTbEUruGKDVSQ=; b=8CcZFmy6cs/BjgUxJ3JuVRoBGP9+JOYDJopmmEN77hXkg0YMVFgddeCrjfGKKNVaj/ QvkIzpJesSWMaLq1+63++/u3wu9ATvAlrM5eHG6VW0xwPB1nSOmuksHTTjkAEM8bVUh6 kjqV09qC17D4Yiaxdw2zk4uZnnXLffmsDHf7oVbqRO7taFuDm+O/CTbnFSjXWasR1f5V ACC3yFEyUYKgrtuK0gARK98yv3nzEMLDwi1IW5fAwmWFg4VH4aMejTEuhItzaLr5qMYm ilCrXXOiScun/WyYzo3XkDRbwSuCc/oUb7xVhYql9vKHZTy5qfhLJ9tDfwvHFrnRoXpF JUOA== X-Gm-Message-State: AOAM532rt4xHx3EzNEqAV8oT+NCnfNTF+atmLLWjYYFzitdLuBEdL2qQ eJjN/yfjTRIzUxmv64euCHA= X-Google-Smtp-Source: ABdhPJxt1O32VsloTqJN0b6aau4zl8I8HhSimDoRRo6zV9fhNRZg6tKE3MmFZgQSpL3jLETgJRB5+g== X-Received: by 2002:a37:8242:: with SMTP id e63mr7374054qkd.294.1632432191625; Thu, 23 Sep 2021 14:23:11 -0700 (PDT) Received: from arch ([2601:82:c200:166d:afae:ebe6:a0e2:409e]) by smtp.gmail.com with ESMTPSA id t188sm5246988qkf.22.2021.09.23.14.23.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 14:23:10 -0700 (PDT) User-agent: mu4e 1.7.0; emacs 28.0.50 From: No Wayman To: marcowahlsoft@gmail.com Subject: Re: Switching to new Git repositories In-Reply-To: <874kab2js1.fsf@gmail.com> Date: Thu, 23 Sep 2021 17:17:48 -0400 Message-ID: <87y27nt29u.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::731; envelope-from=iarchivedmywholelife@gmail.com; helo=mail-qk1-x731.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wtd@pobox.com, emacs-orgmode@gnu.org, eibhear.geo@gmail.com Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632432225; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=CVzOf0U/NCUr3rYYsJOIIAiK+gJNgHKTbEUruGKDVSQ=; b=oEtuPxtddWWacFlO8mUhH1WqvlWFzlVwggh+R1NgawdwNDW9akWE8ercG0xmSoXSIlj7SG +6Crdms9/Op2SAKjMtlXBKwHhy3Z6zjJB1uyBdV2gHwAY5ojjFiiNx/cyWRBJbqUpvU+53 E04N/Y9u+sW7FpYjc5DOSjQhaIlTlqJ26vpqK3eOTH4uEUZWsYqpl4GuNFFBTQB0f87Cky ujHH1gmn5S4xpge/HbHBHowj9YI84AqV22XCB/3DiWOHC2JRiWDAiKGlTOIjoCv7tiQ1Hq ZGMbKa1Apau6lTqQqikPtKAg71PIGrOsrMB9wEgRxBGlm6qWOJCM1cBVAqXeBA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632432225; a=rsa-sha256; cv=none; b=IwgmzY+WKAbYSrtrf94lGmNvE8fvmWm27VG5JKraWswzq+cpZx3ddIiLsyUSNy3qzQJker TRG5oimYGKCwU29hE5l0yMiZxisZZZGF0m9GPWAilHp1HxWs+UkHCvsijy3dafj65Kmscw O0JkYII+CmlLpS4yspG6zX7AjlbkewTr5wS2QYB4Tipb6Q4sZZFGaUndGEw5UmKN4HPyrP gN/n0hrN+GJw634F24oU4flOmFjEGzMUoHLGlqIohjWTAGrqTH3eNw34YvNPYTOvAmdHsj nZ9fS8kDsAEwICxBoKRi3uv1ZXcwkD/cJk3+eRZT9mbI4hE7SAthn7ZZjmzX2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=al0LBl0a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: 1.71 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=al0LBl0a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 5AADE29E1B X-Spam-Score: 1.71 X-Migadu-Scanner: scn0.migadu.com X-TUID: coa54UMOxA+J --=-=-= Content-Type: text/plain; format=flowed > Sounds like a weird issue. I don't think this 9.5-dev tag is > something from the Org repo. There is a bug in mk/targets.mk introduced by 61336f80dc. As others have pointed out, the new repository does not have tags. As a fallback, org.el's version is read in it's header. However, it looks like Kyle forgot to trim that string so we get ORGVERSION set to "9.5-dev" instead of "9.5". This causes `org-version' to return an incorrect version string. The attached patch addresses the issue in the makefile. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-mk-targets.mk-Fix-ORGVERSION-in-tag-less-repos.patch Content-Description: fix ORGVERSION in targets.mk >From 9b81f396e69af146faceb13f5602fb6aa06a84e0 Mon Sep 17 00:00:00 2001 From: Nicholas Vollmer Date: Thu, 23 Sep 2021 17:13:34 -0400 Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos * mk/targets.mk (ORGVERSION, GITVERSION): properly generate ORGVERSION. Fix bug introduced 61336f80 which caused ORGVERSION to be generated as "Major.Minor-dev" instead of "Major.Minor" in tag-less repos. --- mk/targets.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/targets.mk b/mk/targets.mk index 693e3781f..35383f173 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -15,9 +15,9 @@ ifneq ($(wildcard .git),) ifeq ($(ORGVERSION),) # In elpa.git, there are no tags available. Fall back to using # the org.el header. - ORGVERSION := $(shell $(BATCH) --eval "(require 'lisp-mnt)" \ - --visit lisp/org.el --eval '(princ (lm-header "version"))') - GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD) + ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \ + --visit lisp/org.el --eval '(princ (lm-header "version"))')) + GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD)) else GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD) endif -- 2.33.0 --=-=-=--