Index: branches/iFabio/Chameleon/package/buildpkg
===================================================================
--- branches/iFabio/Chameleon/package/buildpkg	(revision 275)
+++ branches/iFabio/Chameleon/package/buildpkg	(revision 276)
@@ -54,12 +54,12 @@
 	cp -f ${1%/*}/i386/boot ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot0 ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot0hfs ${1}/Core/Root/usr/standalone/i386
-	cp -f ${1%/*}/i386/boot1f32 ${1}/Core/Root/usr/standalone/i386
+	#cp -f ${1%/*}/i386/boot1f32 ${1}/Core/Root/usr/standalone/i386
 	cp -f ${1%/*}/i386/boot1h ${1}/Core/Root/usr/standalone/i386
-	cp -f ${1%/*}/i386/boot1he ${1}/Core/Root/usr/standalone/i386
-	cp -f ${1%/*}/i386/boot1hp ${1}/Core/Root/usr/standalone/i386
-	cp -f ${1%/*}/i386/cdboot ${1}/Core/Root/usr/standalone/i386
-	cp -f ${1%/*}/i386/chain0 ${1}/Core/Root/usr/standalone/i386
+	#cp -f ${1%/*}/i386/boot1he ${1}/Core/Root/usr/standalone/i386
+	#cp -f ${1%/*}/i386/boot1hp ${1}/Core/Root/usr/standalone/i386
+	#cp -f ${1%/*}/i386/cdboot ${1}/Core/Root/usr/standalone/i386
+	#cp -f ${1%/*}/i386/chain0 ${1}/Core/Root/usr/standalone/i386
 	fixperms "${1}/Core/Root/"
 	cp -f ${pkgroot}/fdisk ${1}/Core/Root/usr/sbin
 	cp -f ${1%/*}/i386/bdmesg ${1}/Core/Root/usr/sbin
@@ -77,7 +77,7 @@
 		mkdir -p ${1}/Standard/Scripts/Tools
 		cp -f ${pkgroot}/Scripts/Standard/* ${1}/Standard/Scripts
 		ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile
-		echo "	[BUILD] standard "
+		echo "	[BUILD] Standard "
 		buildpackage "${1}/Standard" "/tmpcham" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EFI']) && exclusive(choices['noboot'])\"" >/dev/null 2>&1
 	# End build standard package 
 
@@ -102,37 +102,59 @@
 		((xmlindent++))
 		packagesidentity="org.chameleon.modules.pkg"
 
-		# build Module-One
-			mkdir -p ${1}/Module-One/Root
-			# mkdir -p ${1}/Module-One/Scripts/Tools
-			# cp -f ${pkgroot}/Scripts/Module-One/* ${1}/Module-n/Scripts
-			# ditto --arch i386 `which SetFile` ${1}/Module-One/Scripts/Tools/SetFile
-			echo "	[BUILD] Modules-One "
-			buildpackage "${1}/Module-one" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
-		# End build Module-One
+		# build Module Resolution
+			mkdir -p ${1}/ModResolution/Root
+			# mkdir -p ${1}/ModResolution/Scripts/Tools
+			# cp -f ${pkgroot}/Scripts/ModResolution/* ${1}/ModResolution/Scripts
+			# ditto --arch i386 `which SetFile` ${1}/ModResolution/Scripts/Tools/SetFile
+			echo "	[BUILD] Module Resolution "
+			buildpackage "${1}/ModResolution" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
+		# End build Module Resolution
 
 		# build Module-Two
 			mkdir -p ${1}/Module-Two/Root
 			# mkdir -p ${1}/Module-Two/Scripts/Tools
 			# cp -f ${pkgroot}/Scripts/Module-Two/* ${1}/Module-n/Scripts
 			# ditto --arch i386 `which SetFile` ${1}/Module-Two/Scripts/Tools/SetFile
-			echo "	[BUILD] Modules-Two "
+			echo "	[BUILD] Modules Empy choice "
 			buildpackage "${1}/Module-Two" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
 		# End build Module-Two
 
-		# build Module-n
-			mkdir -p ${1}/Module-n/Root
-			# mkdir -p ${1}/Module-n/Scripts/Tools
-			# cp -f ${pkgroot}/Scripts/Module-n/* ${1}/Module-n/Scripts
-			# ditto --arch i386 `which SetFile` ${1}/Module-n/Scripts/Tools/SetFile
-			echo "	[BUILD] Modules-n "
-			buildpackage "${1}/Module-n" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
-		# End build Module-n
+		# build Dependencies Modules package
+			outline[$((outlinecount++))]="${indent[$xmlindent]}\t<line choice=\"Modklibc\">"
+			choices[$((choicescount++))]="<choice\n\tid=\"Modklibc\"\n\ttitle=\"Modklibc_title\"\n\tdescription=\"Modklibc_description\"\n>\n</choice>\n"
+			((xmlindent++))
+			packagesidentity="org.chameleon.modules.klibc.pkg"
+			echo "	[BUILD] Module klibc "
 
+			# build Module klibc
+				mkdir -p ${1}/Modklibc/Root
+				# mkdir -p ${1}/klibc/Scripts/Tools
+				# cp -f ${pkgroot}/Scripts/klibc/* ${1}/klibc/Scripts
+				# ditto --arch i386 `which SetFile` ${1}/klibc/Scripts/Tools/SetFile
+				# buildpackage "${1}/klibc" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
+			# End build Module klibc
+
+			# choices[$((choicescount++))]="<choice\n\tid=\"klibc\"\n\ttitle=\"klibc_title\"\n\tdescription=\"klibc_description\"\n>\n</choice>\n"
+			
+			
+
+			# build Module uClibc++
+				mkdir -p ${1}/ModuClibc++/Root
+				# mkdir -p ${1}/uClibc++/Scripts/Tools
+				# cp -f ${pkgroot}/Scripts/uClibc++/* ${1}/uClibc++/Scripts
+				# ditto --arch i386 `which SetFile` ${1}/uClibc++/Scripts/Tools/SetFile
+				echo "	[BUILD] Module uClibc++ "
+				buildpackage "${1}/ModuClibc++" "/Extra/modules" "${coresize}" "" "start_selected=\"false\"" >/dev/null 2>&1
+			
+			((xmlindent--))
+			outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
+			# End build Module-n
+
 		((xmlindent--))
 		outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
 	# End utility package
-	# End build Modules package 
+	# End build Dependencies Modules package 
 
 	((xmlindent--))
 	outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"