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:
parent
0372557ceb
commit
632340d223
@ -258,6 +258,11 @@ UnPack() {
|
|||||||
|
|
||||||
ArchiveName() {
|
ArchiveName() {
|
||||||
FILENAME=$1
|
FILENAME=$1
|
||||||
|
if [ "$2" ]; then
|
||||||
|
FLAG=$2
|
||||||
|
else
|
||||||
|
FLAG=""
|
||||||
|
fi
|
||||||
|
|
||||||
SUFFIX=`GetSuffix $FILENAME`
|
SUFFIX=`GetSuffix $FILENAME`
|
||||||
BASENAME=`echo $FILENAME|sed -e "s/\.$SUFFIX.*$//"`
|
BASENAME=`echo $FILENAME|sed -e "s/\.$SUFFIX.*$//"`
|
||||||
@ -266,8 +271,12 @@ ArchiveName() {
|
|||||||
BASENAME=`echo $BASENAME|sed -e "s/\.$SUFFIX.*$//"`
|
BASENAME=`echo $BASENAME|sed -e "s/\.$SUFFIX.*$//"`
|
||||||
fi
|
fi
|
||||||
BASENAME=`basename $BASENAME`
|
BASENAME=`basename $BASENAME`
|
||||||
ARCHIVENAME=`echo $BASENAME|sed -e "s/src/bin/"|sed -e "s/SRC/BIN/"| \
|
if [ ! "$FLAG" ]; then
|
||||||
sed -e "s/source/binary/"|sed -e "s/SOURCE/BINARY/"`
|
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
|
echo $ARCHIVENAME.tbz
|
||||||
}
|
}
|
||||||
|
|
||||||
|
18
genpkg
18
genpkg
@ -159,7 +159,11 @@ pkggen() {
|
|||||||
if [ "$FORCEMAKE" == "1" ]; then
|
if [ "$FORCEMAKE" == "1" ]; then
|
||||||
(( MKPKG = $MKPKG | 1 ))
|
(( MKPKG = $MKPKG | 1 ))
|
||||||
fi
|
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/"`
|
DEVPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.dev\.tbz/"`
|
||||||
MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
|
MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
|
||||||
|
|
||||||
@ -697,7 +701,11 @@ if [ ! "$C_FLAG" == "0" ]; then
|
|||||||
PKGGENOPT=""
|
PKGGENOPT=""
|
||||||
else
|
else
|
||||||
source $MODULE
|
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/"`
|
DEVPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.dev\.tbz/"`
|
||||||
MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
|
MANPKGNAME=`echo $PKGNAME|sed -e "s/\.tbz$/\.man\.tbz/"`
|
||||||
if [ "$DEINSTALL" == "1" ]; then
|
if [ "$DEINSTALL" == "1" ]; then
|
||||||
@ -709,7 +717,11 @@ if [ ! "$C_FLAG" == "0" ]; then
|
|||||||
fi
|
fi
|
||||||
if [ "$INSTALL" == "1" ]; then
|
if [ "$INSTALL" == "1" ]; then
|
||||||
PROGNAME=`basename $MODULE`
|
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 ))
|
(( CHECKFLAGS = $MKPKG & 256 ))
|
||||||
if [ "$CHECKFLAGS" == "0" ]; then
|
if [ "$CHECKFLAGS" == "0" ]; then
|
||||||
INSTALLOPTS="-o"
|
INSTALLOPTS="-o"
|
||||||
|
Loading…
Reference in New Issue
Block a user