From: user <user@Puppy.(none)>
Date: Sun, 15 Nov 2009 07:32:02 +0000 (-0800)
Subject: The first Fremantle easy-deb-chroot (0.9.33) that is somewhat working.
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=91aa355492cdcdf7e2ace5b9f81c91d56cd302d2;hp=cf5b1982fae5ccc977c9c888a5277dcf3310c2bc;p=easy-deb-chroot

The first Fremantle easy-deb-chroot (0.9.33) that is somewhat working.
---

diff --git a/fremantle/easy-deb-chroot/build_easydebchroot.py b/fremantle/easy-deb-chroot/build_easydebchroot.py
index dbeee90..ce5fd15 100755
--- a/fremantle/easy-deb-chroot/build_easydebchroot.py
+++ b/fremantle/easy-deb-chroot/build_easydebchroot.py
@@ -24,7 +24,7 @@ if __name__ == "__main__":
 
      p.author="Alan Bruce (qole)"
      p.mail="alan@thebruces.ca"
-     p.depends = "easy-chroot"
+     p.depends = "easy-chroot, bzip2, wget"
      p.section="user/system"
      p.icon = "deblet-48.png"
      p.arch="armel"              #should be all for python, any for all arch
@@ -40,10 +40,12 @@ if __name__ == "__main__":
      # p.postinstall="postinst"
      # p.postremove="postrm"
      # p.preinstall="preinst"
+     qoleprerm = open("control/preinst", "r")
+     p.preremove=qoleprerm.read()
      # p.preremove=""
 
-     version = "0.9.30"   #Version of your software, e.g. "1.2.0" or "0.8.2"
-     build = "1fremantle3"         #Build number
+     version = "0.9.33"   #Version of your software, e.g. "1.2.0" or "0.8.2"
+     build = "1fremantle1"         #Build number
                          #Text with changelog information to be displayed in the package "Details" tab of the HAM
      changeloginformation = "0.9.30 First version for Fremantle. Stripped down, but works." 
     
diff --git a/fremantle/easy-deb-chroot/control/prerm b/fremantle/easy-deb-chroot/control/prerm
index 92b94c4..72d2de0 100644
--- a/fremantle/easy-deb-chroot/control/prerm
+++ b/fremantle/easy-deb-chroot/control/prerm
@@ -1,3 +1,5 @@
 #!/bin/sh
 
+/sbin/closechroot
+
 exit 0
\ No newline at end of file
diff --git a/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh b/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh
index bc9021b..c9135bd 100755
--- a/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh
+++ b/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-## New! Ask where the user wishes to install the package with gxmessage:
+## Ask where the user wishes to install the package with gxmessage:
 
 export GXMSG=`printf "\
 Where do you want your Debian image file installed?\n\
@@ -28,8 +28,6 @@ echo "Downloading and extracting to $SDCARD..."
 export INSTPATH="/home/user/img-install"
 export TARPATH="$SDCARD"
 export DLURL="http://qole.org/files"
-export BZ2CMD1="bzip2 -d "
-export BZ2CMD2="$TARPATH"
 #This doesn't work:
 #export BZ2CMD1="bzcat"
 #export BZ2CMD2="| tar xf -"
@@ -38,6 +36,9 @@ export GZCMD1="tar -xzf"
 export EXTPATH1=$TARPATH
 export PKGNAME1="EASY DEBIAN IMAGE FILE"
 export BIGTAR1="debian-squeeze-m5-img.bz2"
+export BIGIMG1="debian-squeeze-m5.img.ext2"
+export BZ2CMD1="bzip2 -dc "
+export BZ2CMD2=" > $TARPATH/$BIGIMG1"
 export TARCMD1="$BZ2CMD1 $TARPATH/$BIGTAR1 $BZ2CMD2"
 export MD51="f769bb84c99f75821bdfa37e5ea34e86"
 export EXTCMD1=""
@@ -99,7 +100,14 @@ do
 
      cd $EXTPATH1
      echo Extracting the image file. This will take some time.
-     TARERR=`$TARCMD1 2>&1`
+
+     # Oh wow, this is even more of an ugly hack than my
+     # usual ugly hacks. So sorry you had to see this.
+
+     # TARERR=`$TARCMD1 2>&1`
+     TARERR="unspecified bzip2 error"
+     # echo $TARCMD1
+     $BZ2CMD1 $TARPATH/$BIGTAR1 > $TARPATH/$BIGIMG1
      if [ "$?" = 0 ] ; then
 	 rm -rf $TARPATH/$BIGTAR1
          $EXTCMD1
diff --git a/fremantle/easy-deb-chroot/src/usr/bin/debwm b/fremantle/easy-deb-chroot/src/usr/bin/debwm
index 1edd745..2db2528 100755
--- a/fremantle/easy-deb-chroot/src/usr/bin/debwm
+++ b/fremantle/easy-deb-chroot/src/usr/bin/debwm
@@ -1 +1,4 @@
-debbie xephwm2 easy-debian startlxde1
+/usr/bin/hostwin easy-debian x 'Log out to exit. CTRL-Backspace to get to the dashboard.' &
+sleep 1
+debbie xephwm easy-debian startlxde1
+killall hostwin
\ No newline at end of file
diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxde.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxde.desktop
index b915ced..346a844 100644
--- a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxde.desktop
+++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxde.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Debian LXDE
 GenericName=Debian LXDE
-Exec=/usr/bin/hostwin easy-debian /usr/bin/debwm 'This is the Easy Debian LXDE window.\nLog out instead of closing this window.\nCTRL-Backspace to get to the dashboard.'
+Exec=/usr/bin/debwm
 Icon=deblet
 X-Osso-Type=application/x-executable
 X-HildonDesk-ShowInToolbar=true