From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Thibault Subject: [PATCH] compiled a 32bit pv-grub on x86_64 xen target [Was: pv-grub doesn't run on rhel5] Date: Thu, 14 Aug 2008 13:33:50 +0100 Message-ID: <20080814123350.GM4590@implementation.uk.xensource.com> References: <48A40B17.2090701@redhat.com> <20080814111520.GH4590@implementation.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <20080814111520.GH4590@implementation.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Gerd Hoffmann , Xen Development Mailing List List-Id: xen-devel@lists.xenproject.org Samuel Thibault, le Thu 14 Aug 2008 12:15:20 +0100, a =E9crit : > Gerd Hoffmann, le Thu 14 Aug 2008 12:38:15 +0200, a =E9crit : > > Another issue: As 64bit pv-grub can't boot 32bit kernels, the 64bit = xen > > build should create both 32bit and 64bit builds of pv-grub, so you ca= n > > boot 32-on-64 guests with it? >=20 > I'm afraid Keir will consider it is too late in the 3.3 release to make > such a change in the build process. Here is a patch anyway, it doesn't touch any code so at least shouldn't break anything. pv-grub: On x86_64, also build an x86_32 pv-grub This requires suffixing obj directories and having grub compiled outside sources. Signed-off-by: Samuel Thibault diff -r 37f3bdce0394 .hgignore --- a/.hgignore Mon Aug 11 12:36:26 2008 +0100 +++ b/.hgignore Thu Aug 14 13:30:23 2008 +0100 @@ -90,20 +90,16 @@ ^stubdom/gcc-.*$ ^stubdom/include$ ^stubdom/ioemu$ -^stubdom/libxc$ +^stubdom/libxc-.*$ ^stubdom/lwip-.*$ ^stubdom/mini-os-.*$ -^stubdom/mk-headers$ +^stubdom/mk-headers-.*$ ^stubdom/newlib-.*$ ^stubdom/pciutils-.*$ ^stubdom/zlib-.*$ -^stubdom/grub-cvs$ -^stubdom/grub/stage2$ -^stubdom/grub/netboot$ -^stubdom/grub/dirs$ +^stubdom/grub-.*$ ^stubdom/lwip/ ^stubdom/ioemu/ -^stubdom/grub-upstream/ ^tools/.*/build/lib.*/.*\.py$ ^tools/blktap/Makefile\.smh$ ^tools/blktap/drivers/blktapctrl$ diff -r 37f3bdce0394 Makefile --- a/Makefile Mon Aug 11 12:36:26 2008 +0100 +++ b/Makefile Thu Aug 14 13:30:23 2008 +0100 @@ -22,6 +22,9 @@ build: kernels $(MAKE) -C xen build $(MAKE) -C tools build $(MAKE) -C stubdom build +ifeq (x86_64,$(XEN_TARGET_ARCH)) + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom pv-grub +endif $(MAKE) -C docs build =20 # The test target is for unit tests that can run without an installation= . Of @@ -71,6 +74,9 @@ install-kernels: .PHONY: install-stubdom install-stubdom: $(MAKE) -C stubdom install +ifeq (x86_64,$(XEN_TARGET_ARCH)) + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom install-grub +endif =20 .PHONY: install-docs install-docs: @@ -109,6 +115,9 @@ clean:: $(MAKE) -C xen clean $(MAKE) -C tools clean $(MAKE) -C stubdom crossclean +ifeq (x86_64,$(XEN_TARGET_ARCH)) + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom crossclean +endif $(MAKE) -C docs clean =20 # clean, but blow away kernel build tree plus tarballs @@ -117,6 +126,9 @@ distclean: $(MAKE) -C xen distclean $(MAKE) -C tools distclean $(MAKE) -C stubdom distclean +ifeq (x86_64,$(XEN_TARGET_ARCH)) + XEN_TARGET_ARCH=3Dx86_32 $(MAKE) -C stubdom distclean +endif $(MAKE) -C docs distclean rm -rf dist patches/tmp for i in $(ALLKERNELS) ; do $(MAKE) $$i-delete ; done diff -r 37f3bdce0394 extras/mini-os/Makefile --- a/extras/mini-os/Makefile Mon Aug 11 12:36:26 2008 +0100 +++ b/extras/mini-os/Makefile Thu Aug 14 13:30:23 2008 +0100 @@ -66,8 +66,8 @@ ifeq ($(lwip),y) # lwIP library LWC :=3D $(shell find $(LWIPDIR)/ -type f -name '*.c') LWC :=3D $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWC +=3D lwip-arch.c lwip-net.c LWO :=3D $(patsubst %.c,%.o,$(LWC)) +LWO +=3D $(addprefix $(OBJ_DIR)/,lwip-arch.o lwip-net.o) =20 $(OBJ_DIR)/lwip.a: $(LWO) $(RM) $@ @@ -79,7 +79,7 @@ OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o=20 OBJS :=3D $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) =20 ifeq ($(libc),y) -APP_LDLIBS +=3D -L$(XEN_ROOT)/stubdom/libxc -whole-archive -lxenguest -l= xenctrl -no-whole-archive +APP_LDLIBS +=3D -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-ar= chive -lxenguest -lxenctrl -no-whole-archive APP_LDLIBS +=3D -lpci APP_LDLIBS +=3D -lz APP_LDLIBS +=3D -lm diff -r 37f3bdce0394 stubdom/Makefile --- a/stubdom/Makefile Mon Aug 11 12:36:26 2008 +0100 +++ b/stubdom/Makefile Thu Aug 14 13:30:23 2008 +0100 @@ -91,9 +91,9 @@ NEWLIB_STAMPFILE=3D$(CROSS_ROOT)/$(GNU_TAR NEWLIB_STAMPFILE=3D$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libc.a .PHONY: cross-newlib cross-newlib: $(NEWLIB_STAMPFILE) -$(NEWLIB_STAMPFILE): mk-headers newlib-$(NEWLIB_VERSION) - mkdir -p newlib-build - ( cd newlib-build && \ +$(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSI= ON) + mkdir -p newlib-$(XEN_TARGET_ARCH) + ( cd newlib-$(XEN_TARGET_ARCH) && \ CC_FOR_TARGET=3D"$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_C= FLAGS)" AR_FOR_TARGET=3D$(AR) LD_FOR_TARGET=3D$(LD) RANLIB_FOR_TARGET=3D$= (RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=3D$(CROSS_PREFIX)= --verbose --target=3D$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-= long --disable-multilib && \ $(MAKE) && \ DESTDIR=3D $(MAKE) install ) @@ -105,12 +105,15 @@ zlib-$(ZLIB_VERSION).tar.gz: zlib-$(ZLIB_VERSION).tar.gz: $(WGET) $(ZLIB_URL)/$@ =20 +zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz=20 + tar xzf $< + mv zlib-$(ZLIB_VERSION) $@ + ZLIB_STAMPFILE=3D$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libz.a .PHONY: cross-zlib cross-zlib: $(ZLIB_STAMPFILE) -$(ZLIB_STAMPFILE): zlib-$(ZLIB_VERSION).tar.gz $(NEWLIB_STAMPFILE) - tar xzf $< - ( cd zlib-$(ZLIB_VERSION) && \ +$(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) + ( cd $< && \ CFLAGS=3D"$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=3D$(CC) ./configure= --prefix=3D$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ $(MAKE) libz.a && \ $(MAKE) install ) @@ -122,16 +125,17 @@ pciutils-$(LIBPCI_VERSION).tar.bz2: pciutils-$(LIBPCI_VERSION).tar.bz2: $(WGET) $(LIBPCI_URL)/$@ =20 -pciutils-$(LIBPCI_VERSION): pciutils-$(LIBPCI_VERSION).tar.bz2 +pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 tar xjf $< + mv pciutils-$(LIBPCI_VERSION) $@ patch -d $@ -p1 < pciutils.patch touch $@ =20 LIBPCI_STAMPFILE=3D$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libpci.a .PHONY: cross-libpci cross-libpci: $(LIBPCI_STAMPFILE) -$(LIBPCI_STAMPFILE): pciutils-$(LIBPCI_VERSION) $(NEWLIB_STAMPFILE) $(ZL= IB_STAMPFILE) - ( cd pciutils-$(LIBPCI_VERSION) && \ +$(LIBPCI_STAMPFILE): pciutils-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) $(Z= LIB_STAMPFILE) + ( cd $< && \ cp ../libpci.config.h lib/config.h && \ echo '#define PCILIB_VERSION "$(LIBPCI_VERSION)"' >> lib/config.h && = \ cp ../libpci.config.mak lib/config.mk && \ @@ -148,8 +152,9 @@ lwip-$(LWIP_VERSION).tar.gz: lwip-$(LWIP_VERSION).tar.gz: $(WGET) $(LWIP_URL)/$@ =20 -lwip: lwip-$(LWIP_VERSION).tar.gz +lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz tar xzf $< + mv lwip $@ patch -d $@ -p0 < lwip.patch-cvs touch $@ =20 @@ -160,7 +165,7 @@ lwip: lwip-$(LWIP_VERSION).tar.gz .PHONY: $(CROSS_ROOT) $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci =20 -mk-headers: +mk-headers-$(XEN_TARGET_ARCH): mkdir -p include/xen && \ ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/xen/include/p= ublic/*.h)) include/xen && \ ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/public/,arch-= ia64 arch-x86 hvm io xsm) include/xen && \ @@ -169,13 +174,13 @@ mk-headers: ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/tools/include/xen-fo= reign/*)) include/xen-foreign/ && \ $(MAKE) -C include/xen-foreign/ && \ ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/for= eign ) - mkdir -p libxc - [ -h libxc/Makefile ] || ( cd libxc && \ + mkdir -p libxc-$(XEN_TARGET_ARCH) + [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARC= H) && \ ln -sf ../$(XEN_ROOT)/tools/libxc/*.h . && \ ln -sf ../$(XEN_ROOT)/tools/libxc/*.c . && \ ln -sf ../$(XEN_ROOT)/tools/libxc/Makefile . ) - mkdir -p libxc/$(XEN_TARGET_ARCH) - [ -h libxc/$(XEN_TARGET_ARCH) ] || ( cd libxc/$(XEN_TARGET_ARCH) && \ + mkdir -p libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) + [ -h libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) ] || ( cd libxc-$(XEN_= TARGET_ARCH)/$(XEN_TARGET_ARCH) && \ ln -sf ../$(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \ ln -sf ../$(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \ ln -sf ../$(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . ) @@ -196,9 +201,9 @@ endif [ ! -h ioemu/config-host.h ] || rm -f ioemu/config-host.h [ ! -h ioemu/config-host.mak ] || rm -f ioemu/config-host.mak $(MAKE) -C $(MINI_OS) links - touch mk-headers + touch mk-headers-$(XEN_TARGET_ARCH) =20 -TARGETS_MINIOS=3D$(addprefix mini-os-,$(TARGETS)) +TARGETS_MINIOS=3D$(addprefix mini-os-$(XEN_TARGET_ARCH)-,$(TARGETS)) $(TARGETS_MINIOS): mini-os-%: [ -d $@ ] || \ for i in $$(cd $(MINI_OS) ; find . -type d) ; do \ @@ -210,9 +215,9 @@ TARGETS_MINIOS=3D$(addprefix mini-os-,$(TA ####### =20 .PHONY: libxc -libxc: libxc/libxenctrl.a libxc/libxenguest.a -libxc/libxenctrl.a libxc/libxenguest.a:: cross-zlib - CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = libxc +libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/li= bxenguest.a +libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxengue= st.a:: cross-zlib + CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = libxc-$(XEN_TARGET_ARCH) =20 ####### # ioemu @@ -224,12 +229,12 @@ ifeq ($(CONFIG_QEMU),ioemu) [ -f ioemu/config-host.mak ] || \ ( cd ioemu ; \ XEN_TARGET_ARCH=3D$(XEN_TARGET_ARCH) CFLAGS=3D"$(TARGET_CFLAGS= )" sh configure --prefix=3D/usr --enable-stubdom $(IOEMU_OPTIONS)) - CPPFLAGS=3D"$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=3D$(CURDIR)/lw= ip TOOLS=3D + CPPFLAGS=3D"$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=3D$(CURDIR)/lw= ip-$(XEN_TARGET_ARCH) TOOLS=3D else [ -f ioemu/config-host.mak ] || \ ( cd ioemu ; \ CONFIG_STUBDOM=3Dyes XEN_ROOT=3D$(abspath $(XEN_ROOT)) XEN_TAR= GET_ARCH=3D$(XEN_TARGET_ARCH) CFLAGS=3D"$(TARGET_CFLAGS)" sh ./xen-setup = --cc=3D$(CC) --disable-gcc-check $(IOEMU_OPTIONS)) - CPPFLAGS=3D TARGET_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWI= PDIR=3D$(CURDIR)/lwip TOOLS=3D CONFIG_STUBDOM=3Dyes + CPPFLAGS=3D TARGET_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWI= PDIR=3D$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS=3D CONFIG_STUBDOM=3Dyes endif =20 ###### @@ -238,7 +243,7 @@ endif =20 .PHONY: caml caml: $(CROSS_ROOT) - CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = $@ LWIPDIR=3D$(CURDIR)/lwip=20 + CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = $@ LWIPDIR=3D$(CURDIR)/lwip-$(XEN_TARGET_ARCH)=20 =20 ### # C @@ -246,7 +251,7 @@ caml: $(CROSS_ROOT) =20 .PHONY: c c: $(CROSS_ROOT) - CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = $@ LWIPDIR=3D$(CURDIR)/lwip=20 + CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = $@ LWIPDIR=3D$(CURDIR)/lwip-$(XEN_TARGET_ARCH)=20 =20 ###### # Grub @@ -264,7 +269,8 @@ grub-upstream: grub-$(GRUB_VERSION).tar. =20 .PHONY: grub grub: grub-upstream $(CROSS_ROOT) - CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = $@ + mkdir -p grub-$(XEN_TARGET_ARCH) + CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) -C = $@ OBJ_DIR=3D$(CURDIR)/grub-$(XEN_TARGET_ARCH) =20 ######## # minios @@ -276,21 +282,21 @@ else else ioemu-stubdom: APP_OBJS=3D$(CURDIR)/ioemu/i386-stubdom/qemu.a $(CURDIR)/= ioemu/i386-stubdom/libqemu.a $(CURDIR)/ioemu/libqemu_common.a endif -ioemu-stubdom: mini-os-ioemu lwip libxc ioemu - DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_QEMU $(TARGE= T_CFLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DI= R=3D$(CURDIR)/$< LWIPDIR=3D$(CURDIR)/lwip APP_OBJS=3D"$(APP_OBJS)" +ioemu-stubdom: mini-os-$(XEN_TARGET_ARCH)-ioemu lwip-$(XEN_TARGET_ARCH) = libxc ioemu + DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_QEMU $(TARGE= T_CFLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DI= R=3D$(CURDIR)/$< LWIPDIR=3D$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=3D"= $(APP_OBJS)" =20 CAMLLIB =3D $(shell ocamlc -where) .PHONY: caml-stubdom -caml-stubdom: mini-os-caml lwip libxc caml - DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_CAML $(TARGE= T_CFLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DI= R=3D$(CURDIR)/$< LWIPDIR=3D$(CURDIR)/lwip APP_OBJS=3D"$(CURDIR)/caml/main= -caml.o $(CURDIR)/caml/caml.o $(CAMLLIB)/libasmrun.a" +caml-stubdom: mini-os-$(XEN_TARGET_ARCH)-caml lwip-$(XEN_TARGET_ARCH) li= bxc caml + DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_CAML $(TARGE= T_CFLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DI= R=3D$(CURDIR)/$< LWIPDIR=3D$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=3D"= $(CURDIR)/caml/main-caml.o $(CURDIR)/caml/caml.o $(CAMLLIB)/libasmrun.a" =20 .PHONY: c-stubdom -c-stubdom: mini-os-c lwip libxc c - DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_C $(TARGET_C= FLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DIR=3D= $(CURDIR)/$< LWIPDIR=3D$(CURDIR)/lwip APP_OBJS=3D$(CURDIR)/c/main.a +c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxc c + DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_C $(TARGET_C= FLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DIR=3D= $(CURDIR)/$< LWIPDIR=3D$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=3D$(CUR= DIR)/c/main.a =20 .PHONY: pv-grub -pv-grub: mini-os-grub libxc grub - DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_GRUB $(TARGE= T_CFLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DI= R=3D$(CURDIR)/$< APP_OBJS=3D$(CURDIR)/grub/main.a +pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxc grub + DEF_CPPFLAGS=3D"$(TARGET_CPPFLAGS)" DEF_CFLAGS=3D"-DCONFIG_GRUB $(TARGE= T_CFLAGS)" DEF_LDFLAGS=3D"$(TARGET_LDFLAGS)" $(MAKE) -C $(MINI_OS) OBJ_DI= R=3D$(CURDIR)/$< APP_OBJS=3D$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a =20 ######### # install @@ -310,11 +316,11 @@ install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/bin" $(INSTALL_PROG) stubdom-dm "$(DESTDIR)/usr/lib/xen/bin" $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot" - $(INSTALL_DATA) mini-os-ioemu/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/i= oemu-stubdom.gz" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)= /usr/lib/xen/boot/ioemu-stubdom.gz" =20 install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot" - $(INSTALL_DATA) mini-os-grub/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/pv= -grub.gz" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)/= usr/lib/xen/boot/pv-grub-$(XEN_TARGET_ARCH).gz" =20 ####### # clean @@ -323,30 +329,30 @@ install-grub: pv-grub # Only clean the libxc/ioemu/mini-os part .PHONY: clean clean: - rm -fr mini-os-ioemu - rm -fr mini-os-c - rm -fr mini-os-caml - rm -fr mini-os-grub + rm -fr mini-os-$(XEN_TARGET_ARCH)-ioemu + rm -fr mini-os-$(XEN_TARGET_ARCH)-c + rm -fr mini-os-$(XEN_TARGET_ARCH)-caml + rm -fr mini-os-$(XEN_TARGET_ARCH)-grub $(MAKE) -C caml clean $(MAKE) -C c clean - $(MAKE) -C grub clean - [ ! -d libxc ] || $(MAKE) -C libxc clean + rm -fr grub-$(XEN_TARGET_ARCH) + [ ! -d libxc-$(XEN_TARGET_ARCH) ] || $(MAKE) -C libxc-$(XEN_TARGET_ARCH= ) clean [ ! -d ioemu ] || $(MAKE) -C ioemu clean =20 # clean the cross-compilation result .PHONY: crossclean crossclean: clean rm -fr $(CROSS_ROOT) - rm -fr newlib-build - rm -fr zlib-$(ZLIB_VERSION) pciutils-$(LIBPCI_VERSION) - rm -fr libxc ioemu - rm -f mk-headers + rm -fr newlib-$(XEN_TARGET_ARCH) + rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) + rm -fr libxc-$(XEN_TARGET_ARCH) ioemu + rm -f mk-headers-$(XEN_TARGET_ARCH) =20 # clean patched sources .PHONY: patchclean patchclean: crossclean rm -fr newlib-$(NEWLIB_VERSION) - rm -fr lwip + rm -fr lwip-$(XEN_TARGET_ARCH) rm -fr grub-upstream =20 # clean downloads diff -r 37f3bdce0394 stubdom/grub/Makefile --- a/stubdom/grub/Makefile Mon Aug 11 12:36:26 2008 +0100 +++ b/stubdom/grub/Makefile Thu Aug 14 13:30:23 2008 +0100 @@ -3,7 +3,7 @@ include $(XEN_ROOT)/Config.mk include $(XEN_ROOT)/Config.mk vpath %.c ../grub-upstream =20 -BOOT=3Dboot-$(XEN_TARGET_ARCH).o +BOOT=3D$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o =20 DEF_CPPFLAGS +=3D -I$(XEN_ROOT)/tools/libxc -I$(XEN_ROOT)/tools/include = -I. DEF_CPPFLAGS +=3D -I../grub-upstream/stage1 @@ -17,7 +17,7 @@ DEF_CPPFLAGS +=3D -DPRESET_MENU_STRING=3D'"" DEF_CPPFLAGS +=3D -DPRESET_MENU_STRING=3D'""' DEF_CPPFLAGS +=3D -DPACKAGE=3D'"grubdom"' -DVERSION=3D'"0.97"' =20 -all: main.a +all: $(OBJ_DIR)/main.a =20 STAGE2_SOURCES=3Dbuiltins.c char_io.c cmdline.c common.c console.c disk_= io.c graphics.c gunzip.c md5.c serial.c stage2.c terminfo.c tparm.c =20 @@ -59,16 +59,26 @@ NETBOOT_SOURCES:=3D$(addprefix netboot/,$( =20 $(BOOT): DEF_CPPFLAGS+=3D-D__ASSEMBLY__ =20 -OBJS =3D $(NETBOOT_SOURCES:.c=3D.o) $(STAGE2_SOURCES:.c=3D.o) kexec.o mi= ni-os.o +PV_GRUB_SOURCES =3D kexec.c mini-os.c =20 -dirs: - mkdir -p netboot stage2 +SOURCES =3D $(NETBOOT_SOURCES) $(STAGE2_SOURCES) $(PV_GRUB_SOURCES) + +OBJS =3D $(addprefix $(OBJ_DIR)/,$(SOURCES:.c=3D.o)) + +$(OBJ_DIR)/dirs: + mkdir -p $(OBJ_DIR)/netboot $(OBJ_DIR)/stage2 touch $@ =20 -$(OBJS): dirs +$(OBJS): $(OBJ_DIR)/dirs =20 -main.a: $(BOOT) $(OBJS) +$(OBJ_DIR)/main.a: $(BOOT) $(OBJS) $(AR) cr $@ $^ + +$(OBJ_DIR)/%.o: %.c + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ + +$(OBJ_DIR)/%.o: %.S + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ =20 clean: rm -fr dirs *.a *.o stage2 netboot