Changeset 16192

Timestamp:

Jun 1, 2012, 1:57:42 AM (14 years ago)

Author:

obi

Message:

fix

Location:

ipk

Files:

• make-ipk (modified) (5 diffs)
• source.sh4/titanswapplayers_hbbtv/CONTROL/postinst (modified) (1 diff)

ipk/make-ipk

@@ -12 +12 @@
 SWTYPE=$7
 STM=$8
+MEDIAFW=$9
 
 if [ ! -e "$HOMEDIR"/.firstrun ]; then
@@ -59 +60 @@
 fi
 
-if [ $# -ne 8 ]; then
-        echo "|---------------------------------------------------------------------------------------------|"
-        echo "|                                                                                             |"
-        echo "| IPK Make Script                                                                             |"
-        echo "|                                                                                             |"
-        echo '| use ./make-ipk <group> <svnuser> <svnpass> <svnurl> <maketype> <cputype> <swtype> <stm>     |'
-        echo "|                                                                                             |"
-        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>                                                                    |"
-        echo "| for swtype <enigma2|neutrino|titan>                                                         |"
-        echo "| for stm <stm23|stm24>                                                                       |"
-        echo "|                                                                                             |"
-        echo "|---------------------------------------------------------------------------------------------|"
-        echo "|                                                                            v2.1@dev-team    |"
-        echo "|---------------------------------------------------------------------------------------------|"
+if [ $# -ne 9 ]; then
+        echo "|--------------------------------------------------------------------------------------------------|"
+        echo "|                                                                                                  |"
+        echo "| IPK Make Script                                                                                  |"
+        echo "|                                                                                                  |"
+        echo '| use ./make-ipk <group> <svnuser> <svnpass> <svnurl> <maketype> <cputype> <swtype> <stm> <mfw>    |'
+        echo "|                                                                                                  |"
+        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>                                                                         |"
+        echo "| for swtype <enigma2|neutrino|titan>                                                              |"
+        echo "| for stm <stm23|stm24>                                                                            |"
+        echo "| for mediafw <1|2>                                                                                |"
+        echo "|                                                                                                  |"
+        echo "|--------------------------------------------------------------------------------------------------|"
+        echo "|                                                                                 v2.1@dev-team    |"
+        echo "|--------------------------------------------------------------------------------------------------|"
         exit 1
 fi
@@ -106 +108 @@
 else
         echo "[make-ipk] swtype <enigma2|neutrino|titan>"
+        exit 1
+fi
+
+if [ $STM = "stm23" ] || [ $STM = "stm24" ];then
+        echo "[make-ipk] stm=$STM"
+else
+        echo "[make-ipk] stm <stm23|stm24>"
+        exit 1
+fi
+
+if [ $MEDIAFW = "1" ] || [ $MEDIAFW = "2" ];then
+        echo "[make-ipk] mediafw=$MEDIAFW"
+else
+        echo "[make-ipk] mediafw <1|2>"
         exit 1
 fi
@@ -193 +209 @@
         cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/dlna/* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/titanplugins/dlna
         cp -a $HOME/flashimg/BUILD/titan/usr/bin/minidlna "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/bin
-#       cp -a $HOME/flashimg/BUILD/titan/var/etc/minidlna.conf "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/etc
-#       cp -a $HOME/flashimg/BUILD/titan/lib/libav* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/lib
-#       cp -a $HOME/flashimg/BUILD/titan/lib/libexif* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/lib
-#       cp -a $HOME/flashimg/BUILD/titan/lib/libvorbis* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/lib
+        if [ $MEDIAFW = 2 ]; then
+                cp -a $HOME/flashimg/BUILD/titan/var/etc/minidlna.conf "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/etc
+                cp -a $HOME/flashimg/BUILD/titan/lib/libav* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/lib
+                cp -a $HOME/flashimg/BUILD/titan/lib/libexif* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/lib
+                cp -a $HOME/flashimg/BUILD/titan/lib/libvorbis* "$HOMEDIR"/BUILD/titanswapnetwork_dlna/var/swap/lib
+        fi
 
         # titanswapbrowser
@@ -204 +222 @@
         # titanswapplayers
         cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/hbbtv/* "$HOMEDIR"/BUILD/titanswapplayers_hbbtv/var/swap/titanplugins/hbbtv
-        cp -a $HOME/flashimg/BUILD/titan/usr/lib/* "$HOMEDIR"/BUILD/titanswapplayers_hbbtv/var/swap/lib
+        cp -a $HOME/flashimg/BUILD/titan/usr/lib/* "$HOMEDIR"/BUILD/titanswapplayers_hbbtv/var/swap/titanplugins/hbbtv/opera
         
         # titanswaptools

ipk/source.sh4/titanswapplayers_hbbtv/CONTROL/postinst

@@ -15 +15 @@
 ln -s /var/swap/titanplugins/hbbtv /var/usr/local/share/titan/plugins/hbbtv
 
-LINKEDLIST=`ls -1 /var/swap/lib`
-for ROUND in $LINKEDLIST; do
-        echo "ln -s /var/swap/lib/"$ROUND" /var/usr/lib"
-        ln -s /var/swap/lib/"$ROUND" /var/usr/lib
-done
+rm -rf /var/usr/lib/gstreamer-0.10
+ln -s /var/swap/titanplugins/hbbtv/opera/gstreamer-0.10 /var/usr/lib
+rm -rf /var/usr/lib/directfb-1.4-5
+ln -s /var/swap/titanplugins/hbbtv/opera/directfb-1.4-5 /var/usr/lib
+
+#LINKEDLIST=`ls -1 /var/swap/lib`
+#for ROUND in $LINKEDLIST; do
+#       echo "ln -s /var/swap/lib/"$ROUND" /var/usr/lib"
+#       ln -s /var/swap/lib/"$ROUND" /var/usr/lib
+#done
 
 echo "install hbbtv...."