ia64/xen-unstable

changeset 702:fb720652b3f3

bitkeeper revision 1.412.1.1 (3f5dead4Q7H73DU1k60q13_8T8HYbQ)

Makefile Cleanups, added xenolinux-sparse soft link, added NETFILTER to default xenolinux build.
author iap10@labyrinth.cl.cam.ac.uk
date Tue Sep 09 14:59:32 2003 +0000 (2003-09-09)
parents 14832f0203df
children 5c88e89672e8
files .bk-to-hg .hg-to-bk .rootkeys tools/balloon/Makefile tools/control/Makefile tools/internal/Makefile xen/Makefile xenolinux-2.4.22-sparse/arch/xeno/defconfig
line diff
     1.1 --- a/.bk-to-hg	Sat Sep 06 00:51:00 2003 +0000
     1.2 +++ b/.bk-to-hg	Tue Sep 09 14:59:32 2003 +0000
     1.3 @@ -1,2 +1,6 @@
     1.4 -#!/bin/sh
     1.5 +#!/bin/sh -x
     1.6 +set -e
     1.7 +test -L xenolinux-sparse
     1.8 +rm      xenolinux-sparse
     1.9 +(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
    1.10  exit 0
     2.1 --- a/.hg-to-bk	Sat Sep 06 00:51:00 2003 +0000
     2.2 +++ b/.hg-to-bk	Tue Sep 09 14:59:32 2003 +0000
     2.3 @@ -1,2 +1,5 @@
     2.4 -#!/bin/sh
     2.5 +#!/bin/sh -x
     2.6 +set -e
     2.7 +ln -s xenolinux-2.4.22-sparse xenolinux-sparse
     2.8 +(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
     2.9  exit 0
     3.1 --- a/.rootkeys	Sat Sep 06 00:51:00 2003 +0000
     3.2 +++ b/.rootkeys	Tue Sep 09 14:59:32 2003 +0000
     3.3 @@ -596,3 +596,4 @@ 3f108af5VxPkLv13tXpXgoRKALQtXQ xenolinux
     3.4  3e5a4e681xMPdF9xCMwpyfuYMySU5g xenolinux-2.4.22-sparse/mm/mremap.c
     3.5  3e5a4e683HKVU-sxtagrDasRB8eBVw xenolinux-2.4.22-sparse/mm/swapfile.c
     3.6  3f108af81Thhb242EmKjGCYkjx-GJA xenolinux-2.4.22-sparse/mm/vmalloc.c
     3.7 +3f5dead2df5V7ZMZn58toejRjY1rYA xenolinux-sparse
     4.1 --- a/tools/balloon/Makefile	Sat Sep 06 00:51:00 2003 +0000
     4.2 +++ b/tools/balloon/Makefile	Tue Sep 09 14:59:32 2003 +0000
     4.3 @@ -5,7 +5,8 @@ TARGET=balloon
     4.4  	$(CC) -O2 -Wall -o $(TARGET) balloon.c
     4.5  
     4.6  install: $(TARGET)
     4.7 -	cp  $(TARGET) ../../../install/bin
     4.8 +	mkdir -p ../../../install/bin
     4.9 +	cp -a $(TARGET) ../../../install/bin
    4.10  
    4.11  clean:
    4.12  	$(RM) *.o $(TARGET) *~
     5.1 --- a/tools/control/Makefile	Sat Sep 06 00:51:00 2003 +0000
     5.2 +++ b/tools/control/Makefile	Tue Sep 09 14:59:32 2003 +0000
     5.3 @@ -1,6 +1,8 @@
     5.4 -default: cmdline web
     5.5 +#default: cmdline web
     5.6 +default: cmdline
     5.7  
     5.8 -install: install-cmdline install-web
     5.9 +#install: install-cmdline install-web
    5.10 +install: install-cmdline
    5.11  
    5.12  clean: clean-cmdline clean-web
    5.13  
    5.14 @@ -10,7 +12,8 @@ cmdline: FORCE
    5.15  	ant -buildfile build-cmdline.xml dist
    5.16  
    5.17  install-cmdline: cmdline
    5.18 -	cp xenctl-cmdline.jar xenctl ../../../install/bin
    5.19 +	mkdir -p ../../../install/bin
    5.20 +	cp -a xenctl-cmdline.jar xenctl ../../../install/bin
    5.21  	chmod 755 ../../../install/bin/xenctl
    5.22  
    5.23  clean-cmdline:
     6.1 --- a/tools/internal/Makefile	Sat Sep 06 00:51:00 2003 +0000
     6.2 +++ b/tools/internal/Makefile	Tue Sep 09 14:59:32 2003 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  
     6.5  CC       = gcc
     6.6  CFLAGS   = -Wall -O3 
     6.7 -CFLAGS  += -I../../xen/include -I../../xenolinux-2.4.21-sparse/include
     6.8 +CFLAGS  += -I../../xen/include -I../../xenolinux-sparse/include
     6.9  
    6.10  HDRS     = $(wildcard *.h)
    6.11  SRCS     = $(wildcard *.c)
    6.12 @@ -15,6 +15,7 @@ INSTALL  = $(TARGETS) xi_vifinit xi_help
    6.13  all: $(TARGETS)
    6.14  
    6.15  install: all
    6.16 +	mkdir -p ../../../install/bin
    6.17  	cp -a $(INSTALL) ../../../install/bin
    6.18  	chmod 755 ../../../install/bin/xi_vifinit
    6.19  	chmod 755 ../../../install/bin/xi_helper
     7.1 --- a/xen/Makefile	Sat Sep 06 00:51:00 2003 +0000
     7.2 +++ b/xen/Makefile	Tue Sep 09 14:59:32 2003 +0000
     7.3 @@ -19,7 +19,8 @@ debug:
     7.4  
     7.5  install: $(TARGET)
     7.6  	gzip -f -9 < $(TARGET) > $(TARGET).gz
     7.7 -	cp $(TARGET).gz ../../install/boot/
     7.8 +	mkdir -p ../../install/boot
     7.9 +	cp -a $(TARGET).gz ../../install/boot/
    7.10  
    7.11  clean: delete-links
    7.12  	$(MAKE) -C tools clean
     8.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/defconfig	Sat Sep 06 00:51:00 2003 +0000
     8.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/defconfig	Tue Sep 09 14:59:32 2003 +0000
     8.3 @@ -67,7 +67,16 @@ CONFIG_BINFMT_ELF=y
     8.4  CONFIG_PACKET=y
     8.5  CONFIG_PACKET_MMAP=y
     8.6  # CONFIG_NETLINK_DEV is not set
     8.7 -# CONFIG_NETFILTER is not set
     8.8 +CONFIG_NETFILTER=y
     8.9 +CONFIG_IP_NF_CONNTRACK=y
    8.10 +CONFIG_IP_NF_FTP=y
    8.11 +CONFIG_IP_NF_IPTABLES=y
    8.12 +CONFIG_IP_NF_MATCH_STATE=y
    8.13 +CONFIG_IP_NF_FILTER=y
    8.14 +CONFIG_IP_NF_NAT=y
    8.15 +CONFIG_IP_NF_NAT_NEEDED=y
    8.16 +CONFIG_IP_NF_TARGET_MASQUERADE=y
    8.17 +CONFIG_IP_NF_NAT_FTP=y
    8.18  CONFIG_FILTER=y
    8.19  CONFIG_UNIX=y
    8.20  CONFIG_INET=y