From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1702918-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31C131580FD for <garchives@archives.gentoo.org>; Wed, 25 Dec 2024 00:42:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56395E0784; Wed, 25 Dec 2024 00:42:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F52FE0784 for <gentoo-commits@lists.gentoo.org>; Wed, 25 Dec 2024 00:42:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74D4D33FE60 for <gentoo-commits@lists.gentoo.org>; Wed, 25 Dec 2024 00:42:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A70331732 for <gentoo-commits@lists.gentoo.org>; Wed, 25 Dec 2024 00:42:09 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1735087326.23aab902cc8d2a0ff07d86061af8e3401e990d5f.sam@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: Makefile crossdev X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 23aab902cc8d2a0ff07d86061af8e3401e990d5f X-VCS-Branch: master Date: Wed, 25 Dec 2024 00:42:09 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e437e57a-d1cd-4549-8330-095bef93cde3 X-Archives-Hash: 4f4d1591fecbf1a4802125258005ff8f commit: 23aab902cc8d2a0ff07d86061af8e3401e990d5f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 15 18:53:39 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 25 00:42:06 2024 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=23aab902 crossdev, Makefile: fix version handling again `git archive` was using HEAD so it wouldn't include the sed performed in the `dist` target. Signed-off-by: Sam James <sam <AT> gentoo.org> Makefile | 5 ++--- crossdev | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5c483b8..9819d92 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ include settings.mk all: + sed -i -e '/^CROSSDEV_VER=/s:.*:CROSSDEV_VER="$(PV)":g' crossdev install: $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/ @@ -14,11 +15,9 @@ install: PV = $(shell test -e .git && git describe) P = crossdev-$(PV) COMP = xz -dist: - sed -i -e 's:@CDEVPV@:$(PV):g' crossdev +dist: all git archive --prefix=$(P)/ HEAD > $(P).tar -$(COMP) -f $(P).tar du -b $(P).tar* - sed -i -e 's:$(PV):@CDEVPV@:g' crossdev .PHONY: all dist install diff --git a/crossdev b/crossdev index 47df8ce..ee65fbc 100755 --- a/crossdev +++ b/crossdev @@ -2,7 +2,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -CROSSDEV_VER="@CDEVPV@" +CROSSDEV_VER="20241215" cd / umask 0022 #159111