Changeset 10435

Timestamp:

Oct 17, 2011, 6:33:13 PM (15 years ago)

Author:

obi

Message:

fix

File:

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

ipk/make-ipk

@@ -45 +45 @@
         echo WPUTCHECK $WPUTCHECK
         if [ "$WPUTCHECK" -gt "061" ]; then
-                echo "[make-flash] wput0.6.2 ok"
+                echo "[make-ipk] wput0.6.2 ok"
         else
                 echo "[make-ipk] install wput0.6.2"
@@ -123 +123 @@
 
 . ./config/make-config
+
+if [ $GROUP = "dev" ];then
+        WWWMAIN="beta"
+else
+        WWWMAIN="public"
+fi
+
+WWWPUBLIC="ipk"
 
 ls -1 "$HOMEDIR"/source > aaf-flashbeta.txt
@@ -331 +339 @@
         sleep 5
         for ROUND in $PACKAGESLIST; do
-                wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
+                wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
                 echo "[make-ipk] upload: $wputbin $wputcmd"
                 $wputbin $wputcmd
         done
         for ROUND in $IPKLIST; do
-                wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
-                echo "[make-ipk] upload: $wputbin $wputcmd"
-                $wputbin $wputcmd
-        done
-
-        wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/PlugList
+                wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
+                echo "[make-ipk] upload: $wputbin $wputcmd"
+                $wputbin $wputcmd
+        done
+
+        wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/PlugList
         echo "[make-ipk] upload: $wputbin $wputcmd"
         $wputbin $wputcmd
                 
-        wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/Packages.preview.tar.gz
+        wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/Packages.preview.tar.gz
         echo "[make-ipk] upload: $wputbin $wputcmd"
         $wputbin $wputcmd
@@ -352 +360 @@
         BOOTLIST=`ls -1`
         for ROUND in $BOOTLIST; do
-                wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/boot/"$ROUND"
+                wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_BETA"/"$CPUTYPE"/"$SWTYPE"/boot/"$ROUND"
                 echo "[make-ipk] upload: $wputbin $wputcmd"
                 $wputbin $wputcmd
@@ -374 +382 @@
         sleep 5
         for ROUND in $PACKAGESLIST; do
-                wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
+                wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
                 echo "[make-ipk] upload: $wputbin $wputcmd"
                 $wputbin $wputcmd
         done
         for ROUND in $IPKLIST; do
-                wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
-                echo "[make-ipk] upload: $wputbin $wputcmd"
-                $wputbin $wputcmd
-        done
-
-        wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/PlugList
-        echo "[make-ipk] upload: $wputbin $wputcmd"
-        $wputbin $wputcmd
-
-        wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/Packages.preview.tar.gz
+                wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/"$ROUND"
+                echo "[make-ipk] upload: $wputbin $wputcmd"
+                $wputbin $wputcmd
+        done
+
+        wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/PlugList
+        echo "[make-ipk] upload: $wputbin $wputcmd"
+        $wputbin $wputcmd
+
+        wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/Packages.preview.tar.gz
         echo "[make-ipk] upload: $wputbin $wputcmd"
         $wputbin $wputcmd
@@ -395 +403 @@
         BOOTLIST=`ls -1`
         for ROUND in $BOOTLIST; do
-                wputcmd="$BETARELEASEUPDATEURL"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/boot/"$ROUND"
-                echo "[make-ipk] upload: $wputbin $wputcmd"
-                $wputbin $wputcmd
-        done
-fi
-
+                wputcmd="$BETARELEASEUPDATEURL"/"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/boot/"$ROUND"
+                echo "[make-ipk] upload: $wputbin $wputcmd"
+                $wputbin $wputcmd
+        done
+fi
+
+if [ "$SVNUSER" = "aaf-svn" ];then
+        rm -rf /"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"
+        mkdir -p /"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"  
+
+        for file in $PACKAGESLIST; do
+                if [ -e "$file" ]; then
+                        wputcmd="$file $WWWLOCAL/$WWWMAIN/$WWWPUBLIC/$IPKGCROSS_RELEASE/$CPUTYPE/$SWTYPE/$file"
+                echo "[make-ipk] move: $wputcmd"
+                        mv -f $wputcmd
+                fi
+        done
+        for file in $IPKLIST; do
+                if [ -e "$file" ]; then
+                        wputcmd="$file $WWWLOCAL/$WWWMAIN/$WWWPUBLIC/$IPKGCROSS_RELEASE/$CPUTYPE/$SWTYPE/$file"
+                        echo "[make-ipk] move: $wputcmd"
+                        mv -f $wputcmd
+                fi
+        done
+
+        wputcmd=PlugList /"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/PlugList
+        echo "[make-ipk] move: $wputcmd"
+        mv -f $wputcmd
+
+        wputcmd=Packages.preview.tar.gz /"$WWWMAIN"/"$IPKGCROSS_RELEASE"/"$CPUTYPE"/"$SWTYPE"/Packages.preview.tar.gz
+        echo "[make-ipk] move: $wputcmd"
+        mv -f $wputcmd
+fi      
+        
 echo "[make-ipk] done"