Menu
▾
▴
[Morphix-cvs] SF.net SVN: morphix: [2530] trunk
|
From: <bms...@us...> - 2007-06-25 12:56:24
|
Revision: 2530
http://svn.sourceforge.net/morphix/?rev=2530&view=rev
Author: bmsleight
Date: 2007-06-25 05:56:21 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
New NonFree-FlashPlugin template
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/run_testing.sh
trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Added Paths:
-----------
trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml
trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-06-24 20:58:57 UTC (rev 2529)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-06-25 12:56:21 UTC (rev 2530)
@@ -63,48 +63,48 @@
find /home/morph/videos/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/video/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f
-
-if [ -z "$SKIP_DOWNLOADS" ]; then
+if [ "$SKIP_DOWNLOADS" != "SkipAll" ]; then
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/
- #Get Autobuilds from alextreme.org
- echo $DIVIDER
- echo "Getting AutoBuilds from Alextreme.org"
- echo $TITLED
- date
-
- STORE_AT_MM="/home/morph/alextreme/mainmod"
- REMOTE_AT_MM="http://www.alextreme.org/autobuilds/"
- GNOME_NAME="morphix-gnome-"
- KDE_NAME="morphix-kde-"
-
- find $STORE_AT_MM/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
- rm $STORE_AT_MM/index.html* 1>/dev/null 2>&1
- wget_cl() {
- wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2
- }
- wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/"
- if [ -e $STORE_AT_MM/index.html ]
- then
- TODAY=$(date +"%F")
- GNOME=$( grep $STORE_AT_MM/index.html -e $GNOME_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
- KDE=$( grep $STORE_AT_MM/index.html -e $KDE_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
- WGETS=" $REMOTE_AT_MM/$GNOME $REMOTE_AT_MM/$GNOME.md5 $REMOTE_AT_MM/$KDE $REMOTE_AT_MM/$KDE.md5"
- for WGET in $WGETS
- do
- if [ -e $WGET ]
+ if [ "$SKIP_DOWNLOADS" != "SkipAlextreme" ]; then
+ #Get Autobuilds from alextreme.org
+ echo $DIVIDER
+ echo "Getting AutoBuilds from Alextreme.org"
+ echo $TITLED
+ date
+ STORE_AT_MM="/home/morph/alextreme/mainmod"
+ REMOTE_AT_MM="http://www.alextreme.org/autobuilds/"
+ GNOME_NAME="morphix-gnome-"
+ KDE_NAME="morphix-kde-"
+
+ find $STORE_AT_MM/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
+ rm $STORE_AT_MM/index.html* 1>/dev/null 2>&1
+ wget_cl() {
+ wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2
+ }
+ wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/"
+ if [ -e $STORE_AT_MM/index.html ]
then
- echo $WGET ' file exists skipping d/load'
- else
- wget_cl $STORE_AT_MM $WGET
- fi
- done
- else
- echo "$REMOTE_AT_MM/index.html does not exist skipping other d/loads"
+ TODAY=$(date +"%F")
+ GNOME=$( grep $STORE_AT_MM/index.html -e $GNOME_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
+ KDE=$( grep $STORE_AT_MM/index.html -e $KDE_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
+ WGETS=" $REMOTE_AT_MM/$GNOME $REMOTE_AT_MM/$GNOME.md5 $REMOTE_AT_MM/$KDE $REMOTE_AT_MM/$KDE.md5"
+ for WGET in $WGETS
+ do
+ if [ -e $WGET ]
+ then
+ echo $WGET ' file exists skipping d/load'
+ else
+ wget_cl $STORE_AT_MM $WGET
+ fi
+ done
+ else
+ echo "$REMOTE_AT_MM/index.html does not exist skipping other d/loads"
+ fi
fi
fi
Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-06-24 20:58:57 UTC (rev 2529)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-06-25 12:56:21 UTC (rev 2530)
@@ -237,16 +237,16 @@
MESSAGE_MAIN_MENU_3="Using isomorph to get a clean base"
MESSAGE_MAIN_MENU_4="Submenu [MiniModules]"
MESSAGE_MAIN_MENU_5="Submenu [MainModules]"
-MESSAGE_MAIN_MENU_6="Rebranding an Morphix LiveCD"
+MESSAGE_MAIN_MENU_6="Rebranding a Morphix LiveCD"
MESSAGE_MAIN_MENU_7="Building MorphixLiveKiosk from Scratch"
MESSAGE_MAIN_MENU_8="Open a terminal for Morphing"
-MESSAGE_MAIN_MENU_9="Testing an LiveCD using qemu"
+MESSAGE_MAIN_MENU_9="Testing a LiveCD using qemu"
MESSAGE_MAIN_MENU_RETURN="Return to Main Menu"
MESSAGE_CONFIGURE_MENU="$MESSAGE_MAIN_MENU_1"
MESSAGE_CONFIGURE_MENU_1="Configure MorphingMorphix"
MESSAGE_CONFIGURE_MENU_2="Remove old CD Images then complete Configuration"
MESSAGE_MINIMODS_MENU="$MESSAGE_MAIN_MENU_4"
-MESSAGE_MINIMODS_MENU_1="Using an XML template to build a MiniModule"
+MESSAGE_MINIMODS_MENU_1="Using a XML template to build a MiniModule"
MESSAGE_MINIMODS_MENU_2="Saving the Home Directory to a MiniModule "
MESSAGE_MAINMODS_MENU="$MESSAGE_MAIN_MENU_5"
MESSAGE_MAINMODS_MENU_1="Using an XML template to build a mainmodule"
Added: trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml
===================================================================
--- trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml (rev 0)
+++ trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml 2007-06-25 12:56:21 UTC (rev 2530)
@@ -0,0 +1 @@
+link ../../scripts-mini/MorphixMini-NonFree-FlashPlugin.xml
\ No newline at end of file
Property changes on: trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml
===================================================================
--- trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml (rev 0)
+++ trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml 2007-06-25 12:56:21 UTC (rev 2530)
@@ -0,0 +1,25 @@
+<!-- A minimodule quite long winded - as we have to download the Non-GPL software and the package in /root so that filesystem can be overlaid. -->
+<!-- Not ideal - but thats the problem with non-GPL software.-->
+<comps>
+ <group>
+ <minimod>
+ <version>0.04</version>
+ <description>MorphMini for loading flash_player_9 non-GPL</description>
+ <minitag>Flash</minitag>
+ <maintag>ALL</maintag>
+ <!-- <bootoption>nonfree=yes</bootoption> --> <!-- Requires morphing-tools 0.2-20 + -->
+ <commandlist> <!-- Commands to be started from minimodule -->
+ <preX> <!-- Commands to run before X windows start -->
+ <command>ln -s /usr/local/install_flash_player_9_linux/libflashplayer.so /usr/lib/iceweasel/plugins/libflashplayer.so </command>
+ <command>ln -s /usr/local/install_flash_player_9_linux/flashplayer.xpt /usr/lib/iceweasel/plugins/flashplayer.xpt </command>
+ </preX>
+ </commandlist>
+ <other> <!-- used to make a minimodule in another way - command will be passed $1 for minimodule filesystem -->
+ <buildcommand>mkdir -p $1/root/usr/bin $1/root/usr/local/ $1/root/usr/lib/iceweasel/plugins/ </buildcommand>
+ <buildcommand>wget --output-document=$1/morphix/files/install_flash_player_9_linux.tar.gz http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz </buildcommand>
+ <buildcommand>tar zxvf $1/morphix/files/install_flash_player_9_linux.tar.gz -C $1/root/usr/local/ </buildcommand>
+ </other>
+ </minimod>
+ </group>
+</comps>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
