aboutsummaryrefslogtreecommitdiffstats
path: root/xenolinux-2.4.21-pre4-sparse
diff options
context:
space:
mode:
authorkaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk>2003-03-02 16:22:59 +0000
committerkaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk>2003-03-02 16:22:59 +0000
commit4f13d2a61fc684ddbc11d482f91f8c6cc788fd9e (patch)
treeeb91d0aabb26df3246c743327a8cb0cd522ac853 /xenolinux-2.4.21-pre4-sparse
parent81e86e122de058db19b50d2e581083e8b54bc7ca (diff)
downloadxen-4f13d2a61fc684ddbc11d482f91f8c6cc788fd9e.tar.gz
xen-4f13d2a61fc684ddbc11d482f91f8c6cc788fd9e.tar.bz2
xen-4f13d2a61fc684ddbc11d482f91f8c6cc788fd9e.zip
bitkeeper revision 1.105.1.7 (3e622fe35xVBV5lBc1h1Oaan0MH1_A)
Makefile: Force UTS_MACHINE to 'i386' rather than 'xeno'. This keeps software installers happy.
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse')
-rw-r--r--xenolinux-2.4.21-pre4-sparse/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/Makefile b/xenolinux-2.4.21-pre4-sparse/Makefile
index d7a36f6fe0..29cdd72d2a 100644
--- a/xenolinux-2.4.21-pre4-sparse/Makefile
+++ b/xenolinux-2.4.21-pre4-sparse/Makefile
@@ -8,7 +8,8 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
# Xeno hack XXX
-ARCH=xeno
+ARCH := xeno
+SUBARCH := i386
KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
@@ -361,7 +362,7 @@ include/linux/version.h: ./Makefile
comma := ,
init/version.o: init/version.c include/linux/compile.h include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
+ $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(SUBARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
init/main.o: init/main.c include/config/MARKER
$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<