From patchwork Sat Jan 3 00:21:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 5561191 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7619FBF6C3 for ; Sat, 3 Jan 2015 00:22:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7FA2720220 for ; Sat, 3 Jan 2015 00:22:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F32EF2021B for ; Sat, 3 Jan 2015 00:22:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752332AbbACAWO (ORCPT ); Fri, 2 Jan 2015 19:22:14 -0500 Received: from mail-we0-f179.google.com ([74.125.82.179]:54096 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752253AbbACAWN (ORCPT ); Fri, 2 Jan 2015 19:22:13 -0500 Received: by mail-we0-f179.google.com with SMTP id q59so5113004wes.10 for ; Fri, 02 Jan 2015 16:22:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=TewFVOQLqBjLU0t1CM5kt+/zWjtsvLOp3tX1TRm4WNg=; b=jv971R6ub/aN2wV6bQukGwbkd7MDRQLimmp1QpvAPb0Qv84Z2ry17wO9PLrj1pG5wl LqjJz8L5solfqy2De1dFjIP/jx1fHykISZgLoiA2NZQZEExAyj/MxedrdcTagVk28bSI /LqIqHRtTJ1M2R2kQXNTQTnmf1SLAlZtcAoTke7a+CH4b67QDBIShR5jbSnhxl/MsOHT wv7oM3ZOS3pxYuKHaLs4VyrnXI2sIZLCQDuO7XkJ8S5tyRhwuKB1b/injP8LK4lLaytW euI+uj/3s7fCGPg2WHEnsCWVQrTE1UDUFBwjTvcc9iloCz5/ebSIw1zAXF5QIgK7OLQW pHVg== X-Received: by 10.194.238.104 with SMTP id vj8mr65773963wjc.107.1420244532255; Fri, 02 Jan 2015 16:22:12 -0800 (PST) Received: from fambox.fambox-domain ([46.114.1.117]) by mx.google.com with ESMTPSA id lg7sm870528wic.0.2015.01.02.16.22.06 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 Jan 2015 16:22:11 -0800 (PST) From: Sedat Dilek Cc: Sedat Dilek , Ben Hutchings , maximilian attems , Thorsten Glaser , Alexander Wirt , Michal Marek , linux-kbuild@vger.kernel.org Subject: [RFC v4] builddeb: Try to determine distribution Date: Sat, 3 Jan 2015 01:21:57 +0100 Message-Id: <1420244517-11139-1-git-send-email-sedat.dilek@gmail.com> X-Mailer: git-send-email 2.2.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 CC: maximilian attems CC: Thorsten Glaser CC: Alexander Wirt CC: Michal Marek CC: linux-kbuild@vger.kernel.org Suggested-by: Ben Hutchings Suggested-by: Thorsten Glaser Signed-off-by: Sedat Dilek --- 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(-) 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 < debian/changelog -linux-upstream ($packageversion) unstable; urgency=low +linux-upstream ($packageversion) $distribution; urgency=low * Custom built Linux kernel.