diff mbox

[RFC,v4] builddeb: Try to determine distribution

Message ID 1420244517-11139-1-git-send-email-sedat.dilek@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sedat Dilek Jan. 3, 2015, 12:21 a.m. UTC
Like in my initial patch [1] lsb_release is a good choice to
determine the distribution name for debian/changelog.
Its installation is no precondition.

Ben gave some helpful information and detailed explanations in [2].
There he also suggested to have an option to explicitly set the
distribution name (see $KDEB_CHANGELOG_DIST variable).

Embed the improvement as suggested by Thorsten (see [3]):

"This is suboptimal: if KDEB_CHANGELOG_DIST is defined,
lsb_release is not necessary. The following snippet
also omits using its output if it fails but still
produces any:"

Dealing with this issue I learned about "The Colon in the Shell."
(see [4]) and refreshed my knowledge about redirecting outputs
with echo command (see [5]).
Special thanks to Thorsten, I enjoyed the IRC session with you.

Cooked together the snippets of Ben and Thorsten (see [2,3]).
Tested against Linux v3.19-rc2.

Thanks goes to Alexander, Ben. maximilian and Thorsten for the vital help.

[1] https://lkml.org/lkml/2012/4/23/516
[2] http://marc.info/?l=linux-kbuild&m=142022188322321&w=2
[3] http://marc.info/?l=linux-kbuild&m=142023476825460&w=2
[4] http://blog.brlink.eu/index.html#i70
[5] http://stackoverflow.com/questions/23489934/echo-2-some-text-what-does-it-mean-in-shell-scripting

CC: Ben Hutchings <ben@decadent.org.uk>
CC: maximilian attems <max@stro.at>
CC: Thorsten Glaser <tg@debian.org>
CC: Alexander Wirt <formorer@debian.org>
CC: Michal Marek <mmarek@suse.cz>
CC: linux-kbuild@vger.kernel.org
Suggested-by: Ben Hutchings <ben@decadent.org.uk>
Suggested-by: Thorsten Glaser <tg@debian.org>
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
v4: Embed improvements suggested by Thorsten
v3: Massaged the commit-message
v2: Suppress error messages when lsb_release is not installed.
    (Thanks maximilian and Ben.)

 scripts/package/builddeb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Comments

Thorsten Glaser Jan. 3, 2015, 12:41 a.m. UTC | #1
Sedat Dilek dixit:

>Dealing with this issue I learned about "The Colon in the Shell."

Beware of the pitfalls though!
https://www.mirbsd.org/permalinks/wlog-10_e20141209-tg.htm

>Suggested-by: Thorsten Glaser <tg@debian.org>

Please make this <tg@mirbsd.org> instead. Thank you.

>v4: Embed improvements suggested by Thorsten
[…]
>diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>index 5972624..f631c77 100755

Looks good to me. Note I did not look at the whole script,
only reviewed the diff, tonight (and don’t remember what I
did in 2012).

bye,
//mirabilos
Sedat Dilek Jan. 3, 2015, 12:58 a.m. UTC | #2
On Sat, Jan 3, 2015 at 1:41 AM, Thorsten Glaser <tg@mirbsd.de> wrote:
> Sedat Dilek dixit:
>
>>Dealing with this issue I learned about "The Colon in the Shell."
>
> Beware of the pitfalls though!
> https://www.mirbsd.org/permalinks/wlog-10_e20141209-tg.htm
>
>>Suggested-by: Thorsten Glaser <tg@debian.org>
>
> Please make this <tg@mirbsd.org> instead. Thank you.
>
>>v4: Embed improvements suggested by Thorsten
> […]
>>diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>>index 5972624..f631c77 100755
>
> Looks good to me. Note I did not look at the whole script,
> only reviewed the diff, tonight (and don’t remember what I
> did in 2012).
>

Thanks again.
I have sent out a v5 with corrections.

- Sedat -

> bye,
> //mirabilos
> --
>> Wish I had pine to hand :-( I'll give lynx a try, thanks.
>
> Michael Schmitz on nntp://news.gmane.org/gmane.linux.debian.ports.68k
> a.k.a. {news.gmane.org/nntp}#news.gmane.linux.debian.ports.68k in pine
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5972624..f631c77 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -217,9 +217,20 @@  else
 fi
 maintainer="$name <$email>"
 
+# Try to determine distribution
+if [ -n "$KDEB_CHANGELOG_DIST" ]; then
+        distribution=$KDEB_CHANGELOG_DIST
+elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ]; then
+        : # nothing to do in this case
+else
+        distribution="unstable"
+        echo >&2 "Using default distribution of 'unstable' in the changelog"
+        echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
+fi
+
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
-linux-upstream ($packageversion) unstable; urgency=low
+linux-upstream ($packageversion) $distribution; urgency=low
 
   * Custom built Linux kernel.