From 4fc25af885fd34b5216b8008222b104d5a561126 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 3 Mar 2009 23:02:36 +0000
Subject: Added the general bridge configuration feature as described in ticket
 #311: The xenbr function is moved to the appropriate init hook from general
 functions (cleaning up there). The bridge init hook for the several
 virtualization tools like vmware, qemukvm, virtualbox use the same filename
 as the action is to be performed just once ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2665 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 22c022fc..858fe12c 100644
--- a/Makefile
+++ b/Makefile
@@ -198,9 +198,11 @@ plain-install:
     $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/pxe/; \
   cp -p tools/mksquashfs $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/; \
   tar --exclude=.svn -cp -C initramfs tpm | \
-    tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share;
-
+    tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \
 
+	@   # link the library loader for the uclibc (to use the uclibc busybox)
+	@ ln -sf ${SLX_BASE_PATH}/share/uclib-rootfs/lib/ld-uClibc.so.0 \
+	  /lib/ld-uClibc.so.0
 
 postinstall:
 	@   # create default config folder hierarchy:
@@ -234,7 +236,7 @@ postinstall:
 		unset OPENSLX_SVN_SNAPSHOT || \
 		OPENSLX_SVN_SNAPSHOT="1"; \
 	. ./VERSIONS; \
-	  echo -e "#! /bin/sh\n\necho $${OPENSLX_VERSION_STRING}" \
+	echo -e "#! /bin/sh\n\necho $${OPENSLX_VERSION_STRING}" \
 	    > $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/bin/slxversion; \
 	chmod a+x $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/bin/slxversion; \
 	ln -sf $(SLX_BASE_PATH)/bin/slxversion $(SLX_BUILD_PATH)$(USR_BIN_PATH)/; \
@@ -267,6 +269,7 @@ and stage1"
 	@echo "keeping files in $(SLX_PRIVATE_PATH)"
 	@rm -rf $(SLX_PUBLIC_PATH)
 	@rm -f $(USR_BIN_PATH)/slx*
+	@rm -f /lib/ld-uClibc.so.0
 
 mrproper:
 	@echo "Wiping all!"
-- 
cgit v1.2.3-55-g7522