SHNAME wird jetzt korrekt gesetzt, bevor die Daten in /var/install/contents landen.
Korrektur bei der Erzugung von FS=<md5sum>, so dass mehrfachtreffer in *.md5 keine Fehler mehr erzeugen git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4598 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
26b0ec1ad8
commit
473ec90e53
9
genpkg
9
genpkg
@ -445,13 +445,18 @@ pkggen() {
|
|||||||
grep ModuleName $DISTTARGET/$SRCPATH/$PKGNAME.meta|\
|
grep ModuleName $DISTTARGET/$SRCPATH/$PKGNAME.meta|\
|
||||||
awk '{print $2}' \
|
awk '{print $2}' \
|
||||||
>$ROOT/var/install/$PKGNAME/shortname
|
>$ROOT/var/install/$PKGNAME/shortname
|
||||||
fi
|
fi
|
||||||
|
SHNAME=`cat $ROOT/var/install/$PKGNAME/shortname`
|
||||||
for k in bin dev man; do
|
for k in bin dev man; do
|
||||||
if [ -f /var/install/tmp/$$/$k.tar ]; then
|
if [ -f /var/install/tmp/$$/$k.tar ]; then
|
||||||
if [ -f /var/install/tmp/$$/$k.frg ]; then
|
if [ -f /var/install/tmp/$$/$k.frg ]; then
|
||||||
exec 5</var/install/tmp/$$/$k.frg
|
exec 5</var/install/tmp/$$/$k.frg
|
||||||
while read <&5 FILE TYP RIGHT OWNER GROUP; do
|
while read <&5 FILE TYP RIGHT OWNER GROUP; do
|
||||||
MD5SUM=`grep $FILE $ROOT/var/install/tmp/$$/$k.md5|awk '{print $1}'`
|
if [ `fgrep $FILE $ROOT/var/install/tmp/$$/$k.md5|wc -l` -gt 1 ]; then
|
||||||
|
MD5SUM=`grep ${FILE}$ $ROOT/var/install/tmp/$$/$k.md5|awk '{print $1}'`
|
||||||
|
else
|
||||||
|
MD5SUM=`fgrep ${FILE} $ROOT/var/install/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
|
echo "PN=$SHNAME;FN=$FILE;FT=$TYP;FR=$RIGHT;FO=$OWNER;FG=$GROUP;FS=$MD5SUM;PK=$PKGNAME" >>/var/install/contents
|
||||||
done
|
done
|
||||||
exec 5<&-
|
exec 5<&-
|
||||||
|
Loading…
Reference in New Issue
Block a user