From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 Sep 2011 22:10:15 +0000 (+0200)
Subject: Add better uname replacement.
X-Git-Tag: v2.9-core54~13^2~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef6cd59b612d7f814ff6dd8fc932f87c95f0ced4;p=people%2Fms%2Fipfire-2.x.git

Add better uname replacement.

Supports faking kernel release and supports ARM.
---

diff --git a/lfs/coreutils b/lfs/coreutils
index 6e78e3af49..c4aa9db02b 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -107,15 +107,13 @@ ifeq "$(ROOT)" ""
 	ln -sf test /bin/[
 	#ln -sf ../../bin/install /usr/bin
 	mv -f /bin/uname /bin/uname.bak
-	echo '#!/bin/bash'				>  /bin/uname
-	echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname
+	cp -vf $(DIR_SRC)/src/scripts/uname /bin/uname
 	chmod 755 /bin/uname
 	dircolors -p > /etc/dircolors
 else
 	rm /tools/bin/hostname
 	mv -f /tools/bin/uname /tools/bin/uname.bak
-	echo '#!/bin/bash'					>  /tools/bin/uname
-	echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g''	>> /tools/bin/uname
+	cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname
 	chmod 755 /tools/bin/uname
 endif
 	@rm -rf $(DIR_APP)
diff --git a/src/scripts/uname b/src/scripts/uname
new file mode 100644
index 0000000000..b76b530433
--- /dev/null
+++ b/src/scripts/uname
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+uname=
+for i in /bin/uname.bak /tools/bin/uname.bak; do
+	if [ -x "$i" ]; then
+		uname=${i}
+		break
+	fi
+done
+
+if [ -z "${uname}" ]; then
+	exit 127
+fi
+
+machine=$(${uname} -m)
+kernel=$(${uname} -r)
+output=$(${uname} $@)
+
+# Overwrite kernel version to hack kernel 3.x versions.
+output=$(sed -e "s/${kernel}/${KVER}/g" <<<${output})
+
+case "${machine}" in
+	arm*)
+		echo "${output}" | \
+			sed -e "s/armv.tej?l?/${MACHINE}/g"
+		;;
+
+	i?86)
+		echo "${output}" | \
+			sed -e "s/i.86/${MACHINE}/g"
+		;;
+esac