diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-09-09 14:59:32 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-09-09 14:59:32 +0000 |
| commit | 8925c8b13e0384bdcf030ae786a3ec74d12ff30f (patch) | |
| tree | 94156a031f540dac48b90ac11bc7ff967cf671dd | |
| parent | 732c5308cab772c8e4d3cc90b3cd4cf28d9c9069 (diff) | |
| download | xen-8925c8b13e0384bdcf030ae786a3ec74d12ff30f.tar.gz xen-8925c8b13e0384bdcf030ae786a3ec74d12ff30f.tar.bz2 xen-8925c8b13e0384bdcf030ae786a3ec74d12ff30f.zip | |
bitkeeper revision 1.412.1.1 (3f5dead4Q7H73DU1k60q13_8T8HYbQ)
Makefile Cleanups, added xenolinux-sparse soft link, added NETFILTER to default xenolinux build.
| -rwxr-xr-x | .bk-to-hg | 6 | ||||
| -rwxr-xr-x | .hg-to-bk | 5 | ||||
| -rw-r--r-- | .rootkeys | 1 | ||||
| -rw-r--r-- | tools/balloon/Makefile | 3 | ||||
| -rw-r--r-- | tools/control/Makefile | 9 | ||||
| -rw-r--r-- | tools/internal/Makefile | 3 | ||||
| -rw-r--r-- | xen/Makefile | 3 | ||||
| -rw-r--r-- | xenolinux-2.4.22-sparse/arch/xeno/defconfig | 11 |
8 files changed, 32 insertions, 9 deletions
@@ -1,2 +1,6 @@ -#!/bin/sh +#!/bin/sh -x +set -e +test -L xenolinux-sparse +rm xenolinux-sparse +(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true exit 0 @@ -1,2 +1,5 @@ -#!/bin/sh +#!/bin/sh -x +set -e +ln -s xenolinux-2.4.22-sparse xenolinux-sparse +(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true exit 0 @@ -596,3 +596,4 @@ 3e5a4e681xMPdF9xCMwpyfuYMySU5g xenolinux-2.4.22-sparse/mm/mremap.c 3e5a4e683HKVU-sxtagrDasRB8eBVw xenolinux-2.4.22-sparse/mm/swapfile.c 3f108af81Thhb242EmKjGCYkjx-GJA xenolinux-2.4.22-sparse/mm/vmalloc.c +3f5dead2df5V7ZMZn58toejRjY1rYA xenolinux-sparse diff --git a/tools/balloon/Makefile b/tools/balloon/Makefile index dd88eab72a..86108af671 100644 --- a/tools/balloon/Makefile +++ b/tools/balloon/Makefile @@ -5,7 +5,8 @@ $(TARGET): balloon.c $(CC) -O2 -Wall -o $(TARGET) balloon.c install: $(TARGET) - cp $(TARGET) ../../../install/bin + mkdir -p ../../../install/bin + cp -a $(TARGET) ../../../install/bin clean: $(RM) *.o $(TARGET) *~ diff --git a/tools/control/Makefile b/tools/control/Makefile index 46ab52aa27..0c2ca8e10e 100644 --- a/tools/control/Makefile +++ b/tools/control/Makefile @@ -1,6 +1,8 @@ -default: cmdline web +#default: cmdline web +default: cmdline -install: install-cmdline install-web +#install: install-cmdline install-web +install: install-cmdline clean: clean-cmdline clean-web @@ -10,7 +12,8 @@ cmdline: FORCE ant -buildfile build-cmdline.xml dist install-cmdline: cmdline - cp xenctl-cmdline.jar xenctl ../../../install/bin + mkdir -p ../../../install/bin + cp -a xenctl-cmdline.jar xenctl ../../../install/bin chmod 755 ../../../install/bin/xenctl clean-cmdline: diff --git a/tools/internal/Makefile b/tools/internal/Makefile index e1b026b199..ac76ebbb7c 100644 --- a/tools/internal/Makefile +++ b/tools/internal/Makefile @@ -1,7 +1,7 @@ CC = gcc CFLAGS = -Wall -O3 -CFLAGS += -I../../xen/include -I../../xenolinux-2.4.21-sparse/include +CFLAGS += -I../../xen/include -I../../xenolinux-sparse/include HDRS = $(wildcard *.h) SRCS = $(wildcard *.c) @@ -15,6 +15,7 @@ INSTALL = $(TARGETS) xi_vifinit xi_helper all: $(TARGETS) install: all + mkdir -p ../../../install/bin cp -a $(INSTALL) ../../../install/bin chmod 755 ../../../install/bin/xi_vifinit chmod 755 ../../../install/bin/xi_helper diff --git a/xen/Makefile b/xen/Makefile index a72f0f5cb5..b24ad89174 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -19,7 +19,8 @@ debug: install: $(TARGET) gzip -f -9 < $(TARGET) > $(TARGET).gz - cp $(TARGET).gz ../../install/boot/ + mkdir -p ../../install/boot + cp -a $(TARGET).gz ../../install/boot/ clean: delete-links $(MAKE) -C tools clean diff --git a/xenolinux-2.4.22-sparse/arch/xeno/defconfig b/xenolinux-2.4.22-sparse/arch/xeno/defconfig index 1cd3dcc688..a1aa5e4400 100644 --- a/xenolinux-2.4.22-sparse/arch/xeno/defconfig +++ b/xenolinux-2.4.22-sparse/arch/xeno/defconfig @@ -67,7 +67,16 @@ CONFIG_BINFMT_ELF=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y # CONFIG_NETLINK_DEV is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +CONFIG_IP_NF_CONNTRACK=y +CONFIG_IP_NF_FTP=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_STATE=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_NAT_FTP=y CONFIG_FILTER=y CONFIG_UNIX=y CONFIG_INET=y |