.pkglist wird jetzt generiert. sed kommands aufgeraeumt. cfg generierung korrigiert

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5216 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2010-01-25 16:59:42 +00:00
parent 42542defa0
commit ec09f9133c

View File

@ -48,15 +48,13 @@ source $VMAKEDIR/defsys
CleanUp() { CleanUp() {
if [ "$RCBASH" == "1" ]; then if [ "$RCBASH" == "1" ]; then
sed -e "s%#source ./makeall%source ./makeall%" $HOME/.bash_profile >/tmp/bash_profile$$ sed -i "s%#source ./makeall%source ./makeall%" $HOME/.bash_profile
mv /tmp/bash_profile$$ $HOME/.bash_profile
export RCBASH=0 export RCBASH=0
fi fi
} }
BashRcMod() { BashRcMod() {
sed -e "s%^source ./makeall%#source ./makeall%" $HOME/.bash_profile >/tmp/bash_profile$$ sed -i "s%^source ./makeall%#source ./makeall%" $HOME/.bash_profile
mv /tmp/bash_profile$$ $HOME/.bash_profile
export RCBASH=1 export RCBASH=1
} }
@ -130,23 +128,11 @@ done
msgfmt ViitorInstall/locale/Viitor_Install.pod.de -o /usr/share/locale/de/LC_MESSAGES/Viitor_Install.mo msgfmt ViitorInstall/locale/Viitor_Install.pod.de -o /usr/share/locale/de/LC_MESSAGES/Viitor_Install.mo
mv ViitorInstall install mv ViitorInstall install
cd install cd install
BINDIR=`basename $DISTTARGET` ./GenPkgList `dirname $DISTTARGET`/BINARY >`dirname $DISTTARGET`/.pkglist
sed -e "s/^BINARY/$BINDIR/" BaseSystem.cfg >/tmp/BaseSystem.cfg sed -i "s/BINARY/$BINDIR/g"
mv /tmp/BaseSystem.cfg BaseSystem.cfg
sed -e "s/^BINARY/$BINDIR/" Mini.cfg >/tmp/Mini.cfg
mv /tmp/Mini.cfg Mini.cfg
sed -e "s/BINARY/$BINDIR/g" MakeLST >/tmp/MakeLST
mv /tmp/MakeLST MakeLST
sed -e "s/BINARY/$BINDIR/g" Make_Config >/tmp/Make_Config
mv /tmp/Make_Config Make_Config
sed -e "s/BINARY/$BINDIR/g" checkinstall >/tmp/checkinstall
mv /tmp/checkinstall checkinstall
chmod 755 * chmod 755 *
./gennetcfgs
cd ..
cd genCD cd genCD
sed -e "s/BINARY/$BINDIR/g" .genCD_Functions >/tmp/.genCD_Functions sed -i "s/BINARY/$BINDIR/g" .genCD_Functions
mv /tmp/.genCD_Functions .genCD_Functions
chmod 755 * chmod 755 *
cd .. cd ..
if [ "$CVSASK" ]; then if [ "$CVSASK" ]; then
@ -157,8 +143,8 @@ fi
svn co $SVNURL/Viitor_cdboot svn co $SVNURL/Viitor_cdboot
mv Viitor_cdboot/$BOOTDIR boot mv Viitor_cdboot/$BOOTDIR boot
rm -r Viitor_cdboot rm -r Viitor_cdboot
$VMAKEDIR/Scripts/GenBaseCfg >`basename $DISTTARGET/install/BaseDevel.cfg` $VMAKEDIR/Scripts/GenBaseCfg >`basename `dirname $DISTTARGET`/install/BaseDevel.cfg`
$VMAKEDIR/Scripts/GenBuildList >`basename $DISTTARGET/install/All.cfg` $VMAKEDIR/Scripts/GenBuildList >`basename `dirname $DISTTARGET`/install/All.cfg`
umount /tmp umount /tmp
umount /dev/pts umount /dev/pts
umount /dev/shm umount /dev/shm