Durch setzen von NoRewriteRule auf true, kann das umschreiben von src zu bin, und source to binary

im packagenamen verhindert werden.



git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4821 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-07-14 04:49:30 +00:00
parent 0372557ceb
commit 632340d223
2 changed files with 26 additions and 5 deletions

View File

@ -258,6 +258,11 @@ UnPack() {
ArchiveName() {
FILENAME=$1
if [ "$2" ]; then
FLAG=$2
else
FLAG=""
fi
SUFFIX=`GetSuffix $FILENAME`
BASENAME=`echo $FILENAME|sed -e "s/\.$SUFFIX.*$//"`
@ -266,8 +271,12 @@ ArchiveName() {
BASENAME=`echo $BASENAME|sed -e "s/\.$SUFFIX.*$//"`
fi
BASENAME=`basename $BASENAME`
ARCHIVENAME=`echo $BASENAME|sed -e "s/src/bin/"|sed -e "s/SRC/BIN/"| \
sed -e "s/source/binary/"|sed -e "s/SOURCE/BINARY/"`
if [ ! "$FLAG" ]; then
ARCHIVENAME=`echo $BASENAME|sed -e "s/src/bin/"|sed -e "s/SRC/BIN/"| \
sed -e "s/source/binary/"|sed -e "s/SOURCE/BINARY/"`
else
ARCHIVENAME=$BASENAME
fi
echo $ARCHIVENAME.tbz
}

18
genpkg
View File

@ -159,7 +159,11 @@ pkggen() {
if [ "$FORCEMAKE" == "1" ]; then
(( MKPKG = $MKPKG | 1 ))
fi
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
if [ "$NoRewriteName" == "true" ]; then
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t* 1`
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/"`
@ -697,7 +701,11 @@ if [ ! "$C_FLAG" == "0" ]; then
PKGGENOPT=""
else
source $MODULE
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
if [ "$NoRewriteName" == "true" ]; then
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t* 1`
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
@ -709,7 +717,11 @@ if [ ! "$C_FLAG" == "0" ]; then
fi
if [ "$INSTALL" == "1" ]; then
PROGNAME=`basename $MODULE`
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
if [ "$NoRewriteName" == "true" ]; then
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t* 1`
else
PKGNAME=`ArchiveName $LFSSOURCE/$SRCPATH/$PROGNAME$PATTERN*.t*`
fi
(( CHECKFLAGS = $MKPKG & 256 ))
if [ "$CHECKFLAGS" == "0" ]; then
INSTALLOPTS="-o"