From 1ca36d264f83632e7453c06c206482c39902842a Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Thu, 24 Jun 2010 17:19:11 +0000
Subject: [PATCH] =?UTF-8?q?Kleine=20Aenderung=20im=20Archive=20Format.=20p?=
 =?UTF-8?q?reinstall=20landet=20nich=20mehr=20im=20bin.tar,=20sondern=20wi?=
 =?UTF-8?q?rd=20ans=20ende=20der=20*.vpg=20datei=20angehaengt,=20und=20mit?=
 =?UTF-8?q?=20der=20gr=C3=B6sse=20in=20der=201.=20Zeile=20aufgenommen.=20D?=
 =?UTF-8?q?amit=20besteht=20das=20*.vpg=20format=20jetzt=20aus=2012=20File?=
 =?UTF-8?q?s=20(dependics,=20Metadata,=20bin.md5,=20bin.dir,=20bin.tar,=20?=
 =?UTF-8?q?dev.md5,=20dev.dir,=20dev.tar,=20man.md5,=20man.dir,=20man.tar,?=
 =?UTF-8?q?=20preinstall)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5721 504e572c-2e33-0410-9681-be2bf7408885
---
 genpkg | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/genpkg b/genpkg
index ac69542..2033f50 100755
--- a/genpkg
+++ b/genpkg
@@ -345,6 +345,10 @@ pkggen() {
 			mkdir -p $DEVTMPROOT/$DIR
 			mv $i $DEVTMPROOT/$DIR
 		done
+		if [ -f $TMPROOT/tmp/preinstall ]; then
+			bzip2 -d -c $TMPROOT/tmp/preinstall $TMPROOT/../$$/preinstall
+			rm $TMPROOT/tmp/preinstall 
+		fi
 		sync
 		InitDispatch
 		if [ ! `find . -type f|wc -l` == "0" ]; then
@@ -443,6 +447,11 @@ pkggen() {
 				LINE=$LINE"0 "
 			fi
 		done
+		if [ -f preinstall ]; then
+			LINE=$LINE"`wc -c meta|awk '{print $1}'` "
+		else
+			LINE=$LINE"0 "
+		fi
 		echo $LINE >$DISTTARGET/$SRCPATH/$PKGNAME
 		if [ -f dep ]; then
 			cat dep >>$DISTTARGET/$SRCPATH/$PKGNAME
@@ -455,6 +464,9 @@ pkggen() {
 				cat $i >>$DISTTARGET/$SRCPATH/$PKGNAME
 			fi
 		done
+		if [ -f preinstall ]; then
+			cat preinstall >>$DISTTARGET/$SRCPATH/$PKGNAME
+		fi
 		cd ..
 		rm -rf $TMPROOT/../$$
 	fi
@@ -475,7 +487,7 @@ pkggen() {
 			else
 				INSTALLOPTS=$INSTALLOPTS" -fi"
 			fi
-			installpkg -o $INSTALLOPTS $DISTTARGET/$SRCPATH/$PKGNAME
+			installpkg -no $INSTALLOPTS $DISTTARGET/$SRCPATH/$PKGNAME
 			CheckError "Installation of $PKGNAME failed"
 		else
 			echo "installing $DISTTARGET/$SRCPATH/$PKGNAME"
@@ -765,7 +777,7 @@ if [ ! "$C_FLAG" == "0" ]; then
 				if [ "$CHECKFLAGS" == "0" ]; then
 					INSTALLOPTS="-o"
 				fi
-				installpkg $INSTALLOPTS -i $DISTTARGET/$SRCPATH/$PKGNAME
+				installpkg $INSTALLOPTS -noi $DISTTARGET/$SRCPATH/$PKGNAME
 			fi
 			DEINSTALL=0
 			INSTALL=0