# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1397782012 -7200
# Node ID 7f8c51f837a5d228ac8a0579098c172efb83c102
# Parent  6650d379a52f716000d77025c3c1e2d57e27e329
Bunch of modif, use dillo and some fltk apps in next desktop release, better JWM menu, PiTFT info

diff -r 6650d379a52f -r 7f8c51f837a5 flavors/pitft/rootfs/etc/X11/xorg.conf.d/99-calibration.conf
--- a/flavors/pitft/rootfs/etc/X11/xorg.conf.d/99-calibration.conf	Mon Apr 14 20:55:45 2014 +0100
+++ b/flavors/pitft/rootfs/etc/X11/xorg.conf.d/99-calibration.conf	Fri Apr 18 02:46:52 2014 +0200
@@ -1,6 +1,6 @@
 Section "InputClass"
-	Identifier "calibration"
-	MatchProduct "stmpe-ts"
-	Option "Calibration" "3800 200 200 3800"
-	Option "SwapAxes" "1"
+	Identifier	"calibration"
+	MatchProduct	"stmpe-ts"
+	Option	"Calibration"	"48 3692 3892 154"
+	Option	"SwapAxes"	"1"
 EndSection
diff -r 6650d379a52f -r 7f8c51f837a5 flavors/rpi-desktop/packages.list
--- a/flavors/rpi-desktop/packages.list	Mon Apr 14 20:55:45 2014 +0100
+++ b/flavors/rpi-desktop/packages.list	Fri Apr 18 02:46:52 2014 +0200
@@ -92,17 +92,22 @@
 hsetroot
 jwm
 xterm
+htop
 fox
+fltk
+fltk-editor
+fltk-sudoku
+fltk-blocks
+fltk-colbrowser
+libssl
+dillo
 adie
 pathfinder
 shutterbug
 calculator
-links
 slim
 alsa-lib
 libltdl
 alsa-utils
 mpg123
-glib
-pango
-openbox
+lua
diff -r 6650d379a52f -r 7f8c51f837a5 rootfs/etc/rcS.conf
--- a/rootfs/etc/rcS.conf	Mon Apr 14 20:55:45 2014 +0100
+++ b/rootfs/etc/rcS.conf	Fri Apr 18 02:46:52 2014 +0200
@@ -12,7 +12,7 @@
 RUN_SCRIPTS="network.sh system.sh local.sh"
 
 # Daemons/services to start later in boot process.
-RUN_DAEMONS=""
+RUN_DAEMONS="httpd"
 
 # X Login manager: slim or empty to disable X
 LOGIN_MANAGER="slim"
diff -r 6650d379a52f -r 7f8c51f837a5 rootfs/etc/slitaz/applications.conf
--- a/rootfs/etc/slitaz/applications.conf	Mon Apr 14 20:55:45 2014 +0100
+++ b/rootfs/etc/slitaz/applications.conf	Fri Apr 18 02:46:52 2014 +0200
@@ -3,13 +3,13 @@
 #
 
 # File manager.
-FILE_MANAGER="clex"
+FILE_MANAGER="PathFinder"
 
 # Web browser.
-BROWSER="lynx"
+BROWSER="dillo"
 
 # Text editor.
-EDITOR="joe"
+EDITOR="fltk-editor"
 
 # X terminal.
 TERMINAL="xterm"
diff -r 6650d379a52f -r 7f8c51f837a5 rootfs/etc/xdg/jwm/menus.jwmrc
--- a/rootfs/etc/xdg/jwm/menus.jwmrc	Mon Apr 14 20:55:45 2014 +0100
+++ b/rootfs/etc/xdg/jwm/menus.jwmrc	Fri Apr 18 02:46:52 2014 +0200
@@ -6,23 +6,10 @@
 	<RootMenu height="22" onroot="12">
 		
 		<Menu icon="applications-accessories.png" label="Accessories">
-			<Program icon="galculator.png" label="Calculator">calculator</Program>
-			<Program icon="gnome-screenshot.png" label="Screenshot">shutterbug</Program>
-			<Program icon="text-editor.png" label="Text editor">fltk-editor</Program>
-			<Program icon="joe.png" label="Text Editor">terminal -e joe</Program>
-		</Menu>
-		
-		<Menu icon="applications-development.png" label="Development">
-			<Program icon="fluid.png" label="Fluid designer">fluid</Program>
-			<Program icon="lua.png" label="Screenshot">terminal -e lua</Program>
-		</Menu>
-		
-		<Menu icon="applications-system.png" label="System Tools">
-			<Program icon="file-manager.png" label="File manager">PathFinder</Program>
-			<Program icon="utilities-system-monitor.png" label="Top Monitor">terminal -e top</Program>
-			<!--<Program icon="raspberrypi.png" label="TazBerry Tool">terminal -e 'su -c tazberry'</Program>-->
-			<Program icon="gnome-settings.png" label="System Config">terminal -e 'su -c slitaz-config'</Program>
-			<Program icon="slitaz-icon.png" label="Web Admin">links -g http://localhost/adm</Program>
+			<Program icon="galculator.png" label="FOX Calculator">calculator</Program>
+			<Program icon="text-editor.png" label="Fast Text editor">fltk-editor</Program>
+			<Program icon="text-editor.png" label="Joe Text Editor">terminal -e joe</Program>
+			<Program icon="clock.png" label="Desktop Clock">xclock -bg grey92</Program>
 		</Menu>
 		
 		<Menu icon="applications-internet.png" label="Network">
@@ -31,11 +18,43 @@
 			<Program icon="xchat.png" label="TazIRC IRC client">terminal -e 'tazirc --ask'</Program>
 		</Menu>
 		
+		<Menu icon="applications-graphics.png" label="Graphics">
+			<Program icon="gnome-screenshot.png" label="Screen Shot">shutterbug</Program>
+			<Program icon="gcolor2.png" label="Color Browser">fltk-colbrowser</Program>
+		</Menu>
+		
+		<Menu icon="applications-multimedia.png" label="Multimedia">
+			<Program icon="audio-mixer.png" label="Alsaplayer Mixer">terminal -e alsamixer</Program>
+		</Menu>
+		
+		<Menu icon="applications-games.png" label="Games">
+			<Program icon="fltk-blocks.png" label="Blocks Attack">fltk-blocks</Program>
+			<Program icon="fltk-sudoku.png" label="FLTK Sudoku">fltk-sudoku</Program>
+		</Menu>
+		
+		<Menu icon="applications-development.png" label="Development">
+			<!--<Program icon="scratch.png" label="Scratch">scratch</Program>-->
+			<!--<Program icon="python.png" label="Python interpreter">scratch</Program>-->
+			<Program icon="fluid.png" label="Fluid Designer">fluid</Program>
+			<Program icon="lua.png" label="Lua Interpreter">terminal -e lua</Program>
+		</Menu>
+		
+		<Menu icon="applications-system.png" label="System Tools">
+			<Program icon="file-manager.png" label="File Manager">PathFinder</Program>
+			<Program icon="spk.png" label="Packages Manager">terminal -e 'su -c spk-dialog'</Program>
+			<Program icon="htop.png" label="HTop Monitor">terminal -e htop</Program>
+			<!--<Program icon="raspberrypi.png" label="TazBerry Tool">terminal -e 'su -c tazberry'</Program>-->
+			<Program icon="gnome-settings.png" label="System Config">terminal -e 'su -c slitaz-config'</Program>
+			<Program icon="slitaz-icon.png" label="Web Admin">browser http://localhost/adm</Program>
+		</Menu>
+		
 	</RootMenu>
 	
 	<!-- System menus -->
 	<RootMenu height="22" onroot="3">
 		<Program icon="xterm.png" label="Terminal Emulator">terminal</Program>
+		<Program icon="file-manager.png" label="File Manager">file-manager</Program>
+		<Separator/>
 		<Restart label="Restart JWM" icon="system-restart.png" />
 		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png" />
 		<Program icon="system-restart.png" label="Reboot system">reboot</Program>
diff -r 6650d379a52f -r 7f8c51f837a5 rpi/linux-pitft.sh
--- a/rpi/linux-pitft.sh	Mon Apr 14 20:55:45 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Create SliTat PiTFT Linux Kernel package
-#
-# See: https://github.com/adafruit/adafruit-rpi-fbtft/
-#
-. /lib/libtaz.sh
-
-cache="rpi/cache"
-kvers="3.6.11"
-tarball="linux-$kvers.tar.xz"
-kurl="ftp://www.kernel.org/pub/linux/kernel/v3.x/$tarball"
-install="$cache/linux-$vers-install"
-: ${arch=arm}
-
-cd ${cache} || exit 1
-
-# Get source
-echo "Checking for: $tarball"
-[ -f "$tarball" ] || wget ${kurl}
-[ -d "linux-$kvers" ] || tar xJf ${tarball}
-cd linux-$kvers
-
-# FBtft drivers
-if [ ! -d "drivers/video/fbtft" ]; then
-	cd drivers/video
-	git clone git://github.com/notro/fbtft.git
-	cd ../..
-	echo 'source "drivers/video/fbtft/Kconfig"' >> drivers/video/Kconfig
-	echo 'obj-y += fbtft/' >> drivers/video/Makefile
-fi
-
-export PATH=$PATH:/cross/${arch}/tools/bin
-export HOST_SYSTEM=${arch}-slitaz-linux-gnueabi
-
-# Clean source and get config
-#make mrproper &&
-#cp -f ../../data/linux-pitft.config .config || exit 1
-#yes "" | make ARCH=arm oldconfig
-
-# Handle --gconfig
-[ "$gconfig" ] && make ARCH=arm gconfig
-
-# Cook it!
-make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage &&
-make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules &&
-make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \
-	INSTALL_MOD_PATH=${install} modules_install || exit 1
-mkdir -p ${install}/boot
-cp -a arch/arm/boot/zImage ${install}/boot/kernel.img
-
-# Pack it!
-
-exit 0
diff -r 6650d379a52f -r 7f8c51f837a5 rpi/pitft/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/pitft/README	Fri Apr 18 02:46:52 2014 +0200
@@ -0,0 +1,19 @@
+SliTaz PiTFT Touchscreen
+------------------------
+
+SliTaz run nicely on PiTFT! Here are some notes about cross compiling the
+fbtft kernel driver and about customization. The default X session is
+powered by sts.
+
+Custom configs are in slitaz-arm/flavors/pitft
+
+
+Adafruit Fork of FBTFT for use with Adafruit TS shield
+------------------------------------------------------
+https://github.com/adafruit/adafruit-rpi-fbtft/
+
+
+Adafruit guides
+---------------
+https://learn.adafruit.com/adafruit-pitft-28-inch-resistive-touchscreen-display-raspberry-pi
+
diff -r 6650d379a52f -r 7f8c51f837a5 rpi/pitft/cook-linux-fbtft.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/pitft/cook-linux-fbtft.sh	Fri Apr 18 02:46:52 2014 +0200
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# Create SliTat PiTFT Linux Kernel package
+#
+# See: https://github.com/adafruit/adafruit-rpi-fbtft/
+#
+. /lib/libtaz.sh
+
+cache="rpi/cache"
+kvers="3.6.11"
+tarball="linux-$kvers.tar.xz"
+kurl="ftp://www.kernel.org/pub/linux/kernel/v3.x/$tarball"
+install="$cache/linux-$vers-install"
+: ${arch=arm}
+
+cd ${cache} || exit 1
+
+# Get source
+echo "Checking for: $tarball"
+[ -f "$tarball" ] || wget ${kurl}
+[ -d "linux-$kvers" ] || tar xJf ${tarball}
+cd linux-$kvers
+
+# FBtft drivers
+if [ ! -d "drivers/video/fbtft" ]; then
+	cd drivers/video
+	git clone git://github.com/notro/fbtft.git
+	cd ../..
+	echo 'source "drivers/video/fbtft/Kconfig"' >> drivers/video/Kconfig
+	echo 'obj-y += fbtft/' >> drivers/video/Makefile
+fi
+
+export PATH=$PATH:/cross/${arch}/tools/bin
+export HOST_SYSTEM=${arch}-slitaz-linux-gnueabi
+
+# Clean source and get config
+#make mrproper &&
+#cp -f ../../data/linux-pitft.config .config || exit 1
+#yes "" | make ARCH=arm oldconfig
+
+# Handle --gconfig
+[ "$gconfig" ] && make ARCH=arm gconfig
+
+# Cook it!
+make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage &&
+make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules &&
+make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \
+	INSTALL_MOD_PATH=${install} modules_install || exit 1
+mkdir -p ${install}/boot
+cp -a arch/arm/boot/zImage ${install}/boot/kernel.img
+
+# Pack it!
+
+exit 0
diff -r 6650d379a52f -r 7f8c51f837a5 rpi/rootfs/etc/fstab
--- a/rpi/rootfs/etc/fstab	Mon Apr 14 20:55:45 2014 +0100
+++ b/rpi/rootfs/etc/fstab	Fri Apr 18 02:46:52 2014 +0200
@@ -4,6 +4,7 @@
 sysfs             /sys        sysfs    defaults             0    0
 devpts            /dev/pts    devpts   rw,gid=5,mode=0620   0    0
 tmpfs             /dev/shm    tmpfs    defaults             0    0
+tmpfs             /var/lock   tmpfs    defaults             0    0
 /dev/mmcblk0p1    /boot       vfat     noatime              1    2
 /dev/mmcblk0p2    swap        swap     defaults             0    0
 /dev/mmcblk0p3    /           auto     noatime              0    1
diff -r 6650d379a52f -r 7f8c51f837a5 rpi/rootfs/etc/rcS.conf
--- a/rpi/rootfs/etc/rcS.conf	Mon Apr 14 20:55:45 2014 +0100
+++ b/rpi/rootfs/etc/rcS.conf	Fri Apr 18 02:46:52 2014 +0200
@@ -12,7 +12,7 @@
 RUN_SCRIPTS="network.sh system.sh local.sh"
 
 # Daemons/services to start later in boot process.
-RUN_DAEMONS=""
+RUN_DAEMONS="httpd"
 
 # X Login manager: slim or empty to disable X
 LOGIN_MANAGER="slim"
diff -r 6650d379a52f -r 7f8c51f837a5 sat
--- a/sat	Mon Apr 14 20:55:45 2014 +0100
+++ b/sat	Fri Apr 18 02:46:52 2014 +0200
@@ -39,7 +39,6 @@
   flavors    List and give info about flavors
   ckpkgs     Distro packages dependencies check
   clean      Clean up the work directory
-  vdisk      Create a virtual disk to be used by Qemu
   emu        Emulate the distro with qemu-system-arm
   mirror     Download or sync the SliTaz ARM mirror
 
@@ -330,25 +329,6 @@
 			rm -rf $work/spk && status
 		fi ;;
 	
-	vdisk)
-		# Lets use and HD in Qemu to store files|packages|whatever
-		vdisk="vdisk.img"
-		: ${size=50}
-		newline
-		echo "Creating virtual disk: $vdisk"
-		cd $work
-		dd if=/dev/zero of=$vdisk bs=1M count=$size
-		# Partition
-		echo "Creating a partition with: fdisk"
-		fdisk ${vdisk} >/dev/null << EOT
-o
-n
-p
-1
-w
-EOT
-		newline ;;
-	
 	emu)
 		cd $work
 		[ -f "vdisk.img" ] && opts="-hda vdisk.img"
diff -r 6650d379a52f -r 7f8c51f837a5 tools/mksd.sh
--- a/tools/mksd.sh	Mon Apr 14 20:55:45 2014 +0100
+++ b/tools/mksd.sh	Fri Apr 18 02:46:52 2014 +0200
@@ -63,25 +63,24 @@
 EOF
 status
 
-[ "$nofs" ] && exit 0
-
 # Mkfs: Buggy fat32
-if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}1"; then
-	echo -n "Creating: /boot FAT32 filesystem"
-	mkfs.fat -v -F32 -I -n "           " /dev/${dev}1 \
-		2>>/tmp/mksd.log >/tmp/mksd.log; status
-fi
-if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}2"; then
-	echo -n "Creating: swap memory filesystem"
-	mkswap /dev/${dev}2 >>/tmp/mksd.log; status
-fi
-if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}3"; then
-	fs="ext4"
-	[ "$btrfs" ] && fs="btrfs -f" 
-	echo -n "Creating: root $fs filesystem"
-	mkfs.${fs} -L "SliTazSD" /dev/${dev}3 \
-		2>>/tmp/mksd.log >>/tmp/mksd.log
-	status
+if [ "$mkfs" ]; then
+	if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}1"; then
+		echo -n "Creating: /boot FAT32 filesystem"
+		mkfs.fat -v -F32 -I -n "           " /dev/${dev}1 \
+			>>/tmp/mksd.log 2>&1; status
+	fi
+	if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}2"; then
+		echo -n "Creating: swap memory filesystem"
+		mkswap /dev/${dev}2 >>/tmp/mksd.log; status
+	fi
+	if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}3"; then
+		fs="ext4"
+		[ "$btrfs" ] && fs="btrfs -f" 
+		echo -n "Creating: root $fs filesystem"
+		mkfs.${fs} -L "SliTazSD" /dev/${dev}3 >>/tmp/mksd.log 2>&1
+		status
+	fi
 fi
 
 exit 0