slitaz-arm rev 104
Bunch of modif, use dillo and some fltk apps in next desktop release, better JWM menu, PiTFT info
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Apr 18 02:46:52 2014 +0200 (2014-04-18) |
parents | 6650d379a52f |
children | b5629d67388b |
files | flavors/pitft/rootfs/etc/X11/xorg.conf.d/99-calibration.conf flavors/rpi-desktop/packages.list rootfs/etc/rcS.conf rootfs/etc/slitaz/applications.conf rootfs/etc/xdg/jwm/menus.jwmrc rpi/linux-pitft.sh rpi/pitft/README rpi/pitft/cook-linux-fbtft.sh rpi/rootfs/etc/fstab rpi/rootfs/etc/rcS.conf sat tools/example.cgi tools/mksd.sh |
line diff
1.1 --- a/flavors/pitft/rootfs/etc/X11/xorg.conf.d/99-calibration.conf Mon Apr 14 20:55:45 2014 +0100 1.2 +++ b/flavors/pitft/rootfs/etc/X11/xorg.conf.d/99-calibration.conf Fri Apr 18 02:46:52 2014 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 Section "InputClass" 1.5 - Identifier "calibration" 1.6 - MatchProduct "stmpe-ts" 1.7 - Option "Calibration" "3800 200 200 3800" 1.8 - Option "SwapAxes" "1" 1.9 + Identifier "calibration" 1.10 + MatchProduct "stmpe-ts" 1.11 + Option "Calibration" "48 3692 3892 154" 1.12 + Option "SwapAxes" "1" 1.13 EndSection
2.1 --- a/flavors/rpi-desktop/packages.list Mon Apr 14 20:55:45 2014 +0100 2.2 +++ b/flavors/rpi-desktop/packages.list Fri Apr 18 02:46:52 2014 +0200 2.3 @@ -92,17 +92,22 @@ 2.4 hsetroot 2.5 jwm 2.6 xterm 2.7 +htop 2.8 fox 2.9 +fltk 2.10 +fltk-editor 2.11 +fltk-sudoku 2.12 +fltk-blocks 2.13 +fltk-colbrowser 2.14 +libssl 2.15 +dillo 2.16 adie 2.17 pathfinder 2.18 shutterbug 2.19 calculator 2.20 -links 2.21 slim 2.22 alsa-lib 2.23 libltdl 2.24 alsa-utils 2.25 mpg123 2.26 -glib 2.27 -pango 2.28 -openbox 2.29 +lua
3.1 --- a/rootfs/etc/rcS.conf Mon Apr 14 20:55:45 2014 +0100 3.2 +++ b/rootfs/etc/rcS.conf Fri Apr 18 02:46:52 2014 +0200 3.3 @@ -12,7 +12,7 @@ 3.4 RUN_SCRIPTS="network.sh system.sh local.sh" 3.5 3.6 # Daemons/services to start later in boot process. 3.7 -RUN_DAEMONS="" 3.8 +RUN_DAEMONS="httpd" 3.9 3.10 # X Login manager: slim or empty to disable X 3.11 LOGIN_MANAGER="slim"
4.1 --- a/rootfs/etc/slitaz/applications.conf Mon Apr 14 20:55:45 2014 +0100 4.2 +++ b/rootfs/etc/slitaz/applications.conf Fri Apr 18 02:46:52 2014 +0200 4.3 @@ -3,13 +3,13 @@ 4.4 # 4.5 4.6 # File manager. 4.7 -FILE_MANAGER="clex" 4.8 +FILE_MANAGER="PathFinder" 4.9 4.10 # Web browser. 4.11 -BROWSER="lynx" 4.12 +BROWSER="dillo" 4.13 4.14 # Text editor. 4.15 -EDITOR="joe" 4.16 +EDITOR="fltk-editor" 4.17 4.18 # X terminal. 4.19 TERMINAL="xterm"
5.1 --- a/rootfs/etc/xdg/jwm/menus.jwmrc Mon Apr 14 20:55:45 2014 +0100 5.2 +++ b/rootfs/etc/xdg/jwm/menus.jwmrc Fri Apr 18 02:46:52 2014 +0200 5.3 @@ -6,23 +6,10 @@ 5.4 <RootMenu height="22" onroot="12"> 5.5 5.6 <Menu icon="applications-accessories.png" label="Accessories"> 5.7 - <Program icon="galculator.png" label="Calculator">calculator</Program> 5.8 - <Program icon="gnome-screenshot.png" label="Screenshot">shutterbug</Program> 5.9 - <Program icon="text-editor.png" label="Text editor">fltk-editor</Program> 5.10 - <Program icon="joe.png" label="Text Editor">terminal -e joe</Program> 5.11 - </Menu> 5.12 - 5.13 - <Menu icon="applications-development.png" label="Development"> 5.14 - <Program icon="fluid.png" label="Fluid designer">fluid</Program> 5.15 - <Program icon="lua.png" label="Screenshot">terminal -e lua</Program> 5.16 - </Menu> 5.17 - 5.18 - <Menu icon="applications-system.png" label="System Tools"> 5.19 - <Program icon="file-manager.png" label="File manager">PathFinder</Program> 5.20 - <Program icon="utilities-system-monitor.png" label="Top Monitor">terminal -e top</Program> 5.21 - <!--<Program icon="raspberrypi.png" label="TazBerry Tool">terminal -e 'su -c tazberry'</Program>--> 5.22 - <Program icon="gnome-settings.png" label="System Config">terminal -e 'su -c slitaz-config'</Program> 5.23 - <Program icon="slitaz-icon.png" label="Web Admin">links -g http://localhost/adm</Program> 5.24 + <Program icon="galculator.png" label="FOX Calculator">calculator</Program> 5.25 + <Program icon="text-editor.png" label="Fast Text editor">fltk-editor</Program> 5.26 + <Program icon="text-editor.png" label="Joe Text Editor">terminal -e joe</Program> 5.27 + <Program icon="clock.png" label="Desktop Clock">xclock -bg grey92</Program> 5.28 </Menu> 5.29 5.30 <Menu icon="applications-internet.png" label="Network"> 5.31 @@ -31,11 +18,43 @@ 5.32 <Program icon="xchat.png" label="TazIRC IRC client">terminal -e 'tazirc --ask'</Program> 5.33 </Menu> 5.34 5.35 + <Menu icon="applications-graphics.png" label="Graphics"> 5.36 + <Program icon="gnome-screenshot.png" label="Screen Shot">shutterbug</Program> 5.37 + <Program icon="gcolor2.png" label="Color Browser">fltk-colbrowser</Program> 5.38 + </Menu> 5.39 + 5.40 + <Menu icon="applications-multimedia.png" label="Multimedia"> 5.41 + <Program icon="audio-mixer.png" label="Alsaplayer Mixer">terminal -e alsamixer</Program> 5.42 + </Menu> 5.43 + 5.44 + <Menu icon="applications-games.png" label="Games"> 5.45 + <Program icon="fltk-blocks.png" label="Blocks Attack">fltk-blocks</Program> 5.46 + <Program icon="fltk-sudoku.png" label="FLTK Sudoku">fltk-sudoku</Program> 5.47 + </Menu> 5.48 + 5.49 + <Menu icon="applications-development.png" label="Development"> 5.50 + <!--<Program icon="scratch.png" label="Scratch">scratch</Program>--> 5.51 + <!--<Program icon="python.png" label="Python interpreter">scratch</Program>--> 5.52 + <Program icon="fluid.png" label="Fluid Designer">fluid</Program> 5.53 + <Program icon="lua.png" label="Lua Interpreter">terminal -e lua</Program> 5.54 + </Menu> 5.55 + 5.56 + <Menu icon="applications-system.png" label="System Tools"> 5.57 + <Program icon="file-manager.png" label="File Manager">PathFinder</Program> 5.58 + <Program icon="spk.png" label="Packages Manager">terminal -e 'su -c spk-dialog'</Program> 5.59 + <Program icon="htop.png" label="HTop Monitor">terminal -e htop</Program> 5.60 + <!--<Program icon="raspberrypi.png" label="TazBerry Tool">terminal -e 'su -c tazberry'</Program>--> 5.61 + <Program icon="gnome-settings.png" label="System Config">terminal -e 'su -c slitaz-config'</Program> 5.62 + <Program icon="slitaz-icon.png" label="Web Admin">browser http://localhost/adm</Program> 5.63 + </Menu> 5.64 + 5.65 </RootMenu> 5.66 5.67 <!-- System menus --> 5.68 <RootMenu height="22" onroot="3"> 5.69 <Program icon="xterm.png" label="Terminal Emulator">terminal</Program> 5.70 + <Program icon="file-manager.png" label="File Manager">file-manager</Program> 5.71 + <Separator/> 5.72 <Restart label="Restart JWM" icon="system-restart.png" /> 5.73 <Exit label="Exit JWM" confirm="true" icon="system-suspend.png" /> 5.74 <Program icon="system-restart.png" label="Reboot system">reboot</Program>
6.1 --- a/rpi/linux-pitft.sh Mon Apr 14 20:55:45 2014 +0100 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,54 +0,0 @@ 6.4 -#!/bin/sh 6.5 -# 6.6 -# Create SliTat PiTFT Linux Kernel package 6.7 -# 6.8 -# See: https://github.com/adafruit/adafruit-rpi-fbtft/ 6.9 -# 6.10 -. /lib/libtaz.sh 6.11 - 6.12 -cache="rpi/cache" 6.13 -kvers="3.6.11" 6.14 -tarball="linux-$kvers.tar.xz" 6.15 -kurl="ftp://www.kernel.org/pub/linux/kernel/v3.x/$tarball" 6.16 -install="$cache/linux-$vers-install" 6.17 -: ${arch=arm} 6.18 - 6.19 -cd ${cache} || exit 1 6.20 - 6.21 -# Get source 6.22 -echo "Checking for: $tarball" 6.23 -[ -f "$tarball" ] || wget ${kurl} 6.24 -[ -d "linux-$kvers" ] || tar xJf ${tarball} 6.25 -cd linux-$kvers 6.26 - 6.27 -# FBtft drivers 6.28 -if [ ! -d "drivers/video/fbtft" ]; then 6.29 - cd drivers/video 6.30 - git clone git://github.com/notro/fbtft.git 6.31 - cd ../.. 6.32 - echo 'source "drivers/video/fbtft/Kconfig"' >> drivers/video/Kconfig 6.33 - echo 'obj-y += fbtft/' >> drivers/video/Makefile 6.34 -fi 6.35 - 6.36 -export PATH=$PATH:/cross/${arch}/tools/bin 6.37 -export HOST_SYSTEM=${arch}-slitaz-linux-gnueabi 6.38 - 6.39 -# Clean source and get config 6.40 -#make mrproper && 6.41 -#cp -f ../../data/linux-pitft.config .config || exit 1 6.42 -#yes "" | make ARCH=arm oldconfig 6.43 - 6.44 -# Handle --gconfig 6.45 -[ "$gconfig" ] && make ARCH=arm gconfig 6.46 - 6.47 -# Cook it! 6.48 -make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage && 6.49 -make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules && 6.50 -make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \ 6.51 - INSTALL_MOD_PATH=${install} modules_install || exit 1 6.52 -mkdir -p ${install}/boot 6.53 -cp -a arch/arm/boot/zImage ${install}/boot/kernel.img 6.54 - 6.55 -# Pack it! 6.56 - 6.57 -exit 0
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/rpi/pitft/README Fri Apr 18 02:46:52 2014 +0200 7.3 @@ -0,0 +1,19 @@ 7.4 +SliTaz PiTFT Touchscreen 7.5 +------------------------ 7.6 + 7.7 +SliTaz run nicely on PiTFT! Here are some notes about cross compiling the 7.8 +fbtft kernel driver and about customization. The default X session is 7.9 +powered by sts. 7.10 + 7.11 +Custom configs are in slitaz-arm/flavors/pitft 7.12 + 7.13 + 7.14 +Adafruit Fork of FBTFT for use with Adafruit TS shield 7.15 +------------------------------------------------------ 7.16 +https://github.com/adafruit/adafruit-rpi-fbtft/ 7.17 + 7.18 + 7.19 +Adafruit guides 7.20 +--------------- 7.21 +https://learn.adafruit.com/adafruit-pitft-28-inch-resistive-touchscreen-display-raspberry-pi 7.22 +
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/rpi/pitft/cook-linux-fbtft.sh Fri Apr 18 02:46:52 2014 +0200 8.3 @@ -0,0 +1,54 @@ 8.4 +#!/bin/sh 8.5 +# 8.6 +# Create SliTat PiTFT Linux Kernel package 8.7 +# 8.8 +# See: https://github.com/adafruit/adafruit-rpi-fbtft/ 8.9 +# 8.10 +. /lib/libtaz.sh 8.11 + 8.12 +cache="rpi/cache" 8.13 +kvers="3.6.11" 8.14 +tarball="linux-$kvers.tar.xz" 8.15 +kurl="ftp://www.kernel.org/pub/linux/kernel/v3.x/$tarball" 8.16 +install="$cache/linux-$vers-install" 8.17 +: ${arch=arm} 8.18 + 8.19 +cd ${cache} || exit 1 8.20 + 8.21 +# Get source 8.22 +echo "Checking for: $tarball" 8.23 +[ -f "$tarball" ] || wget ${kurl} 8.24 +[ -d "linux-$kvers" ] || tar xJf ${tarball} 8.25 +cd linux-$kvers 8.26 + 8.27 +# FBtft drivers 8.28 +if [ ! -d "drivers/video/fbtft" ]; then 8.29 + cd drivers/video 8.30 + git clone git://github.com/notro/fbtft.git 8.31 + cd ../.. 8.32 + echo 'source "drivers/video/fbtft/Kconfig"' >> drivers/video/Kconfig 8.33 + echo 'obj-y += fbtft/' >> drivers/video/Makefile 8.34 +fi 8.35 + 8.36 +export PATH=$PATH:/cross/${arch}/tools/bin 8.37 +export HOST_SYSTEM=${arch}-slitaz-linux-gnueabi 8.38 + 8.39 +# Clean source and get config 8.40 +#make mrproper && 8.41 +#cp -f ../../data/linux-pitft.config .config || exit 1 8.42 +#yes "" | make ARCH=arm oldconfig 8.43 + 8.44 +# Handle --gconfig 8.45 +[ "$gconfig" ] && make ARCH=arm gconfig 8.46 + 8.47 +# Cook it! 8.48 +make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage && 8.49 +make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules && 8.50 +make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \ 8.51 + INSTALL_MOD_PATH=${install} modules_install || exit 1 8.52 +mkdir -p ${install}/boot 8.53 +cp -a arch/arm/boot/zImage ${install}/boot/kernel.img 8.54 + 8.55 +# Pack it! 8.56 + 8.57 +exit 0
9.1 --- a/rpi/rootfs/etc/fstab Mon Apr 14 20:55:45 2014 +0100 9.2 +++ b/rpi/rootfs/etc/fstab Fri Apr 18 02:46:52 2014 +0200 9.3 @@ -4,6 +4,7 @@ 9.4 sysfs /sys sysfs defaults 0 0 9.5 devpts /dev/pts devpts rw,gid=5,mode=0620 0 0 9.6 tmpfs /dev/shm tmpfs defaults 0 0 9.7 +tmpfs /var/lock tmpfs defaults 0 0 9.8 /dev/mmcblk0p1 /boot vfat noatime 1 2 9.9 /dev/mmcblk0p2 swap swap defaults 0 0 9.10 /dev/mmcblk0p3 / auto noatime 0 1
10.1 --- a/rpi/rootfs/etc/rcS.conf Mon Apr 14 20:55:45 2014 +0100 10.2 +++ b/rpi/rootfs/etc/rcS.conf Fri Apr 18 02:46:52 2014 +0200 10.3 @@ -12,7 +12,7 @@ 10.4 RUN_SCRIPTS="network.sh system.sh local.sh" 10.5 10.6 # Daemons/services to start later in boot process. 10.7 -RUN_DAEMONS="" 10.8 +RUN_DAEMONS="httpd" 10.9 10.10 # X Login manager: slim or empty to disable X 10.11 LOGIN_MANAGER="slim"
11.1 --- a/sat Mon Apr 14 20:55:45 2014 +0100 11.2 +++ b/sat Fri Apr 18 02:46:52 2014 +0200 11.3 @@ -39,7 +39,6 @@ 11.4 flavors List and give info about flavors 11.5 ckpkgs Distro packages dependencies check 11.6 clean Clean up the work directory 11.7 - vdisk Create a virtual disk to be used by Qemu 11.8 emu Emulate the distro with qemu-system-arm 11.9 mirror Download or sync the SliTaz ARM mirror 11.10 11.11 @@ -330,25 +329,6 @@ 11.12 rm -rf $work/spk && status 11.13 fi ;; 11.14 11.15 - vdisk) 11.16 - # Lets use and HD in Qemu to store files|packages|whatever 11.17 - vdisk="vdisk.img" 11.18 - : ${size=50} 11.19 - newline 11.20 - echo "Creating virtual disk: $vdisk" 11.21 - cd $work 11.22 - dd if=/dev/zero of=$vdisk bs=1M count=$size 11.23 - # Partition 11.24 - echo "Creating a partition with: fdisk" 11.25 - fdisk ${vdisk} >/dev/null << EOT 11.26 -o 11.27 -n 11.28 -p 11.29 -1 11.30 -w 11.31 -EOT 11.32 - newline ;; 11.33 - 11.34 emu) 11.35 cd $work 11.36 [ -f "vdisk.img" ] && opts="-hda vdisk.img"
12.1 --- a/tools/mksd.sh Mon Apr 14 20:55:45 2014 +0100 12.2 +++ b/tools/mksd.sh Fri Apr 18 02:46:52 2014 +0200 12.3 @@ -63,25 +63,24 @@ 12.4 EOF 12.5 status 12.6 12.7 -[ "$nofs" ] && exit 0 12.8 - 12.9 # Mkfs: Buggy fat32 12.10 -if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}1"; then 12.11 - echo -n "Creating: /boot FAT32 filesystem" 12.12 - mkfs.fat -v -F32 -I -n " " /dev/${dev}1 \ 12.13 - 2>>/tmp/mksd.log >/tmp/mksd.log; status 12.14 -fi 12.15 -if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}2"; then 12.16 - echo -n "Creating: swap memory filesystem" 12.17 - mkswap /dev/${dev}2 >>/tmp/mksd.log; status 12.18 -fi 12.19 -if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}3"; then 12.20 - fs="ext4" 12.21 - [ "$btrfs" ] && fs="btrfs -f" 12.22 - echo -n "Creating: root $fs filesystem" 12.23 - mkfs.${fs} -L "SliTazSD" /dev/${dev}3 \ 12.24 - 2>>/tmp/mksd.log >>/tmp/mksd.log 12.25 - status 12.26 +if [ "$mkfs" ]; then 12.27 + if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}1"; then 12.28 + echo -n "Creating: /boot FAT32 filesystem" 12.29 + mkfs.fat -v -F32 -I -n " " /dev/${dev}1 \ 12.30 + >>/tmp/mksd.log 2>&1; status 12.31 + fi 12.32 + if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}2"; then 12.33 + echo -n "Creating: swap memory filesystem" 12.34 + mkswap /dev/${dev}2 >>/tmp/mksd.log; status 12.35 + fi 12.36 + if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}3"; then 12.37 + fs="ext4" 12.38 + [ "$btrfs" ] && fs="btrfs -f" 12.39 + echo -n "Creating: root $fs filesystem" 12.40 + mkfs.${fs} -L "SliTazSD" /dev/${dev}3 >>/tmp/mksd.log 2>&1 12.41 + status 12.42 + fi 12.43 fi 12.44 12.45 exit 0