bitkeeper revision 1.412.1.1 (3f5dead4Q7H73DU1k60q13_8T8HYbQ)

Makefile Cleanups, added xenolinux-sparse soft link, added NETFILTER to default xenolinux build.

diff --git a/.bk-to-hg b/.bk-to-hg
index 039e4d0069c5c26909f86c505b9de66182e6d1f3..a41913bd35cb0b85c54824261a744acaeb27ea19 100755 (executable)
--- a/.bk-to-hg
+++ b/.bk-to-hg
@@ -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

diff --git a/.hg-to-bk b/.hg-to-bk
index 039e4d0069c5c26909f86c505b9de66182e6d1f3..f74c6a785bcfbdc2df1922922b14f4f2f53f1d5e 100755 (executable)
--- a/.hg-to-bk
+++ b/.hg-to-bk
@@ -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

diff --git a/.rootkeys b/.rootkeys
index 9f6ce592c7de92147ad48c546af401f7a55a6f99..6d3796d221ec78923a90b910e218126378b98669 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -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 dd88eab72a7d2b99b20bd8f6e9b4c3c8c02c0fed..86108af67161702951be911375f65f6604771e9a 100644 (file)
--- 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 46ab52aa27f95517ccbcffa3e95b8e9077de8552..0c2ca8e10e5e21e92990f6f5ec7c97133f619cb5 100644 (file)
--- 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 e1b026b199a8cd2fea6bfd784271f8ee26e2faee..ac76ebbb7c4551bda557a5933a7cda2267048684 100644 (file)
--- 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 a72f0f5cb5a3fe0de4e564f81cf653c322a027a0..b24ad891745776e3fda5dcbd0d0f20a10c6af5cb 100644 (file)
--- 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 1cd3dcc68834ee98dcea0d314d95fdd025804523..a1aa5e4400c1d60d0877027330bd6aae65ff237f 100644 (file)
--- 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