From: Felipe Contreras <felipe.contreras@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Sam Ravnborg <sam@ravnborg.org>,
Mike Frysinger <vapier@gentoo.org>
Subject: [PATCH v2 2/6] kbuild: fix warning when domainname is not available
Date: Thu, 17 Sep 2009 00:38:39 +0300 [thread overview]
Message-ID: <1253137123-18047-3-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1253137123-18047-2-git-send-email-felipe.contreras@gmail.com>
Otherwise we get:
"dnsdomainname: Unknown host"
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
scripts/mkcompile_h | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 6a12dd9..f060763 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -66,9 +66,13 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
if [ -x /bin/dnsdomainname ]; then
- echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
+ domain=`dnsdomainname 2> /dev/null`
elif [ -x /bin/domainname ]; then
- echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
+ domain=`domainname 2> /dev/null`
+ fi
+
+ if [ -n "$domain" ]; then
+ echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
else
echo \#define LINUX_COMPILE_DOMAIN
fi
--
1.6.5.rc1
next prev parent reply other threads:[~2009-09-16 21:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 21:38 [PATCH v2 0/6] Trivial warning cleanups Felipe Contreras
2009-09-16 21:38 ` [PATCH v2 1/6] Trivial whitespace cleanups Felipe Contreras
2009-09-16 21:38 ` Felipe Contreras [this message]
2009-09-16 21:38 ` [PATCH v2 3/6] kbuild: mkcompile_h: trivial cleanups Felipe Contreras
2009-09-16 21:38 ` [PATCH v2 4/6] acpi: fix a bunch of style issues on 'actypes.h' Felipe Contreras
2009-09-16 21:38 ` [PATCH v2 5/6] acpi: fix trivial warning Felipe Contreras
2009-09-16 21:38 ` [PATCH v2 6/6] acpi: fix trivial warnings caused by previous commmit Felipe Contreras
2009-09-17 2:14 ` [PATCH v2 3/6] kbuild: mkcompile_h: trivial cleanups Américo Wang
2009-09-17 2:12 ` [PATCH v2 2/6] kbuild: fix warning when domainname is not available Américo Wang
2009-09-27 8:41 ` Sam Ravnborg
2009-09-20 18:28 ` [tip:x86/urgent] x86: Trivial whitespace cleanups tip-bot for Felipe Contreras
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=1253137123-18047-3-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=vapier@gentoo.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
all inboxes | Powered by JetHome®