Skip to contentSkip to conversation

PV-GRUB: use the 0.97 snapshot + patch instead of checking out from cvs

PATCH New Samuel Thibault 1 participant 1 message Jul 17, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PV-GRUB: use the 0.97 snapshot + patch instead of checking out from cvs

PV-GRUB: use the 0.97 snapshot + patch instead of checking out from cvs

stubdom/Makefile +12 -8
diff -r 7637a4f5a5d7 stubdom/Makefile
@@ -15,7 +15,7 @@
 LIBPCI_VERSION=2.2.9
 NEWLIB_VERSION=1.16.0
 LWIP_DATE=2008-06-01
-GRUB_DATE=2008-06-01
+GRUB_VERSION=0.97
 
 WGET=wget -c
 
@@ -76,7 +76,7 @@
 ##############
 
 newlib-$(NEWLIB_VERSION).tar.gz:
-	$(WGET) ftp://sources.redhat.com/pub/newlib/newlib-$(NEWLIB_VERSION).tar.gz
+	$(WGET) ftp://sources.redhat.com/pub/newlib/$@
 
 newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
 	tar xzf $<
@@ -98,7 +98,7 @@
 ############
 
 zlib-$(ZLIB_VERSION).tar.gz:
-	$(WGET) http://www.zlib.net/zlib-$(ZLIB_VERSION).tar.gz
+	$(WGET) http://www.zlib.net/$@
 
 ZLIB_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libz.a
 .PHONY: cross-zlib
@@ -115,7 +115,7 @@
 ##############
 
 pciutils-$(LIBPCI_VERSION).tar.bz2:
-	$(WGET) http://www.kernel.org/pub/software/utils/pciutils/pciutils-$(LIBPCI_VERSION).tar.bz2
+	$(WGET) http://www.kernel.org/pub/software/utils/pciutils/$@
 
 pciutils-$(LIBPCI_VERSION): pciutils-$(LIBPCI_VERSION).tar.bz2
 	tar xjf $<
@@ -242,14 +242,18 @@
 # Grub
 ######
 
-grub-cvs:
-	cvs -z 9 -d :pserver:[email protected]:/sources/grub co -D $(GRUB_DATE) -d $@ grub
+grub-$(GRUB_VERSION).tar.gz:
+	$(WGET) ftp://alpha.gnu.org/gnu/grub/$@
+
+grub-upstream: grub-$(GRUB_VERSION).tar.gz
+	tar xzf $<
+	mv grub-$(GRUB_VERSION) $@
 	for i in grub.patches/* ; do \
 		patch -d $@ -p1 < $$i ; \
 	done
 
 .PHONY: grub
-grub: grub-cvs cross-newlib mk-headers
+grub: grub-upstream cross-newlib mk-headers
 	CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -C $@
 
 ########
@@ -326,7 +330,7 @@
 patchclean: crossclean
 	rm -fr newlib-$(NEWLIB_VERSION)
 	rm -fr lwip-cvs
-	rm -fr grub-cvs
+	rm -fr grub-upstream
 
 # clean downloads
 .PHONY: downloadclean
stubdom/grub.patches/00cvs new file +1382 -0

1,382 lines not on this page · raw message

stubdom/grub/Makefile +4 -4
diff -r 7637a4f5a5d7 stubdom/grub/Makefile
@@ -1,14 +1,14 @@
 XEN_ROOT = ../..
 
 include $(XEN_ROOT)/Config.mk
-vpath %.c ../grub-cvs
+vpath %.c ../grub-upstream
 
 BOOT=boot-$(XEN_TARGET_ARCH).o
 
 DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc -I$(XEN_ROOT)/tools/include -I.
-DEF_CPPFLAGS += -I../grub-cvs/stage1
-DEF_CPPFLAGS += -I../grub-cvs/stage2
-DEF_CPPFLAGS += -I../grub-cvs/netboot
+DEF_CPPFLAGS += -I../grub-upstream/stage1
+DEF_CPPFLAGS += -I../grub-upstream/stage2
+DEF_CPPFLAGS += -I../grub-upstream/netboot
 DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/firmware/vgabios
 DEF_CPPFLAGS += -DWITHOUT_LIBC_STUBS
 DEF_CPPFLAGS += -DSUPPORT_NETBOOT