Commit 1e9c0d3b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix non-ia32 `make rpm'

From: "Zhu, Yi" <yi.zhu@intel.com>

The "make rpm" rule in top Makefile isn't aware of the enviorment ARCH.  For
example, people issue "make ARCH=ia64" to compile the ia64 kernel on i386
platform for cross compilation.  This works pretty well now.  But if one uses
"make rpm ARCH=ia64", it will fail.  Because current rpm rule in Makefile and
mkspec are not aware of ARCH.
parent f2cf3160
...@@ -878,7 +878,7 @@ rpm: clean spec ...@@ -878,7 +878,7 @@ rpm: clean spec
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\ $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\
mv -f $(objtree)/.tmp_version $(objtree)/.version; mv -f $(objtree)/.tmp_version $(objtree)/.version;
$(RPM) -ta ../$(KERNELPATH).tar.gz $(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
rm ../$(KERNELPATH).tar.gz rm ../$(KERNELPATH).tar.gz
# Brief documentation of the typical targets used # Brief documentation of the typical targets used
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net> # Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
# #
# That's the voodoo to see if it's a x86. # 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 if [ ! -z $ISX86 ]; then
PC=1 PC=1
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment