Changeset 12449

Timestamp:

Dec 20, 2011, 3:12:27 PM (14 years ago)

Author:

obi

Message:

[make-ipk] change syntax for feed

File:

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

ipk/make-ipk

@@ -65 +65 @@
         echo '| use ./make-ipk <group> <svnuser> <svnpass> <svnurl> <maketype> <cputype> <swtype>           |'
         echo "|                                                                                             |"
-        echo "| for group <dev|update|secret|atemio>                                                        |"
+        echo "| for group <dev|update|secret|atemio|feeds>                                                  |"
         echo "| for svnuser <your>                                                                          |"
         echo "| for svnpass <your>                                                                          |"
         echo "| for svnurl <your>                                                                           |"
         echo "| for maketype <online|offline|onlinebeta>                                                    |"
-        echo "| for cputype <sh4|mipsel|feeds>                                                              |"
+        echo "| for cputype <sh4|mipsel>                                                                    |"
         echo "| for swtype <enigma2|neutrino|titan>                                                         |"
         echo "|                                                                                             |"
@@ -79 +79 @@
 fi
 
-if [ $GROUP = "dev" ] || [ $GROUP = "update" ] || [ $GROUP = "secret" ] || [ $GROUP = "atemio" ];then
+if [ $GROUP = "dev" ] || [ $GROUP = "update" ] || [ $GROUP = "secret" ] || [ $GROUP = "atemio" ] || [ $CPUTYPE = "feeds" ];then
         echo "[make-ipk] group=$GROUP"
 else
-        echo "[make-ipk] group <dev|update|secret|atemio>"
+        echo "[make-ipk] group <dev|update|secret|atemio|feeds>"
         exit 1
 fi
@@ -93 +93 @@
 fi
 
-if [ $CPUTYPE = "sh4" ] || [ $CPUTYPE = "mipsel" ] || [ $CPUTYPE = "feeds" ];then
+if [ $CPUTYPE = "sh4" ] || [ $CPUTYPE = "mipsel" ];then
         echo "[make-ipk] cputype=$CPUTYPE"
 else
-        echo "[make-ipk] cputype <sh4|mipsel|feeds>"
+        echo "[make-ipk] cputype <sh4|mipsel>"
         exit 1
 fi
@@ -146 +146 @@
 fi
 
-if [ $CPUTYPE != "feeds" ];then
+if [ $GROUP != "feeds" ];then
         for DIR in $ALLOWED; do
                 echo cp "$DIR"_*
                 cp -a "$HOMEDIR"/source/"$DIR"_* "$HOMEDIR"/BUILD
         done
-fi
-
-for DIR in $ALLOWED; do
-        echo cp "$DIR"_*
-        cp -a "$HOMEDIR"/source."$CPUTYPE"/"$DIR"_* "$HOMEDIR"/BUILD
-done
+
+        for DIR in $ALLOWED; do
+                echo cp "$DIR"_*
+                cp -a "$HOMEDIR"/source."$CPUTYPE"/"$DIR"_* "$HOMEDIR"/BUILD
+        done
+else
+        for DIR in $ALLOWED; do
+                echo cp "$DIR"_*
+                cp -a "$HOMEDIR"/source.feeds/"$DIR"_* "$HOMEDIR"/BUILD
+        done
+fi
 
 if [ $GROUP = "atemio" ] && [ $SVNUSER = "aafsvn" ];then
@@ -323 +328 @@
 IPKLIST=`ls -1 *.ipk`
 
-if [ $GROUP = "update" ] && [ "$SVNUSER" = "aafsvn" ] && [ $CPUTYPE != "feeds" ];then
+if [ $GROUP = "update" ] && [ "$SVNUSER" = "aafsvn" ];then
         rm -rf "$HOMEDIR"/BUILDRELEASE-UPDATE/$IPKGCROSS_RELEASE/$CPUTYPE/$SWTYPE
         mkdir -p "$HOMEDIR"/BUILDRELEASE-UPDATE/$IPKGCROSS_RELEASE/$CPUTYPE/$SWTYPE             
@@ -334 +339 @@
                 fi
         done
-elif [ $GROUP = "dev" ] && [ "$SVNUSER" = "aafsvn" ] && [ $CPUTYPE != "feeds" ];then
+elif [ $GROUP = "dev" ] && [ "$SVNUSER" = "aafsvn" ];then
         rm -rf "$HOMEDIR"/BUILDRELEASE-BETA/$IPKGCROSS_BETA/$CPUTYPE/$SWTYPE
         mkdir -p "$HOMEDIR"/BUILDRELEASE-BETA/$IPKGCROSS_BETA/$CPUTYPE/$SWTYPE          
@@ -345 +350 @@
                 fi
         done
-elif [ $GROUP = "secret" ] && [ $MAKETYPE = "online" ] && [ $CPUTYPE != "feeds" ];then
+elif [ $GROUP = "secret" ] && [ $MAKETYPE = "online" ];then
         for ROUND in $PACKAGESLIST; do
                 wputcmd="$SECRETRELEASEUPDATEURL/$WWWMAIN/$CPUTYPE/$SWTYPE/$ROUND"
@@ -364 +369 @@
         echo "[make-ipk] upload: $wputbin $wputcmd"
         $wputbin $wputcmd
-elif [ $GROUP = "atemio" ] && [ $MAKETYPE = "online" ] && [ $CPUTYPE != "feeds" ];then
+elif [ $GROUP = "atemio" ] && [ $MAKETYPE = "online" ];then
         for ROUND in $PACKAGESLIST; do
                 wputcmd="$SECRETRELEASEUPDATEURL/$WWWMAIN/$ROUND"