Changeset 4897

Timestamp:

Dec 16, 2010, 12:52:54 AM (15 years ago)

Author:

obi

Message:

[ipk] fix building for default user

File:

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

ipk/make-ipk

@@ -11 +11 @@
 MAKETYPE=$6
 
-if [ `which ipkg-build | wc -l` -eq 0 ]; then
+if [ ! -e "$HOMEDIR"/.firstrun ]; then
+        echo "[make-ipk] first run remove old ipkg-build and ipkg-make-index links"
         sudo rm /bin/ipkg-build
         sudo rm /sbin/ipkg-build
-        sudo ln -s $HOMEDIR/ipkg-utils-050831/ipkg-build /bin
-elif [ `which ipkg-make-index | wc -l` -eq 0 ]; then
         sudo rm /bin/ipkg-make-index
         sudo rm /sbin/ipkg-make-index
+        touch "$HOMEDIR"/.firstrun 
+fi
+
+if [ `which ipkg-build | wc -l` -eq 0 ]; then
+        sudo ln -s $HOMEDIR/ipkg-utils-050831/ipkg-build /bin
+fi
+if [ `which ipkg-make-index | wc -l` -eq 0 ]; then
         sudo ln -s $HOMEDIR/ipkg-utils-050831/ipkg-make-index /bin
-elif [ `which gzip | wc -l` -eq 0 ]; then
+fi
+if [ `which gzip | wc -l` -eq 0 ]; then
         echo "[make-ipk] install gzip"
         echo "[make-ipk] apt-get install gzip"
@@ -71 +78 @@
 
 if [ $GROUP = "dev" ] || [ $GROUP = "update" ];then
-        echo "group=$GROUP"
+        echo "[make-ipk] group=$GROUP"
 else
-        echo "group <dev|update>"
+        echo "[make-ipk] group <dev|update>"
         exit 1
 fi
 
 if [ $MAKETYPE = "online" ] || [ $MAKETYPE = "offline" ];then
-        echo "maketype=$MAKETYPE"
+        echo "[make-ipk] maketype=$MAKETYPE"
 else
-        echo "maketype <online|offline>"
+        echo "[make-ipk] maketype <online|offline>"
         exit 1
 fi
 
-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
+rm -rf "$HOMEDIR"/BUILD
+rm -rf "$HOMEDIR"/BUILDRELEASE
+
+mkdir -p "$HOMEDIR"/BUILD
+mkdir -p "$HOMEDIR"/BUILDRELEASE
 
 svn co --username $SVNUSER --password $SVNPASS svn://"$SVNURL":"$SVNPORT"/ufs910/image/scripts $HOMEDIR/scripts
@@ -95 +102 @@
 . ./config/make-config
 
-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
+cp -a "$HOMEDIR"/source/* "$HOMEDIR"/BUILD
+ls -1 "$HOMEDIR"/BUILD > aaf-flashbeta.txt
+cp -a "$HOMEDIR"/bootvideos "$HOMEDIR"/BUILDRELEASE/boot
 
 LIST_LINE=`cat aaf-flashbeta.txt`
-ALLOWED=`cat "$HOME"/ipk/aaf-flashbeta_allowed`
-
-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"`
+ALLOWED=`cat "$HOMEDIR"/aaf-flashbeta_allowed`
+
+cd "$HOMEDIR"/BUILD     
+
+echo "[make-ipk] set executable Folder rights 755 to CONTROL bin sbin emu"
+chmod -R 755 `find "$HOMEDIR"/BUILD -type d -name "CONTROL"` > /dev/null 2>&1
+chmod -R 755 `find "$HOMEDIR"/BUILD -type d -name "bin"` > /dev/null 2>&1
+chmod -R 755 `find "$HOMEDIR"/BUILD -type d -name "sbin"` > /dev/null 2>&1      
+chmod -R 755 `find "$HOMEDIR"/BUILD -type d -name "emu"` > /dev/null 2>&1
 
 for ROUND in $ALLOWED; do
@@ -112 +121 @@
                 echo $DIR > $TMP
                 if [ ! `grep "$ROUND" $TMP | wc -l` -eq 0 ]; then 
-                        echo ROUND $ROUND == $DIR DIR
+                        echo "[make-ipk] ROUND $ROUND == $DIR DIR"
                         echo $DIR >> $NEXT_LIST
                 fi      
@@ -122 +131 @@
 echo LIST: $LIST
 
-rm -r `find "$HOME"/ipk/BUILD -type d -name "*.svn"`
+rm -rf `find "$HOMEDIR"/BUILD -type d -name "*.svn"`
 
 ###################  SHRINK PYTHON FILES  #########################
 
-"$HOME"/ipk/scripts/kf-pyshrink.sh ./ "$HOME"/ipk/BUILD "$PYTHONVER" "$SKIPPEDSHRINK"
+"$HOMEDIR"/scripts/kf-pyshrink.sh ./ "$HOMEDIR"/BUILD "$PYTHONVER" "$SKIPPEDSHRINK"
 
 ###
 cd $HOMEDIR
 echo make py var
-ls -R -1 "$HOME"/ipk/BUILD | grep "/" | sed 's/.$//' > tmp.txt
+ls -R -1 "$HOMEDIR"/BUILD | grep "/" | sed 's/.$//' > tmp.txt
 LINE=`cat tmp.txt`
 for DIR in $LINE; do
         cd $HOMEDIR
         cd $DIR
-        echo dir $DIR
-        ls -1 *.py > "$HOME"/ipk/pylist.tmp
-        PYLINE=`cat "$HOME"/ipk/pylist.tmp`
+        echo "[make-ipk] dir $DIR"
+        ls -1 *.py > "$HOMEDIR"/pylist.tmp
+        PYLINE=`cat "$HOMEDIR"/pylist.tmp`
         for RPY in $PYLINE; do
-                python2.6 -OO "$HOME"/ipk/scripts/mkpyc.py $RPY
+                python2.6 -OO "$HOMEDIR"/scripts/mkpyc.py $RPY
                 PYO=`echo "$RPY" | sed "s/.py$/.pyo/"`
                 PYC=`echo "$RPY" | sed "s/.py$/.pyc/"`
                 mv $PYO $PYC
                 if [ $? -ne 0 ]; then
-                        echo "Fehler beim kompilieren $RPY"
+                        echo "[make-ipk] Fehler beim kompilieren $RPY"
                 fi
         done
@@ -151 +160 @@
 cd $HOMEDIR
 ###
-rm "$HOME"/ipk/pylist.tmp
-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
-mkdir "$HOME"/ipk/preview
+rm "$HOMEDIR"/pylist.tmp
+rm -rf `find "$HOMEDIR"/BUILD -type f -name "*.py" -print`
+rm -rf `find "$HOMEDIR"/BUILD -type f -name "*.po" -print`
+
+rm -rf "$HOMEDIR"/preview
+mkdir "$HOMEDIR"/preview
 
 ###################  SHRINK PNG FILES  #########################
 
-PNGFILES=`find "$HOME"/ipk/BUILD -type f -name "*.png" -print`
+PNGFILES=`find "$HOMEDIR"/BUILD -type f -name "*.png" -print`
 
 for DIR in $PNGFILES; do
-        echo "PNG: $DIR"
+        echo "[make-ipk] PNG: $DIR"
         /usr/bin/advpng -4 -z $DIR #> /dev/null 2>&1
 done
@@ -169 +178 @@
 ###################  STRIPPED ALL FILES  #########################
 
-FILEALL=`find "$HOME"/ipk/BUILD -name "*" -print`
-
-if ( test -f "$HOME"/ipk/scripts/sh4-linux-strip ); then
+FILEALL=`find "$HOMEDIR"/BUILD -name "*" -print`
+
+if ( test -f "$HOMEDIR"/scripts/sh4-linux-strip ); then
         echo ""
-        echo "Files strippen"
+        echo "[make-ipk] Files strippen"
         echo ""
         for FILE in $FILEALL
@@ -179 +188 @@
                 echo $FILE | grep ".ko" >/dev/null 2>&1
                 if [ $? -eq 0 ]; then param="--strip-unneeded --remove-section=.comment"; else param="-s --remove-section=.comment"; fi
-                "$HOME"/ipk/scripts/sh4-linux-strip $param $FILE > /dev/null 2>&1
+                "$HOMEDIR"/scripts/sh4-linux-strip $param $FILE > /dev/null 2>&1
                 if [ $? -eq 0 ]; then
-                        echo "Strippe: $FILE"
+                        echo "[make-ipk] Strippe: $FILE"
                 fi
         done
 else
         echo ""
-        echo "Files strippen konnte nicht durchgefuehrt werden, da sh4-linux-strip fehlt."
+        echo "[make-ipk] Files strippen konnte nicht durchgefuehrt werden, da sh4-linux-strip fehlt."
 fi
 
 
 for DIR in $LIST; do
-        echo "$DIR"
-        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
+        echo "[make-ipk] $DIR"
+        NAME=`cat "$HOMEDIR"/BUILD/"$DIR"/CONTROL/control | grep Package: | tr " " "\n" | tr "-" "\n" | tail -n 1 | cut -d . -f1 | head -n1`
+#       ARCH=`cat "$HOMEDIR"/BUILD/"$DIR"/CONTROL/control | grep Architecture: | tr " " "\n" | tail -n 1`
+#       cp "$HOMEDIR"/BUILD/"$DIR"/preview/prev.png "$HOMEDIR"/preview/enigma2-pluginpreview-"$NAME"_"$ARCH".ipk.png
+        cp "$HOMEDIR"/BUILD/"$DIR"/preview/prev.png "$HOMEDIR"/preview/enigma2-pluginpreview-"$NAME".png
+        rm -r "$HOMEDIR"/BUILD/"$DIR"/preview
+done
+
+
+cd "$HOMEDIR"/BUILDRELEASE
 
 for DIR in $LIST; do
-        ipkg-build "$HOME"/ipk/BUILD/"$DIR"
+        ipkg-build "$HOMEDIR"/BUILD/"$DIR"
 done
 
 date=`date`
-echo "make-index"
+echo "[make-ipk] make-index"
 rm Packages*
 
@@ -223 +232 @@
 rm tmprc
 
-cd "$HOME"/ipk/
+cd "$HOMEDIR"
 tar czvf Packages.preview.tar.gz ./preview
 
-mv "$HOME"/ipk/Packages.preview.tar.gz "$HOME"/ipk/BUILDRELEASE
-
-cd "$HOME"/ipk/BUILDRELEASE
+mv "$HOMEDIR"/Packages.preview.tar.gz "$HOMEDIR"/BUILDRELEASE
+
+cd "$HOMEDIR"/BUILDRELEASE
 
 PACKAGESLIST=`ls -1 Packages*`
@@ -249 +258 @@
 elif [ $GROUP = "dev" ] && [ $MAKETYPE = "online" ];then
         BTIME=`date +"%Y.%m.%d_%H.%M.%S"`
-        echo quote USER $URLBETAUSER >"$HOME"/ipk/ftp.txt
-        echo quote PASS $URLBETAPASS >>"$HOME"/ipk/ftp.txt
-#       echo cd "$WWWMAIN"/"$IPKGCROSS_BETA" >>"$HOME"/ipk/ftp.txt
-#        echo cd "$WWWMAIN" >>"$HOME"/ipk//ftp.txt
-        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages >>"$HOME"/ipk/ftp.txt
-        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages.filelist >>"$HOME"/ipk/ftp.txt
-        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages.gz >>"$HOME"/ipk/ftp.txt
-        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/PlugList >>"$HOME"/ipk/ftp.txt
-        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages.preview.tar.gz >>"$HOME"/ipk/ftp.txt
-
-#       echo rename aaf-flash-beta aaf-flash-beta_old_"$URLBETAUSER"_"$BTIME" >>"$HOME"/ipk/ftp.txt
-        echo quit >>"$HOME"/ipk/ftp.txt
-        ftp -n "$URLBETA" < "$HOME"/ipk/ftp.txt 
+        echo quote USER $URLBETAUSER >"$HOMEDIR"/ftp.txt
+        echo quote PASS $URLBETAPASS >>"$HOMEDIR"/ftp.txt
+#       echo cd "$WWWMAIN"/"$IPKGCROSS_BETA" >>"$HOMEDIR"/ftp.txt
+#        echo cd "$WWWMAIN" >>"$HOMEDIR"//ftp.txt
+        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages >>"$HOMEDIR"/ftp.txt
+        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages.filelist >>"$HOMEDIR"/ftp.txt
+        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages.gz >>"$HOMEDIR"/ftp.txt
+        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/PlugList >>"$HOMEDIR"/ftp.txt
+        echo del "$WWWMAIN"/"$IPKGCROSS_BETA"/Packages.preview.tar.gz >>"$HOMEDIR"/ftp.txt
+
+#       echo rename aaf-flash-beta aaf-flash-beta_old_"$URLBETAUSER"_"$BTIME" >>"$HOMEDIR"/ftp.txt
+        echo quit >>"$HOMEDIR"/ftp.txt
+        ftp -n "$URLBETA" < "$HOMEDIR"/ftp.txt 
 
         sleep 5