--- trunk/mage/usr/lib/mage/smage2.sh	2005/10/02 14:23:11	253
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/10/03 20:54:14	255
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.37 2005-10-02 14:23:11 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.38 2005-10-03 20:54:14 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -512,7 +512,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.37 2005-10-02 14:23:11 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.38 2005-10-03 20:54:14 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -666,6 +666,74 @@
 	done
 }
 
+generate_package_md5sum()
+{
+	local dest
+	local pcat
+	local pname
+	local pver
+	local pbuild
+	local parch
+	local target
+	local pkgname
+
+	# very basic getops
+	for i in $*
+	do
+		case $1 in
+			--pcat|-c) shift; pcat="$1" ;;
+			--pname|-n) shift; pname="$1" ;;
+			--pver|-v) shift; pver="$1" ;;
+			--pbuild|-b) shift; pbuild="$1" ;;
+			--parch|a) shift; parch="$1" ;;
+			--target|t) shift; target="$1" ;;
+		esac
+		shift
+	done
+
+	# sanity checks; abort if not given
+	[ -z "${pcat}" ] && die "generate_package_md5sum() \$pcat not given."
+	[ -z "${pname}" ] && die "generate_package_md5sum() \$pname not given."
+	[ -z "${pver}" ] && die "generate_package_md5sum() \$pver not given."
+	[ -z "${pbuild}" ] && die "generate_package_md5sum() \$pbuild not given."
+	[ -z "${parch}" ] && die "generate_package_md5sum() \$parch not given."
+
+	# check needed global vars
+	[ -z "${PKGDIR}" ] && die "generate_package_md5sum() \$PKGDIR not set."
+	[ -z "${PKGSUFFIX}" ] && die "generate_package_md5sum() \$PKGSUFFIX not set."
+
+	# fix target as it may be empty !
+	[ -n "${target}" ] && target="-${target}"
+
+	# build pkgname
+	pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"
+
+	# build pkg-md5-sum only if requested
+	if [[ ${REGEN_MAGE_TREE} = true ]]
+	then
+		echo -n "Generating a md5sum for ${pkgname}.${PKGSUFFIX} ... "
+
+		# abort if not exist
+		if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]
+		then
+			echo "! exists"
+			return 0
+		fi
+
+		# if MAGE_TREE_DEST not set use BUILDDIR
+		: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
+
+		# setup md5 dir
+		dest="${MAGE_TREE_DEST}/${pcat}/${pname}/md5"
+		install -d ${dest}
+
+		# gen md5sum
+		( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \
+			>> ${dest}/${pkgname}.md5
+		echo "done"
+	fi
+}
+
 # print out our version
 showversion
 echo
@@ -784,6 +852,16 @@
 	source ${SMAGENAME} || die "regen: smage2 not found"
 
 	regen_mage_tree
+
+	# build md5sum for existing packages
+	generate_package_md5sum \
+		--pcat "${PCATEGORIE}" \
+		--pname "${PNAME}" \
+		--pver "${PVER}" \
+		--pbuild "${PBUILD}" \
+		--parch "${ARCH}" \
+		--target "${target}"
+
 	exit 0
 fi
 
@@ -835,7 +913,7 @@
 
 
 source ${SMAGENAME} || die "source failed"
-PKGNAME="${PNAME}-${PVER}-${CHOST%%-*}-${PBUILD}"
+PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
 MD5DIR="$(dirname ${SMAGENAME})/md5"
 
 xtitle "Compiling ${PKGNAME}"
@@ -970,12 +1048,31 @@
 				fi
 				# now create the target package
 				${MLIBDIR}/pkgbuild_dir.sh \
-					"${PNAME}-${target}-${PVER}-${CHOST%%-*}-${PBUILD}" \
+					"${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
 					${BINDIR} || die "target: ${target} package-build failed"
-				echo -e "\nPackage ${PNAME}-${target}-${PVER}-${CHOST%%-*}-${PBUILD} successfully builded.\n"
+
+				# build pkg-md5-sum if requested
+				generate_package_md5sum \
+					--pcat "${PCATEGORIE}" \
+					--pname "${PNAME}" \
+					--pver "${PVER}" \
+					--pbuild "${PBUILD}" \
+					--parch "${ARCH}" \
+					--target "${target}"
+
+				echo -e "\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n"
 			done
 		else
 			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+
+			# build pkg-md5-sum if requested
+			generate_package_md5sum \
+				--pcat "${PCATEGORIE}" \
+				--pname "${PNAME}" \
+				--pver "${PVER}" \
+				--pbuild "${PBUILD}" \
+				--parch "${ARCH}"
+
 			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
 		fi
 		;;