fix stage3.1 build script

2 files changed, 71 insertions, 88 deletions

diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
index d0a95238..e5e45312 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
@@ -4,40 +4,18 @@ fetch_source() {
 }
 
 build() {
-
-	BUILDDIR="${TARGET_DIR}/${MODULE}/build"
-
-	FILELIST="list_binaries_and_files"
-	[ -e "${FILELIST}" ] && rm "${FILELIST}"
-
-	for BIN in ${REQUIRED_BINARIES}
-	do
+	COPYLIST="list_binaries_and_files"
+	[ -e $COPYLIST ] && rm -f $COPYLIST
+	for BIN in $REQUIRED_BINARIES; do
 		BIN_LOCATION=$(which ${BIN})
-		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
-		then
-			pdebug "Processing $BIN at $BIN_LOCATION ..."
-			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
-		else
-			perror "${BIN} not found on the system! Please install it."
-		fi
+		[ ! -z "${BIN_LOCATION}" -a -e "${BIN_LOCATION}" ] \
+			&& get_link_chain "${BIN_LOCATION}" >> "${COPYLIST}"
 	done
-
-	for FILE in ${REQUIRED_DIRECTORIES}
-	do
-		[ ! -d ${FILE} ] && perror "Missing required directory $FILE"
-		echo ${FILE} >> "${FILELIST}"
-	done
-	for FILE in ${REQUIRED_FILES}
-	do
-		[ ! -f ${FILE} ] && perror "Missing required file $FILE"
-		echo ${FILE} >> "${FILELIST}"
+	for FILE in $REQUIRED_FILES; do
+		get_link_chain "${FILE}" >> "${COPYLIST}"
 	done
 
-	local NUMFILES=$(cat "${FILELIST}" | wc -l)
-	if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then
-		pinfo "File list generated at ${BUILDDIR}/${FILELIST} ($NUMFILES entries)"
-		tarcopy "$(cat "${FILELIST}")" "${BUILDDIR}"
-	fi
+	tarcopy "$(cat $COPYLIST|sort -u)" "${MODULE_BUILD_DIR}"
 }
 
 post_copy() {
@@ -47,6 +25,9 @@ post_copy() {
         copy_firmware
 }
 
+#
+# helper functions to generate the base rootfs
+#
 generate_rootfs() {
         # create basic directory structure
         mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,run,etc,mnt,sys} \
@@ -63,7 +44,7 @@ generate_rootfs() {
         tarcopy "${REQUIRED_FILES}" "${TARGET_BUILD_DIR}"
 
         # copy static data
-        cp -r "${MODULE_DIR}"/core/data/* "${TARGET_BUILD_DIR}" 
+        cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" 
 }
 
 copy_kernel_modules() {
@@ -72,7 +53,7 @@ copy_kernel_modules() {
         [ -e $MODLIST ] && rm -f $MODLIST
 
         # process modules list
-        for MOD in ${REQUIRED_MODULES}; do
+        for MOD in ${REQUIRED_KERNEL_MODULES}; do
                 local MOD_PATH="/lib/modules/${KERNEL_VERSION}/${MOD}"
                 if [ ! -e "${MOD_PATH}" ]; then
                         pwarning "Module $MOD not found. Skipping. (might cause problem on certain clients!)"
@@ -88,13 +69,13 @@ copy_kernel_modules() {
                 pinfo "Copying $MODLISTCOUNT modules to stage 3.1 target directory."
                 tarcopy "$(cat "$MODLIST")" "${TARGET_BUILD_DIR}"
         fi
-
+	rm -rf $MODLIST
 }
 
 generate_modules_map_files() {
 
         # first strip modules.order of all the modules we don't use
-        cat /lib/modules/"${KERNEL_VERSION}"/modules.order | grep -E $(echo ${REQUIRED_MODULES} | tr '\ ' '|') \
+        cat /lib/modules/"${KERNEL_VERSION}"/modules.order | grep -E $(echo ${REQUIRED_KERNEL_MODULES} | tr '\ ' '|') \
                 >> "${TARGET_BUILD_DIR}"/lib/modules/"${KERNEL_VERSION}"/modules.order
 
         # copy list of builtin kernel modules
@@ -131,4 +112,5 @@ copy_firmware() {
                 pinfo "Copying $FWLISTCOUNT firmware to stage 3.1 target directory."
                 tarcopy "$(cat "$FWLIST")" "${TARGET_BUILD_DIR}"
         fi
+	rm -f $FWLIST
 }
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index 4015e4a3..ea9fd580 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -1,57 +1,58 @@
-REQUIRED_MODULES="      kernel/drivers/video/sis/sisfb.ko
-                        kernel/drivers/video/via/viafb.ko
-                        kernel/drivers/video/uvesafb.ko
-                        kernel/drivers/acpi/video.ko
-                        kernel/drivers/ssb/ssb.ko
-                        kernel/drivers/gpu/drm/ttm/ttm.ko
-                        kernel/drivers/gpu/drm/via/via.ko
-                        kernel/drivers/gpu/drm/drm.ko
-                        kernel/drivers/gpu/drm/tdfx/tdfx.ko
-                        kernel/drivers/gpu/drm/nouveau/nouveau.ko
-                        kernel/drivers/gpu/drm/savage/savage.ko
-                        kernel/drivers/gpu/drm/radeon/radeon.ko
-                        kernel/drivers/gpu/drm/drm_kms_helper.ko
-                        kernel/drivers/gpu/drm/i810/i810.ko
-                        kernel/drivers/gpu/drm/i2c/ch7006.ko
-                        kernel/drivers/gpu/drm/i2c/sil164.ko
-                        kernel/drivers/gpu/drm/sis/sis.ko
-                        kernel/drivers/gpu/drm/mga/mga.ko
-                        kernel/drivers/gpu/drm/i915/i915.ko
-                        kernel/drivers/gpu/drm/r128/r128.ko
-                        kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
-                        kernel/drivers/i2c/algos/i2c-algo-bit.ko
-                        kernel/drivers/net/netconsole.ko
-                        kernel/drivers/net/ethernet/realtek/8139too.ko
-                        kernel/drivers/net/ethernet/realtek/r8169.ko
-                        kernel/drivers/net/ethernet/nvidia/forcedeth.ko
-                        kernel/drivers/net/ethernet/via/via-rhine.ko
-                        kernel/drivers/net/ethernet/amd/pcnet32.ko
-                        kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
-                        kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
-                        kernel/drivers/net/ethernet/sis/sis900.ko
-                        kernel/drivers/net/ethernet/broadcom/tg3.ko
-                        kernel/drivers/net/ethernet/broadcom/b44.ko
-                        kernel/drivers/net/ethernet/intel/e1000/e1000.ko
-                        kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
-                        kernel/drivers/net/ethernet/intel/e100.ko
-                        kernel/drivers/net/ethernet/marvell/skge.ko
-                        kernel/drivers/net/ethernet/3com/3c59x.ko
-                        kernel/drivers/net/ethernet/dec/tulip/tulip.ko
-                        kernel/drivers/hid/hid.ko
-                        kernel/drivers/hid/usbhid/usbhid.ko
-                        kernel/drivers/platform/x86/wmi.ko
-                        kernel/drivers/platform/x86/mxm-wmi.ko
-                        kernel/fs/configfs/configfs.ko
-                        kernel/fs/nfs_common/nfs_acl.ko
-                        kernel/fs/nfs/nfs.ko
-                        kernel/fs/fscache/fscache.ko
-                        kernel/fs/lockd/lockd.ko
-                        kernel/fs/squashfs/squashfs.ko
-                        kernel/net/sunrpc/sunrpc.ko
-                        kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
-                        kernel/net/802/stp.ko
-                        kernel/net/bridge/bridge.ko
-                        kernel/ubuntu/aufs/aufs.ko"
+REQUIRED_BINARIES="		v86d"
+REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
+				kernel/drivers/video/via/viafb.ko
+				kernel/drivers/video/uvesafb.ko
+        	               	kernel/drivers/acpi/video.ko
+                	       	kernel/drivers/ssb/ssb.ko
+	                       	kernel/drivers/gpu/drm/ttm/ttm.ko
+        	               	kernel/drivers/gpu/drm/via/via.ko
+                	       	kernel/drivers/gpu/drm/drm.ko
+                       	       	kernel/drivers/gpu/drm/tdfx/tdfx.ko
+	                       	kernel/drivers/gpu/drm/nouveau/nouveau.ko
+	                       	kernel/drivers/gpu/drm/savage/savage.ko
+				kernel/drivers/gpu/drm/radeon/radeon.ko
+				kernel/drivers/gpu/drm/drm_kms_helper.ko
+				kernel/drivers/gpu/drm/i810/i810.ko
+				kernel/drivers/gpu/drm/i2c/ch7006.ko
+				kernel/drivers/gpu/drm/i2c/sil164.ko
+				kernel/drivers/gpu/drm/sis/sis.ko
+				kernel/drivers/gpu/drm/mga/mga.ko
+				kernel/drivers/gpu/drm/i915/i915.ko
+				kernel/drivers/gpu/drm/r128/r128.ko
+				kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
+				kernel/drivers/i2c/algos/i2c-algo-bit.ko
+				kernel/drivers/net/netconsole.ko
+				kernel/drivers/net/ethernet/realtek/8139too.ko
+				kernel/drivers/net/ethernet/realtek/r8169.ko
+				kernel/drivers/net/ethernet/nvidia/forcedeth.ko
+				kernel/drivers/net/ethernet/via/via-rhine.ko
+				kernel/drivers/net/ethernet/amd/pcnet32.ko
+				kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+				kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+				kernel/drivers/net/ethernet/sis/sis900.ko
+				kernel/drivers/net/ethernet/broadcom/tg3.ko
+				kernel/drivers/net/ethernet/broadcom/b44.ko
+				kernel/drivers/net/ethernet/intel/e1000/e1000.ko
+				kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
+				kernel/drivers/net/ethernet/intel/e100.ko
+				kernel/drivers/net/ethernet/marvell/skge.ko
+				kernel/drivers/net/ethernet/3com/3c59x.ko
+				kernel/drivers/net/ethernet/dec/tulip/tulip.ko
+				kernel/drivers/hid/hid.ko
+				kernel/drivers/hid/usbhid/usbhid.ko
+				kernel/drivers/platform/x86/wmi.ko
+				kernel/drivers/platform/x86/mxm-wmi.ko
+				kernel/fs/configfs/configfs.ko
+				kernel/fs/nfs_common/nfs_acl.ko
+				kernel/fs/nfs/nfs.ko
+				kernel/fs/fscache/fscache.ko
+				kernel/fs/lockd/lockd.ko
+				kernel/fs/squashfs/squashfs.ko
+				kernel/net/sunrpc/sunrpc.ko
+				kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
+				kernel/net/802/stp.ko
+				kernel/net/bridge/bridge.ko
+				kernel/ubuntu/aufs/aufs.ko"
 REQUIRED_FIRMWARE="     3com/
                         e100/
                         matrox/