public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
From: Michael Prokop <mika@grml.org>
To: linux-kbuild@vger.kernel.org
Cc: nico-linuxsetlocalversion@schottelius.org
Subject: scripts/setlocalversion: information retrieval about git repository state
Date: Wed, 25 Aug 2010 01:03:49 +0200	[thread overview]
Message-ID: <2010-08-25T00-33-12@devnull.michael-prokop.at> (raw)

[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]

Hi,

(please Cc me on replies as I'm not subscribed to linux-kbuild@)

while building Debian packages of my own kernel version I stumbled
upon a build problem with a Debian mechanism, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591793

Why I'm reporting this issue: in scripts/setlocalversion there's the
following comment (hint: "apped" should be "append"):

        # apped a plus sign if the repository is not in a clean tagged
        # state and  LOCALVERSION= is not specified

Ok, so testing with a clean and untagged state and empty
LOCALVERSION using master of current
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git:

  % cd linux-2.6
  % make defconfig
  % make prepare
  % git status
  # On branch master
  nothing to commit (working directory clean)
  % scripts/setlocalversion
  +

Alright. But:

  % git branch
  * master
  % git show master | head -1
  commit d1b113bb028999e82a8528e1484be8c23fb5a7d9
  % git tag master-test d1b113bb028999e82a8528e1484be8c23fb5a7d9
  % scripts/setlocalversion
  +

Huh? Ok, scripts/setlocalversion uses 'git describe --exact-match':

  % git describe --exact-match
  fatal: no tag exactly matches 'd1b113bb028999e82a8528e1484be8c23fb5a7d9'
  % git branch --contains d1b113bb028999e82a8528e1484be8c23fb5a7d9
  * master

For my understanding this *is* a tagged and clean state of the
repository. But I'm not sure whether that's a bug in 'git describe
--exact-match' or if scripts/setlocalversion of recent kernel
versions should be adjusted (either the check for the untagged state
or clarify/improve the comment about it).

regards,
-mika-

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

             reply	other threads:[~2010-08-24 23:13 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-24 23:03 Michael Prokop [this message]
2010-08-27 14:26 ` scripts/setlocalversion: information retrieval about git repository state Michal Marek
2010-09-03 11:58   ` Michael Prokop
2010-09-03 12:10     ` Michal Marek
2010-09-06  9:57       ` [PATCH] scripts/setlocalversion: update comment regarding " Michael Prokop
2010-09-06 11:27         ` Michal Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2010-08-25T00-33-12@devnull.michael-prokop.at \
    --to=mika@grml.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=nico-linuxsetlocalversion@schottelius.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox