From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 8582D1580FD for ; 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 78590E079C; Wed, 25 Dec 2024 00:42:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 5E536E0788 for ; 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 68CED33FD3F for ; Wed, 25 Dec 2024 00:42:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBFDF17C2 for ; Wed, 25 Dec 2024 00:42:09 +0000 (UTC) From: "Sam James" 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" Message-ID: <1735087326.c18f677d742830eef7f88ec5edc3babf25ba803c.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: c18f677d742830eef7f88ec5edc3babf25ba803c X-VCS-Branch: master Date: Wed, 25 Dec 2024 00:42:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0cf994ca-f868-4bfd-9fa6-0bf192502e66 X-Archives-Hash: 4586cdfecd70b2592cac0e9f0f36d163 commit: c18f677d742830eef7f88ec5edc3babf25ba803c Author: Sam James gentoo org> AuthorDate: Sun Dec 15 19:00:46 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 25 00:42:06 2024 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=c18f677d Revert "crossdev, Makefile: fix version handling again" This reverts commit 681c5fb86714d8e2c585c8e5ae423b6f9364ccfb. Signed-off-by: Sam James gentoo.org> Makefile | 5 +++-- crossdev | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9819d92..5c483b8 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ include settings.mk all: - sed -i -e '/^CROSSDEV_VER=/s:.*:CROSSDEV_VER="$(PV)":g' crossdev install: $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/ @@ -15,9 +14,11 @@ install: PV = $(shell test -e .git && git describe) P = crossdev-$(PV) COMP = xz -dist: all +dist: + sed -i -e 's:@CDEVPV@:$(PV):g' crossdev 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 ee65fbc..47df8ce 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="20241215" +CROSSDEV_VER="@CDEVPV@" cd / umask 0022 #159111