[PATCH] fix make kernel rpm bug

From: Zhu, Yi
Date: Wed Dec 24 2003 - 21:50:40 EST


Hi Andrew,

Below two lines patch makes the rpm rule in top Makefile be aware of
$(ARCH). The old rule will make wrong rpm if ARCH is not the same as
the build machine.


diff -Nru a/Makefile b/Makefile
--- a/Makefile Wed Dec 10 13:47:52 2003
+++ b/Makefile Wed Dec 10 13:47:52 2003
@@ -872,7 +872,7 @@
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\
mv -f $(objtree)/.tmp_version $(objtree)/.version;

- $(RPM) -ta ../$(KERNELPATH).tar.gz
+ $(RPM) --target $(ARCH) -ta ../$(KERNELPATH).tar.gz
rm ../$(KERNELPATH).tar.gz

# Brief documentation of the typical targets used
diff -Nru a/scripts/mkspec b/scripts/mkspec
--- a/scripts/mkspec Wed Dec 10 13:47:52 2003
+++ b/scripts/mkspec Wed Dec 10 13:47:52 2003
@@ -9,7 +9,7 @@
# Patched for non-x86 by Opencon (L) 2002 <opencon@xxxxxxxxxxxxxxx>
#
# That's the voodoo to see if it's a x86.
-ISX86=`arch | grep -ie i.86`
+ISX86=`echo ${ARCH:=\`arch\`} | grep -ie i.86`
if [ ! -z $ISX86 ]; then
PC=1
else


Thanks,


--
-----------------------------------------------------------------
Opinions expressed are those of the author and do not represent
Intel Corp.

Zhu Yi (Chuyee)

GnuPG v1.0.6 (GNU/Linux)
http://cn.geocities.com/chewie_chuyee/gpg.txt or
$ gpg --keyserver wwwkeys.pgp.net --recv-keys 71C34820
1024D/71C34820 C939 2B0B FBCE 1D51 109A 55E5 8650 DB90 71C3 4820

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/