Added a change to force objdump output to be English for bug #173412 and rolling...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@504 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index e275cf400c5fe1718341e50bb8c20c339279cb08..d6f1f1e3a400ccb5964e676488d84091ac2ff625 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+  gen_initrd.sh, genkernel:
+  Added a change to force objdump output to be English for bug #173412 and
+  rolling 3.4.7 final for the release.
+
   05 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.scripts:
   Added a patch from Daniel Drake <dsd@gentoo.org> to fix splash problems for

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 7c74e7a76f51c6060afbcc48506c8cb7ceba57be..ab9e560ea8a50da426588eab2b3cd279e82682f4 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -375,7 +375,7 @@ append_modules() {
 
 # check for static linked file with objdump
 is_static() {
-       objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
+       LANG="C" LC_ALL="C" objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
        return $?
 }
 

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 2d9eb9f6474da38bc5d515b75574d83298145007..1a8b3eea5a00dc2c2df2a7e18b71f1b99851fa79 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -29,7 +29,7 @@ move_initrd_to_loop()
 
 # check for static linked file with objdump
 is_static() {
-       objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
+       LANG="C" LC_ALL="C" objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
        return $?
 }
 

diff --git a/genkernel b/genkernel
index a620eca1265035f0b85115a9158d053f049d8835..49704d21878214496f97a3379ddb00182ccba4e9 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.7_pre5'
+GK_V='3.4.7'
 
 TMPDIR='/var/tmp/genkernel'
 TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$