Mercurial > hg > aboriginal

view sources/patches/linux-dnsdomainname.patch @ 1187:878dbfe76341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move $BUILD/logs creation from record-commands.sh to include.sh so it gets reliably recreated when a user blanks the logs and re-runs.
author Rob Landley <rob@landley.net>
date Sun, 01 Aug 2010 15:19:00 -0500
parents 4e798d7aa5f9
children
line wrap: on
line source

# Trivial little patch to silence a build warning.  The Linux kernel searches
# for a command at an absolute path, then runs it out of $PATH, but for us
# /bin isn't necessarily in $PATH.

diff -ru linux.bak/scripts/mkcompile_h linux/scripts/mkcompile_h
--- linux.bak/scripts/mkcompile_h	2009-12-05 15:06:52.000000000 -0600
+++ linux/scripts/mkcompile_h	2009-12-05 15:15:37.000000000 -0600
@@ -67,9 +67,9 @@
   echo \#define LINUX_COMPILE_BY \"`whoami`\"
   echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
 
-  if [ -x /bin/dnsdomainname ]; then
+  if [ ! -z "$(which dnsdomainname)" ]; then
     domain=`dnsdomainname 2> /dev/null`
-  elif [ -x /bin/domainname ]; then
+  elif [ ! -z "$(which domainname)" ]; then
     domain=`domainname 2> /dev/null`
   fi