increase dvbapp PR.

[vuplus_openembedded] / contrib / angstrom / sort.sh

diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 2173166..88f0fb9 100755 (executable)
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -33,7 +33,7 @@ echo "Removing duplicate packages in unsorted"
 cat files-duplicate | xargs rm -f
 
 # Log remaining packages to a file 
-find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt
+find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v -- -static | grep -v angstrom-version | grep -v locale > new-files.txt
 for newfile in $(cat new-files.txt | sed s:./::g) ; do
     echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload-full.txt
 done    
@@ -43,22 +43,22 @@ do_sort() {
 archdir=$arch
 
 case "$arch" in
-       "arm-oabi")
+       "armv4")
                        machines="h3600 h3800 collie simpad htcwallaby" ;;
        "armv4t")
-                       machines="ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
+                       machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
        "armv5te")
-                       machines="n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;;
+                       machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;;
        "armv5teb")
                        machines="ixp4xxbe nslu2be" ;;
        "armv6-novfp")
                        machines="htcdiamond htckaiser htcpolaris htcraphael htcvogue" ;;       
        "armv6")        
-                       machines="mx31ads nokia800 " ;;
+                       machines="smartq5 bug mx31ads nokia800 " ;;
        "armv7")
                        machines="" ;;
        "armv7a")
-                       machines="beagleboard omap3evm omap3-pandora overo" ;;
+                       machines="archos5 palmpre cm-t35 igep0020 omap3-touchbook beagleboard omap3evm am3517-evm omap3517-evm omap3-pandora omapzoom omapzoom2 overo" ;;
        "avr32")
                        machines="atngw100 at32stk1000" ;;
        "bfin")
@@ -71,7 +71,7 @@ case "$arch" in
        "i586")
                        machines="epia qemux86" ;;
        "i686")
-                       machines="guinness progear" ;;
+                       machines="eee701 guinness progear" ;;
        "iwmmxt")
                        machines="" ;;
        "ppc405")       
@@ -80,17 +80,26 @@ case "$arch" in
                        machines="lsppchd lsppchg efika n1200" ;;
        "ppce300c3")
                        machines="mpc8313e-rdb mpc8315e-rdb" ;;
+       "ppce500")
+                       machines="tqm8540" ;;
        "sparc")
                        machines="" ;;
 esac
 
+if [ $(find . -name  "*.ipk"| grep $arch | wc -l) -gt 0 ] ; then
+       export SORTFEED=1
+else
+       export SORTFEED=0
+fi
+
 echo "Sorting $arch"
-for i in `find . -name  "*.ipk"| grep $arch` ; do mkdir -p ../$archdir/base/ || true ;mv $i ../$archdir/base/ ; done
+
+mkdir -p ../$archdir/base/ || true
+for i in `find . -name  "*_$arch.ipk"` ; do mv $i ../$archdir/base/ ; done
         for machine in $machines ; do
                 for i in `find . -name  "*_$machine.ipk"| grep $machine` ; do mkdir -p ../$archdir/machine/$machine || true ;mv $i ../$archdir/machine/$machine ; done
        done
-( mkdir -p ../$archdir ; cd ../$archdir && do_index )
-
+( cd ../$archdir && do_index )
 }
 
 do_index() {
@@ -99,6 +108,7 @@ echo "Processing $(basename $PWD) packages...."
 
 BPWD=`pwd`
 
+if [ "${SORTFEED}" -eq 1 ] ; then
 mkdir -p base
 cd base
 
@@ -114,22 +124,10 @@ for i in ../* ; do
   if [ -d $i ]; then
       cd $i
       echo -n "building index for $i:" |sed s:\.\./::
-      ${ipkg_tools_path}/ipkg-make-index -p Packages -l Packages.filelist  -m -L ../locales  . >& /tmp/index-log
+      ${ipkg_tools_path}/ipkg-make-index -m -p Packages -l Packages.filelist  -L ../locales  . >& /tmp/index-log
       echo " DONE"
   fi
 done
-mkdir -p  ${BPWD}/machine
-cd ${BPWD}/machine
-
-for i in ./* ; do
-  if [ -d $i ]; then
-     cd $i
-     echo -n "building index for machine $i:"
-     ${ipkg_tools_path}/ipkg-make-index -p Packages -l Packages.filelist  -m  . >& /dev/null
-     echo " DONE"
-     cd ../
-  fi
-done
 
 mkdir -p ${BPWD}/locales/en/
 cd ${BPWD}/locales/en/
@@ -137,12 +135,26 @@ echo -n "building index for locales:"
 for i in ../* ; do
   if [ -d $i ]; then
    echo -n " $i" |sed s:\.\./::
-   ${ipkg_tools_path}/ipkg-make-index -p Packages -l Packages.filelist  -m . >& /dev/null;
+   ${ipkg_tools_path}/ipkg-make-index -m -p Packages -l Packages.filelist . >& /dev/null;
    cd $i
   fi
  done
 echo " DONE"
-cd ${BPWD}
+
+fi
+mkdir -p  ${BPWD}/machine
+cd ${BPWD}/machine
+
+for i in ./* ; do
+  if [ -d $i ]; then
+     cd $i
+     echo -n "building index for machine $i:"
+     ${ipkg_tools_path}/ipkg-make-index -m -p Packages -l Packages.filelist . >& /dev/null
+     echo " DONE"
+     cd ../
+  fi
+done
+cd ${BPWD} 
 
 }
 
@@ -150,7 +162,10 @@ echo "Processing 'all' feed"
 for i in `find . -name  "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done
  (mkdir -p ../all ; cd ../all && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )  
 
-for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do 
+mkdir -p ../sdk ; mv *sdk.ipk ../sdk/ || true
+ (mkdir -p ../sdk ; cd ../sdk && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )
+
+for arch in armv4t armv4 armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e ppce300c3 ppce500 sparc x86_64 ; do
        do_sort
 done
 
@@ -159,7 +174,7 @@ if [ "$1" != "--skip-sorted-list" ]; then
     for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
 fi
 
-( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
+( cd ~/website/repo-updater ; rm -f feed.db* ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
 
 echo -n "Stripping source lines from Package files"
 for i in `find .. -name Packages` ; do grep -v ^Source: $i|gzip -c9>$i.gz ;gunzip -c $i.gz>$i ; touch $i.sig ; done