Changeset 4469

Timestamp:

Nov 6, 2010, 1:10:27 PM (15 years ago)

Author:

obi

Message:

fix

File:

• ipk/make-ipk (modified) (11 diffs)

ipk/make-ipk

@@ -96 +96 @@
 fi
 
-rm -r "$HOME"/ipk/WWW/*.ipk > /dev/null 2>&1
-rm -r "$HOME"/ipk/WWW/Packages* > /dev/null 2>&1
-rm -r "$HOME"/ipk/WWW/PlugList > /dev/null 2>&1
-rm -r "$HOME"/ipk/WWW/boot > /dev/null 2>&1
-rm -r "$HOME"/ipk/*.ipk > /dev/null 2>&1
-rm -r "$HOME"/ipk/Packages* > /dev/null 2>&1
-rm -r "$HOME"/ipk/PlugList > /dev/null 2>&1
-rm -r "$HOME"/ipk/boot > /dev/null 2>&1
+rm -r "$HOME"/ipk/BUILD > /dev/null 2>&1
+rm -r "$HOME"/ipk/BUILDRELEASE > /dev/null 2>&1
+
+mkdir -p "$HOME"/ipk/BUILD
+mkdir -p "$HOME"/ipk/BUILDRELEASE
 
 svn co --username $SVNUSER --password $SVNPASS svn://"$SVNURL":"$SVNPORT"/ufs910/image/scripts $HOMEDIR/scripts
@@ -110 +107 @@
 . ./config/make-config
 
-if [ $GROUP = "dev" ];then
-        mkdir -p "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA"
-        ln -s "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA" "$HOME"/ipk/WWW
-        ln -s "$HOME"/ipk/tmp-source "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/source 
-elif [ $GROUP = "update" ];then
-        mkdir -p "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"
-        ln -s "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE" "$HOME"/ipk/WWW
-        ln -s "$HOME"/ipk/tmp-source "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/source 
-fi
-rm -r "$HOME"/ipk/tmp-source
-cp -a "$HOME"/ipk/source "$HOME"/ipk/tmp-source
-ls -1 "$HOME"/ipk/tmp-source > aaf-flashbeta.txt
-cp -a "$HOME"/ipk/bootvideos "$HOME"/ipk/tmp-source/bootvideos
+cp -a "$HOME"/ipk/source "$HOME"/ipk/BUILD
+ls -1 "$HOME"/ipk/BUILD > aaf-flashbeta.txt
+cp -a "$HOME"/ipk/bootvideos "$HOME"/ipk/BUILDRELEASE/boot
 
 LIST_LINE=`cat aaf-flashbeta.txt`
 ALLOWED=`cat "$HOME"/ipk/aaf-flashbeta_allowed`
 
-cd "$HOME"/ipk/WWW      
-chmod -R 755 `find "$HOME"/ipk/tmp-source -type d -name "CONTROL"`
-chmod -R 755 `find "$HOME"/ipk/tmp-source -type d -name "bin"`
-chmod -R 755 `find "$HOME"/ipk/tmp-source -type d -name "sbin"` 
-chmod -R 755 `find "$HOME"/ipk/tmp-source -type d -name "emu"`
-
-# for externel files
-#cp "$HOME"/WWW/civer/*.ipk ~/WWW
+cd "$HOME"/ipk/BUILD    
+chmod -R 755 `find "$HOME"/ipk/BUILD -type d -name "CONTROL"`
+chmod -R 755 `find "$HOME"/ipk/BUILD -type d -name "bin"`
+chmod -R 755 `find "$HOME"/ipk/BUILD -type d -name "sbin"`      
+chmod -R 755 `find "$HOME"/ipk/BUILD -type d -name "emu"`
 
 for ROUND in $ALLOWED; do
@@ -150 +134 @@
 echo LIST: $LIST
 
-rm -r `find "$HOME"/ipk/tmp-source -type d -name "*.svn"`
+rm -r `find "$HOME"/ipk/BUILD -type d -name "*.svn"`
 
 ###################  SHRINK PYTHON FILES  #########################
 
-"$HOME"/ipk/scripts/kf-pyshrink.sh ./ "$HOME"/ipk/tmp-source "$PYTHONVER" "$SKIPPEDSHRINK"
+"$HOME"/ipk/scripts/kf-pyshrink.sh ./ "$HOME"/ipk/BUILD "$PYTHONVER" "$SKIPPEDSHRINK"
 
 ###
 cd $HOMEDIR
 echo make py var
-ls -R -1 "$HOME"/ipk/tmp-source | grep "/" | sed 's/.$//' > tmp.txt
+ls -R -1 "$HOME"/ipk/BUILD | grep "/" | sed 's/.$//' > tmp.txt
 LINE=`cat tmp.txt`
 for DIR in $LINE; do
@@ -180 +164 @@
 ###
 rm "$HOME"/ipk/pylist.tmp
-rm -r `find "$HOME"/ipk/tmp-source -type f -name "*.py" -print`
-rm -r `find "$HOME"/ipk/tmp-source -type f -name "*.po" -print`
+rm -r `find "$HOME"/ipk/BUILD -type f -name "*.py" -print`
+rm -r `find "$HOME"/ipk/BUILD -type f -name "*.po" -print`
 
 rm -r "$HOME"/ipk/preview
@@ -188 +172 @@
 ###################  SHRINK PNG FILES  #########################
 
-PNGFILES=`find "$HOME"/ipk/tmp-source -type f -name "*.png" -print`
+PNGFILES=`find "$HOME"/ipk/BUILD -type f -name "*.png" -print`
 
 for DIR in $PNGFILES; do
@@ -197 +181 @@
 ###################  STRIPPED ALL FILES  #########################
 
-FILEALL=`find "$HOME"/ipk/tmp-source -name "*" -print`
+FILEALL=`find "$HOME"/ipk/BUILD -name "*" -print`
 
 if ( test -f "$HOME"/ipk/scripts/sh4-linux-strip ); then
@@ -220 +204 @@
 for DIR in $LIST; do
         echo "$DIR"
-        NAME=`cat "$HOME"/ipk/tmp-source/"$DIR"/CONTROL/control | grep Package: | tr " " "\n" | tr "-" "\n" | tail -n 1 | cut -d . -f1 | head -n1`
-#       ARCH=`cat "$HOME"/ipk/tmp-source/"$DIR"/CONTROL/control | grep Architecture: | tr " " "\n" | tail -n 1`
-#       cp "$HOME"/ipk/tmp-source/"$DIR"/preview/prev.png "$HOME"/ipk/preview/enigma2-pluginpreview-"$NAME"_"$ARCH".ipk.png
-        cp "$HOME"/ipk/tmp-source/"$DIR"/preview/prev.png "$HOME"/ipk/preview/enigma2-pluginpreview-"$NAME".png
-        rm -r "$HOME"/ipk/tmp-source/"$DIR"/preview
-done
-
-if [ $GROUP = "dev" ];then
-        rm "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$IPKGCROSS_BETA"
-        cd "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA"
-elif [ $GROUP = "update" ];then
-        rm "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$IPKGCROSS_RELEASE"
-        cd "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"
-fi
-
-rm *.ipk
-rm Packages*
+        NAME=`cat "$HOME"/ipk/BUILD/"$DIR"/CONTROL/control | grep Package: | tr " " "\n" | tr "-" "\n" | tail -n 1 | cut -d . -f1 | head -n1`
+#       ARCH=`cat "$HOME"/ipk/BUILD/"$DIR"/CONTROL/control | grep Architecture: | tr " " "\n" | tail -n 1`
+#       cp "$HOME"/ipk/BUILD/"$DIR"/preview/prev.png "$HOME"/ipk/preview/enigma2-pluginpreview-"$NAME"_"$ARCH".ipk.png
+        cp "$HOME"/ipk/BUILD/"$DIR"/preview/prev.png "$HOME"/ipk/preview/enigma2-pluginpreview-"$NAME".png
+        rm -r "$HOME"/ipk/BUILD/"$DIR"/preview
+done
+
+
+cd "$HOME"/ipk/BUILDRELEASE
 
 for DIR in $LIST; do
-        ipkg-build "$HOME"/ipk/tmp-source/"$DIR"
-done
-
-rm "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$IPKGCROSS_BETA"
+        ipkg-build "$HOME"/ipk/BUILD/"$DIR"
+done
+
 date=`date`
 echo "make-index"
@@ -248 +223 @@
 
 ipkg-make-index -l Packages.filelist -p Packages -v .
-#ipkg-make-index . > Packages
-#echo "pack Packages"
-#gzip Packages
-#ipkg-make-index . > Packages
 
 echo "Here is the public AAF-Flash-PlugList" > PlugList
@@ -267 +238 @@
 tar czvf Packages.preview.tar.gz ./preview
 
-mv "$HOME"/ipk/Packages.preview.tar.gz "$HOME"/ipk/WWW/
-
-mkdir "$HOME"/ipk/WWW/boot
-mv "$HOME"/ipk/bootvideos/* "$HOME"/ipk/WWW/boot
-#mv *.ipk "$HOME"/ipk/WWW/
-
-if [ $GROUP = "dev" ];then
-        cd "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_BETA"
-elif [ $GROUP = "update" ];then
-        cd "$WWWLOCAL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"
-fi
+mv "$HOME"/ipk/Packages.preview.tar.gz "$HOME"/ipk/BUILDRELEASE
+
+cd "$HOME"/ipk/BUILDRELEASE
 
 PACKAGESLIST=`ls -1 Packages*`
@@ -283 +246 @@
 
 if [ $GROUP = "update" ] && [ $MAKETYPE = "online" ];then
-
-#       echo quote USER $URLBETAUSER >"$HOME"/ipk//ftp.txt
-#       echo quote PASS $URLBETAPASS >>"$HOME"/ipk//ftp.txt
-#       echo cd "$WWWMAIN"/"$WWWPUBLIC" >>"$HOME"/ipk//ftp.txt
-#       echo del "/svn/aaf-flash-beta" >>"$HOME"/ipk//ftp.txt
-#       echo quit >>"$HOME"/ipk/ftp.txt
-#       ftp -n "$URLBETA" < "$HOME"/ipk/ftp.txt 
-
         for ROUND in $PACKAGESLIST; do
                 wput -u "$PUBLICRELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$ROUND"
@@ -331 +286 @@
 
         cd boot
-pwd
         BOOTLIST=`ls -1`
-echo $BOOTLIST
         for ROUND in $BOOTLIST; do
                 wput -u "$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/boot/"$ROUND"