From 4b02ce98253e47802f6a9ee8f5084b3df0961062 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Thu, 19 Nov 2009 19:53:02 +0000
Subject: [PATCH] Anpassung an Archive Format Verbesserungen...zur Performance
 Optimierung von installpkg

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4896 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/gpplib |   2 +-
 Scripts/makepackage      |   4 +-
 functions/functions      | 110 ++++++++++++++++++++++++---------------
 genpkg                   |  31 +++--------
 4 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/BaseBuild/Basesys/gpplib b/BaseBuild/Basesys/gpplib
index d9e8461..6ee5999 100644
--- a/BaseBuild/Basesys/gpplib
+++ b/BaseBuild/Basesys/gpplib
@@ -95,7 +95,7 @@ mk() {
 	cd gpplib
 	tar -jxvf $DISTTARGET/Base/Development/gcc-[0-9]*.tbz
 	tar -xvf bin.tar
-	rm {bin,man,dev}.{tar,md5,frg,drg}
+	rm {bin,man,dev}.{tar,cont,drg}
 	rm -r usr/bin usr/include usr/info usr/man usr/share
 	if [ "$MK64BIT" == "true" ]; then
 		rm -r usr/lib64/gcc
diff --git a/Scripts/makepackage b/Scripts/makepackage
index c2fc0d6..85e6b00 100755
--- a/Scripts/makepackage
+++ b/Scripts/makepackage
@@ -107,7 +107,7 @@ if [ ! -d $TMPROOT/../$$ ]; then
 	mkdir -p $TMPROOT/../$$
 fi
 
-ARCHCONTENTS="bin.drg bin.frg bin.md5 bin.tar dev.drg dev.frg dev.md5 dev.tar man.drg man.frg man.md5 man.tar"
+ARCHCONTENTS="bin.drg bin.cont bin.tar dev.drg dev.cont dev.tar man.drg man.cont man.tar"
 DEPFILE=$TMPROOT/../$$/dep
 METAFILE=$TMPROOT/../$$/meta
 
@@ -227,7 +227,7 @@ if [ -f $METAFILE ]; then
 else
 	LINE=$LINE"0 "
 fi
-for i in *.frg *.drg *.md5; do
+for i in *.cont *.drg *.md5; do
 	bzip2 $i
 	mv $i.bz2 $i
 done
diff --git a/functions/functions b/functions/functions
index 9cf553d..e5badbf 100644
--- a/functions/functions
+++ b/functions/functions
@@ -342,7 +342,7 @@ GenDependics() {
 	if [ -f /tmp/lddlist$$ ]; then
 		rm /tmp/lddlist$$
 	fi
-	for execfile in `find -type f ! -type l -perm -u+rx,g+rx`; do
+	for execfile in `find $PKGROOT -type f ! -type l -perm -u+rx,g+rx`; do
 		if file $execfile |grep "LSB executable" &>/dev/null; then
 			ldd $execfile|\
 			sed -e "/not a dynamic/d"|\
@@ -540,30 +540,63 @@ Asc2Oct() {
 }
 
 MakeMgtFiles() {
-	FilePrefix=$1
-	find . -type f ! -type l -exec md5sum {} \;|\
-          	sed -e "s/\.\//\//" >$TMPROOT/../$$/$FilePrefix.md5
-	find . -type d -ls|\
-  	awk '{ if ( $11 != "." ) print $3,$5,$6,$11 }' |\
-  	sed -e "s/\.\//\//" >/tmp/DirRight$$.$FilePrefix
-	exec 3</tmp/DirRight$$.$FilePrefix
-	while read <&3 RIGHTS USERID GROUPID NAME; do
-        	echo "$NAME `GetFlags $RIGHTS` $USERID $GROUPID"
-	done >$TMPROOT/../$$/$FilePrefix.drg
-	exec 3>&-
-	find . -type f -ls|\
-  	awk '{ print $3,$5,$6,$11 }' |\
-  	sed -e "s/\.\//\//" >/tmp/FileRight$$.$FilePrefix
-	find . -type l -ls|\
-  	awk '{ print $3,$5,$6,$11 }' |\
-  	sed -e "s/\.\//\//" >>/tmp/FileRight$$.$FilePrefix
-	exec 3</tmp/FileRight$$.$FilePrefix
-	while read <&3 RIGHTS USERID GROUPID NAME; do
-        	echo "$NAME `echo $RIGHTS|cut -c1` `GetFlags $RIGHTS` $USERID $GROUPID"
-	done >$TMPROOT/../$$/$FilePrefix.frg
-	exec 3>&-
-	rm /tmp/DirRight$$.$FilePrefix
-	rm /tmp/FileRight$$.$FilePrefix
+        FilePrefix=$1
+	PKGNAME=`echo $PKGNAME|sed -e "s/\.vpg$//"`
+        if [ "$SHORTNAME" ]; then
+                SHNAME=$SHORTNAME
+        else
+                SHNAME=`basename $MODULENAME`
+        fi
+        find . -type d -ls|\
+        awk '{ if ( $11 != "." ) print $3,$5,$6,$11 }' |\
+        sed -e "s/\.\//\//" >/tmp/DirRight$$.$FilePrefix
+        exec 3</tmp/DirRight$$.$FilePrefix
+        while read <&3 RIGHTS USERID GROUPID NAME; do
+                echo "$NAME `GetFlags $RIGHTS` $USERID $GROUPID"
+        done >$TMPROOT/../$$/$FilePrefix.drg
+        exec 3>&-
+        find . ! -type d -ls|\
+        awk '{ print $3,$5,$6,$11 }'|\
+        sed -e "s/\.\//\//" >/tmp/FileList$$
+        exec 3</tmp/FileList$$
+        while read <&3 RIGHTS USERID GROUPID NAME; do
+                TYPE=`echo $RIGHTS|cut -c1`
+                RIGHT=`echo $RIGHTS|GetFlags $RIGHTS`
+                if [ -f .$NAME ] && [ ! -h .$NAME ]; then
+                        MDSUM=`md5sum .$NAME|cut -d" " -f1`
+                else
+                        MDSUM=""
+                fi
+                case $TYPE in
+                "-")
+                        TYPE="File"
+                        ;;
+                "l")
+                        TYPE="Link"
+                        ;;
+                "d")
+                        TYPE="Dir"
+                        ;;
+                "s")
+                        TYPE="Socket"
+                        ;;
+                "c")
+                        TYPE="DeviceC"
+                        ;;
+                "b")
+                        TYPE="DeviceB"
+                        ;;
+                "p")
+                        TYPE="Pipe"
+                        ;;
+                *)
+                        TYPE="Unknown"
+                        ;;
+                esac
+                echo "PN=$SHNAME;FN=$NAME;FT=$TYPE;FR=$RIGHT;FO=$OWNER;FS=$MDSUM;PK=$PKGNAME"
+        done >$TMPROOT/../$$/$FilePrefix.cont
+        exec 3>&-
+        rm /tmp/FileList$$
 }	
 
 X11R7_Fix() {
@@ -657,7 +690,7 @@ DispatchCMD() {
 EndDispatch() {
 	NUMCMD=1
 	EXECPROCNUM=$NUMCPU
-	while [ ${NUMCMD} -le $EXECPROCNUM ]; do
+	while [ "${NUMCMD}" -le "$EXECPROCNUM" ]; do
 		cat >${CMDF[${NUMCMD}]} <<EOF
 
 wshutdown
@@ -717,38 +750,29 @@ extractfile() {
                 bin.drg)
                         LINE=`echo $LINE|cut -d" " -f 3-`
                         ;;
-                bin.frg)
+                bin.cont)
                         LINE=`echo $LINE|cut -d" " -f 4-`
                         ;;
-                bin.md5)
+                bin.tar)
                         LINE=`echo $LINE|cut -d" " -f 5-`
                         ;;
-                bin.tar)
+                dev.drg)
                         LINE=`echo $LINE|cut -d" " -f 6-`
                         ;;
-                dev.drg)
+                dev.cont)
                         LINE=`echo $LINE|cut -d" " -f 7-`
                         ;;
-                dev.frg)
+                dev.tar)
                         LINE=`echo $LINE|cut -d" " -f 8-`
                         ;;
-                dev.md5)
+                man.drg)
                         LINE=`echo $LINE|cut -d" " -f 9-`
                         ;;
-                dev.tar)
+                man.cont)
                         LINE=`echo $LINE|cut -d" " -f 10-`
                         ;;
-                man.drg)
-                        LINE=`echo $LINE|cut -d" " -f 11-`
-                        ;;
-                man.frg)
-                        LINE=`echo $LINE|cut -d" " -f 12-`
-                        ;;
-                man.md5)
-                        LINE=`echo $LINE|cut -d" " -f 13-`
-                        ;;
                 man.tar)
-                        LINE=`echo $LINE|cut -d" " -f 14-`
+                        LINE=`echo $LINE|cut -d" " -f 11-`
                         ;;
         esac
         BEGSIZE=0
diff --git a/genpkg b/genpkg
index 9ffdf06..a1745b8 100755
--- a/genpkg
+++ b/genpkg
@@ -164,8 +164,6 @@ pkggen() {
 	else
 		PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
 	fi
-	DEVPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.dev\.tbz/"`
-	MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
 	
 	(( CHECKFLAG = $MKPKG & 5 ))
 	if [ "$CHECKFLAG" == "0" ]; then
@@ -370,7 +368,7 @@ pkggen() {
 		EndDispatch
 		sync
 		cd $TMPROOT/../$$
-		for i in bin.frg bin.drg bin.md5 man.frg man.drg man.md5 dev.frg dev.drg dev.md5; do
+		for i in bin.cont bin.drg man.cont man.drg dev.cont dev.drg ; do
 			if [ -f $i ]; then
 				cd $TMPROOT/../$$
 				bzip2 $i
@@ -417,7 +415,7 @@ pkggen() {
 			    -e "/^$/d" >>$METAFILE
 		bzip2 -9 $METAFILE
 		mv $METAFILE.bz2 $METAFILE
-		ARCHCONTENTS="bin.drg bin.frg bin.md5 bin.tar dev.drg dev.frg dev.md5 dev.tar man.drg man.frg man.md5 man.tar"
+		ARCHCONTENTS="bin.drg bin.cont bin.tar dev.drg dev.cont dev.tar man.drg man.cont man.tar"
 		cd $TMPROOT/../$$
 		if [ -f dep ]; then
 			LINE="`wc -c dep|awk '{print $1}'` "
@@ -513,25 +511,10 @@ pkggen() {
 				SHNAME=$PKGNAME
 			fi
 			for k in bin dev man; do
-				extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.frg >/tmp/$k.frg$$
-				extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.md5 >/tmp/$k.md5$$
-				if [ "`wc -c /tmp/$k.frg$$|awk '{print $1}'`" -gt "0" ]; then
-					exec 5</tmp/$k.frg$$
-					while read <&5 FILE TYP RIGHT OWNER GROUP; do
-						if [ `fgrep $FILE /tmp/$k.md5$$|wc -l` -gt 1 ]; then
-							MD5SUM=`grep ${FILE}$ /tmp/$k.md5$$|awk '{print $1}'`
-						else 
-							MD5SUM=`fgrep ${FILE} /tmp/$k.md5$$|awk '{print $1}'`
-						fi
-						echo "PN=$SHNAME;FN=$FILE;FT=$TYP;FR=$RIGHT;FO=$OWNER;FG=$GROUP;FS=$MD5SUM;PK=$PKGNAME" >>/var/install/contents
-					done
-					exec 5<&-
-					rm /tmp/$k.frg$$
-					rm /tmp/$k.md5$$
-					extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.drg >/var/install/$PKGNAME/$k/DirRights
-					if [ "`wc -c /var/install/$PKGNAME/$k/DirRights|awk '{print $1}'`" == "0" ]; then
-						rm /var/install/$PKGNAME/$k/DirRights
-					fi
+				extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.cont >>/var/install/contents
+				extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.drg >/var/install/$PKGNAME/$k/DirRights
+				if [ "`wc -c /var/install/$PKGNAME/$k/DirRights|awk '{print $1}'`" == "0" ]; then
+					rm /var/install/$PKGNAME/$k/DirRights
 				fi
 			done
 			if [ -f /tmp/postinstall ]; then
@@ -755,8 +738,6 @@ if [ ! "$C_FLAG" == "0" ]; then
 			else
 				PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
 			fi
-			DEVPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.dev\.tbz/"`
-			MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
 			if [ "$DEINSTALL" == "1" ]; then
 				RMTMPFILE=`basename $MODULE`
 				RMFILE=`echo $RMTMPFILE |\