Keir Fraser, le Tue 12 Feb 2008 15:24:39 +0000, a écrit :
> On 12/2/08 15:13, "Samuel Thibault" <samuel.thibault@xxxxxxxxxxxxx> wrote:
>
> > It looks like the stubdom/ patches for binutils, gcc, and newlib didn't
> > make through, here they are again.
> >
> > Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
>
> The files are in my local tree but masked by .hgignore.
Oh right, I had paid attention to the few lines that mention "patch",
but not the stubdom/ ones which match a bit too much. Here is a patch.
Rename stubdom/*.build into stubdom/*-build, newlib into newlib-cvs,
lwip into lwip-cvs. Fix .hgignore to ignore only them and not the
patches.
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
diff -r f7ec8df22304 .hgignore
--- a/.hgignore Tue Feb 12 15:04:26 2008 +0000
+++ b/.hgignore Tue Feb 12 15:36:52 2008 +0000
@@ -80,17 +80,17 @@
^pristine-.*$
^ref-.*$
^tmp-.*$
-^stubdom/binutils.*$
-^stubdom/cross-root.*$
-^stubdom/gcc.*$
-^stubdom/include.*$
-^stubdom/ioemu.*$
-^stubdom/libxc.*$
-^stubdom/lwip.*$
-^stubdom/mini-os.*$
-^stubdom/newlib.*$
-^stubdom/pciutils.*$
-^stubdom/zlib.*$
+^stubdom/binutils-.*$
+^stubdom/cross-root-.*$
+^stubdom/gcc-.*$
+^stubdom/include$
+^stubdom/ioemu$
+^stubdom/libxc$
+^stubdom/lwip-.*$
+^stubdom/mini-os$
+^stubdom/newlib-.*$
+^stubdom/pciutils-.*$
+^stubdom/zlib-.*$
^tools/.*/TAGS$
^tools/.*/build/lib.*/.*\.py$
^tools/blktap/Makefile\.smh$
diff -r f7ec8df22304 stubdom/Makefile
--- a/stubdom/Makefile Tue Feb 12 15:04:26 2008 +0000
+++ b/stubdom/Makefile Tue Feb 12 15:36:52 2008 +0000
@@ -54,8 +54,8 @@ BINUTILS_STAMPFILE=$(CROSS_ROOT)/bin/$(G
.PHONY: cross-binutils
cross-binutils: $(BINUTILS_STAMPFILE)
$(BINUTILS_STAMPFILE): binutils-$(BINUTILS_VERSION)
- mkdir -p binutils.build
- ( cd binutils.build && \
+ mkdir -p binutils-build
+ ( cd binutils-build && \
../binutils-$(BINUTILS_VERSION)/configure --prefix=$(CROSS_PREFIX)
--verbose --target=$(GNU_TARGET_ARCH)-xen-elf && \
$(MAKE) && \
$(MAKE) check && \
@@ -76,8 +76,8 @@ GCC_STAMPFILE=$(CROSS_ROOT)/bin/$(GNU_TA
.PHONY: cross-gcc
cross-gcc: $(GCC_STAMPFILE)
$(GCC_STAMPFILE): gcc-$(GCC_VERSION) $(BINUTILS_STAMPFILE)
- mkdir -p gcc.build
- ( cd gcc.build && \
+ mkdir -p gcc-build
+ ( cd gcc-build && \
../gcc-$(GCC_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose
--target=$(GNU_TARGET_ARCH)-xen-elf --enable-languages=c --disable-libssp
--with-gnu-as --with-gnu-ld && \
$(MAKE) GCC_FOR_TARGET='$$$$r/gcc/xgcc -B$$$$r/gcc/
'"$(TARGET_CFLAGS)"' $$(FLAGS_FOR_TARGET)' && \
$(MAKE) install )
@@ -88,16 +88,16 @@ cross-gcc: $(GCC_STAMPFILE)
newlib:
cvs -z 9 -d :pserver:anoncvs@xxxxxxxxxxxxxxxxxx:/cvs/src co -D
$(NEWLIB_DATE) newlib
- mv src newlib
- ( cd newlib && patch -p0 < ../newlib.patch)
+ mv src newlib-cvs
+ ( cd newlib-cvs && patch -p0 < ../newlib.patch)
NEWLIB_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libc.a
.PHONY: cross-newlib
cross-newlib: $(NEWLIB_STAMPFILE)
$(NEWLIB_STAMPFILE): newlib $(GCC_STAMPFILE)
- mkdir -p newlib.build
- ( cd newlib.build && \
- CC_FOR_TARGET="$(GNU_TARGET_ARCH)-xen-elf-gcc $(TARGET_CFLAGS)"
../newlib/configure --prefix=$(CROSS_PREFIX) --verbose
--target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long && \
+ mkdir -p newlib-build
+ ( cd newlib-build && \
+ CC_FOR_TARGET="$(GNU_TARGET_ARCH)-xen-elf-gcc $(TARGET_CFLAGS)"
../newlib-cvs/configure --prefix=$(CROSS_PREFIX) --verbose
--target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long && \
$(MAKE) && \
$(MAKE) install )
@@ -144,8 +144,9 @@ cross-libpci: $(LIBPCI_STAMPFILE)
# lwIP
######
-lwip:
+lwip-cvs:
cvs -z 9 -d :pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxx:/sources/lwip co
-D $(LWIP_DATE) lwip
+ mv lwip lwip-cvs
#######
# Links
@@ -190,7 +191,7 @@ ioemu: cross-zlib cross-libpci mk-symlin
ioemu: cross-zlib cross-libpci mk-symlinks libxc
[ -f ioemu/config-host.mak ] || \
( cd ioemu ; XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure
--prefix=/usr --enable-stubdom $(IOEMU_OPTIONS))
- $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip
+ $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-cvs
######
# caml
@@ -205,12 +206,12 @@ caml:
########
.PHONY: qemu-stubdom
-qemu-stubdom: mk-symlinks lwip libxc ioemu
- $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip QEMUDIR=$(CURDIR)/ioemu
+qemu-stubdom: mk-symlinks lwip-cvs libxc ioemu
+ $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip-cvs QEMUDIR=$(CURDIR)/ioemu
.PHONY: caml-stubdom
-caml-stubdom: mk-symlinks lwip libxc cross-libpci caml
- $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip CAMLDIR=$(CURDIR)/caml
+caml-stubdom: mk-symlinks lwip-cvs libxc cross-libpci caml
+ $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwia-cvs CAMLDIR=$(CURDIR)/caml
#########
# install
@@ -227,7 +228,7 @@ install: mini-os/mini-os.gz
# Only clean the libxc/ioemu/mini-os part
.PHONY: clean
clean:
- -$(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip clean
+ -$(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip-cvs clean
$(MAKE) -C caml clean
rm -fr libxc ioemu mini-os include
@@ -235,7 +236,7 @@ clean:
.PHONY: crossclean
crossclean: clean
rm -fr $(CROSS_ROOT)
- rm -fr binutils.build gcc.build newlib.build
+ rm -fr binutils-build gcc-build newlib-build
rm -fr zlib-$(ZLIB_VERSION) pciutils-$(LIBPCI_VERSION)
# clean patched sources
@@ -243,8 +244,8 @@ patchclean: crossclean
patchclean: crossclean
rm -fr binutils-$(BINUTILS_VERSION)
rm -fr gcc-$(GCC_VERSION)
- rm -fr newlib
- rm -fr lwip
+ rm -fr newlib-cvs
+ rm -fr lwip-cvs
# clean downloads
.PHONY: downloadclean
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home