From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/4169 Path: news.gmane.org!not-for-mail From: Georgi Chorbadzhiyski Newsgroups: gmane.linux.lib.musl.general Subject: Re: Feature request Date: Tue, 29 Oct 2013 10:30:09 +0200 Organization: Unix Solutions Ltd. (http://unixsol.org/) Message-ID: <526F7211.4040207@unixsol.org> References: <20131029023312.GR20515@brightrain.aerifal.cx> <526F21F5.2010806@gentoo.org> <20131029045454.GU20515@brightrain.aerifal.cx> <526F426D.2050303@gentoo.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1383035418 13668 80.91.229.3 (29 Oct 2013 08:30:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 29 Oct 2013 08:30:18 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-4173-gllmg-musl=m.gmane.org@lists.openwall.com Tue Oct 29 09:30:24 2013 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1Vb4gx-0002JU-Ta for gllmg-musl@plane.gmane.org; Tue, 29 Oct 2013 09:30:23 +0100 Original-Received: (qmail 23922 invoked by uid 550); 29 Oct 2013 08:30:21 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 23913 invoked from network); 29 Oct 2013 08:30:21 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 In-Reply-To: <526F426D.2050303@gentoo.org> Xref: news.gmane.org gmane.linux.lib.musl.general:4169 Archived-At: Around 10/29/2013 07:06 AM, Luca Barbato scribbled: > On 29/10/13 05:54, Rich Felker wrote: >> On Tue, Oct 29, 2013 at 03:48:21AM +0100, Luca Barbato wrote: >>> On 29/10/13 03:33, Rich Felker wrote: >>>> On Mon, Oct 28, 2013 at 08:13:09PM +0000, Paul Schutte wrote: >>>>> Hi Guys, >>>>> >>>>> Would it be possible for you to add the version of musl to the output of >>>>> libc.so ? >>>>> >>>>> root@sabotage:~# /lib/libc.so >>>>> musl libc/dynamic program loader >>>>> usage: /lib/libc.so pathname [args] >>>>> >>>>> I have several machines with musl on it and it will be very helpful to see >>>>> which version is installed. >>>> >>>> Indeed, this has been something I've wanted to add for a while, and >>>> which should definitely be in for 1.0. It's just a matter of doing the >>>> right thing in the build and release system to get the version in >>>> there, and it's not clear what the version should read for git builds >>>> between versions. I think this is a good chance to discuss that. >>> >>> git describe short signature might be the best option. >> >> Thanks for the git-fu help. I'm assuming you mean using something like >> "git describe --tags"? Use of this could be contingent on either a >> .git dir, or lack of a version file added to release tarballs. The >> only thing that's not clear is how to handle non-release source trees >> present on a build system that lacks a working git installation. > > if [ -d .git ]; then > VER=$(git describe --always | sed -e "s:v::") > if [ x"$(git diff-index --name-only HEAD)" != x ]; then > VER="${VER}-dirty" > fi > elif [ -f .version ]; then > VER=$(< .version) > else > VER="Unknown" > fi > > Or something along the lines. I'm using this in a Makefile. VERSION = $(shell cat RELEASE) GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null) ifeq "$(GIT_VER)" "" GIT_VER = "release" endif -- Georgi Chorbadzhiyski | http://georgi.unixsol.org/ | http://github.com/gfto/