slitaz-arm rev 133

rpi: use raspberrypi package, clean up code
author Christophe Lincoln <pankso@slitaz.org>
date Sat Apr 26 03:12:28 2014 +0200 (2014-04-26)
parents 2bff42af8850
children 4ca086909ca8
files flavors/rpi-base/packages.list flavors/rpi-desktop/packages.list rpi/README sat-rpi
line diff
     1.1 --- a/flavors/rpi-base/packages.list	Fri Apr 25 04:52:01 2014 +0200
     1.2 +++ b/flavors/rpi-base/packages.list	Sat Apr 26 03:12:28 2014 +0200
     1.3 @@ -6,6 +6,7 @@
     1.4  slitaz-base-files
     1.5  slitaz-boot-scripts
     1.6  slitaz-configs-base
     1.7 +slitaz-arm-rpi
     1.8  slitaz-tools
     1.9  spk
    1.10  tazirc
     2.1 --- a/flavors/rpi-desktop/packages.list	Fri Apr 25 04:52:01 2014 +0200
     2.2 +++ b/flavors/rpi-desktop/packages.list	Sat Apr 26 03:12:28 2014 +0200
     2.3 @@ -6,6 +6,7 @@
     2.4  slitaz-base-files
     2.5  slitaz-boot-scripts
     2.6  slitaz-configs-base
     2.7 +slitaz-arm-rpi
     2.8  slitaz-arm-configs
     2.9  slitaz-tools
    2.10  slitaz-icon
    2.11 @@ -111,4 +112,4 @@
    2.12  alsa-utils
    2.13  mpg123
    2.14  lua
    2.15 -svkbd
    2.16 +raspberrypi-boot
     3.1 --- a/rpi/README	Fri Apr 25 04:52:01 2014 +0200
     3.2 +++ b/rpi/README	Sat Apr 26 03:12:28 2014 +0200
     3.3 @@ -46,17 +46,10 @@
     3.4  
     3.5  $ sat-rpi help
     3.6  
     3.7 -  --turbo: The forced turbo option turns off the dynamic clocks and runs the 
     3.8 -           Raspberry Pi constantly at the highest arm_freq.
     3.9 -
    3.10  
    3.11  Overclocking
    3.12  ------------
    3.13 -To enable overclocking select one of the suggested modes from the list. Choosing 
    3.14 -medium is generally a good starting point without risks:
    3.15 -
    3.16 -# sat-rpi oclock
    3.17 -# sat-rpi gen --oclock=medium
    3.18 +To enable overclocking you must use tazberry directly on your Raspberry Pi.
    3.19  
    3.20  
    3.21  SliTaz RPi Kernel
     4.1 --- a/sat-rpi	Fri Apr 25 04:52:01 2014 +0200
     4.2 +++ b/sat-rpi	Sat Apr 26 03:12:28 2014 +0200
     4.3 @@ -25,12 +25,8 @@
     4.4  
     4.5  # URLs
     4.6  rpi_mirror="http://mirror.slitaz.org/arm/rpi/"
     4.7 -fw_url="https://github.com/raspberrypi/firmware/raw/master/boot/"
     4.8  rpi_git_url="git://github.com/raspberrypi/"
     4.9  
    4.10 -# Lists
    4.11 -fwlist="bootcode.bin fixup.dat start.elf"
    4.12 -
    4.13  #
    4.14  # Functions
    4.15  #
    4.16 @@ -48,15 +44,12 @@
    4.17    gen           Generate a new SliTaz RPi distro
    4.18    cook-linux    Build the Raspberry Pi Linux kernel
    4.19    get-linux     Get the SliTaz RPi linux package
    4.20 -  get-fw        Download or update minimal RPi firmware
    4.21    clone-fw      Clone the RPi firmware repository
    4.22    get-prebuilt  Get a prebuilt SliTaz ARM toolchain
    4.23    clean         Clean the current work directory
    4.24    release       Release an installable tarball
    4.25  
    4.26  $(boldify "Options:")
    4.27 -  --up          Update for commands: firmware and kernel
    4.28 -  --vc          Install the RPi VC libraries in /opt/vc
    4.29    --nosat       Don't regenerate the distro with sat
    4.30  
    4.31  EOT
    4.32 @@ -70,20 +63,6 @@
    4.33  	newline && colorize 35 "$@" && separator
    4.34  }
    4.35  
    4.36 -# Get minimal RPi firmware
    4.37 -get_fw() {
    4.38 -	mkdir -p $firmware/boot
    4.39 -	for fw in $fwlist
    4.40 -	do
    4.41 -		[ "$up" ] && rm -f $firmware/boot/$fw
    4.42 -		if [ ! -f "$firmware/boot/$fw" ]; then
    4.43 -			echo -n "Fetching: $fw"
    4.44 -			wget -q --no-check-certificate ${fw_url}${fw} \
    4.45 -				-O $firmware/boot/${fw}; status
    4.46 -		fi
    4.47 -	done
    4.48 -}
    4.49 -
    4.50  # Get all RPi firmware
    4.51  clone_fw() {
    4.52  	[ -d "${rpi_git}/firmware" ] && return 0
    4.53 @@ -103,7 +82,6 @@
    4.54  case "$1" in
    4.55  	info)
    4.56  		header "SliTaz Raspberry Pi info"
    4.57 -		echo "Firmware : $fwlist" 
    4.58  		echo "RPi path : $rpi"
    4.59  		colorize 36 "/boot/cmdline.txt:"
    4.60  		cat ${boot}/cmdline.txt
    4.61 @@ -162,7 +140,6 @@
    4.62  		# Separate boot files since the Raspberry Pi boots off a FAT32 /boot 
    4.63  		# partition on the sdcard.
    4.64  		: ${flavor=rpi-base}
    4.65 -		: ${oclock=none}
    4.66  		
    4.67  		# Use the rootfs generated by sat
    4.68  		if [ ! -x "/usr/bin/sat" ]; then
    4.69 @@ -194,15 +171,6 @@
    4.70  			status
    4.71  		fi
    4.72  		
    4.73 -		# Boot firmware
    4.74 -		echo -n "Copying: firmware files..."
    4.75 -		get_fw
    4.76 -		for fw in $fwlist
    4.77 -		do
    4.78 -			cp ${firmware}/boot/${fw} ${boot}
    4.79 -		done
    4.80 -		status
    4.81 -		
    4.82  		# TazBerry
    4.83  		echo -n "Copying utility: TazBerry..."
    4.84  		cp -f ${rpi}/tazberry ${rootfs}/usr/bin
    4.85 @@ -214,31 +182,6 @@
    4.86  		cp -f ${rpi}/piboot ${rootfs}/sbin
    4.87  		status
    4.88  		
    4.89 -		# RPi VC libraries
    4.90 -		if [ "$vc" ]; then
    4.91 -			vc="${rootfs}/opt/vc"
    4.92 -			if [ ! -d "$firmware/opt/vc" ]; then
    4.93 -				error "Missing firmware git repository" && exit 1
    4.94 -			fi
    4.95 -			echo -n "Copying: standard VC libraries"
    4.96 -			cp -a ${firmware}/opt ${rootfs}
    4.97 -			# --> armv6hf
    4.98 -			#cp -a ${firmware}/hardfp/opt ${rootfs}
    4.99 -			chown -R root.root ${rootfs}/opt
   4.100 -			status
   4.101 -			echo -n "Cleaning: VC libraries devel files"
   4.102 -			cross_tools="/cross/${arch}/tools/bin"
   4.103 -			rm -rf ${vc}/include ${vc}/src ${vc}/lib/*.a
   4.104 -			${cross_tools}/${arch}-slitaz-linux-gnueabi-strip -s ${vc}/lib/*.so
   4.105 -			status
   4.106 -			# PATH + LD_LIBRARY_PATH
   4.107 -			echo -n "Enabling: /opt/vc/bin /opt/vc/lib"
   4.108 -			echo -e '\n# Raspberry Pi VC tools and libs' >> ${rootfs}/etc/profile
   4.109 -			echo 'export PATH=$PATH:/opt/vc/bin' >> ${rootfs}/etc/profile
   4.110 -			echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/vc/lib' \
   4.111 -				>> ${rootfs}/etc/profile; status
   4.112 -		fi
   4.113 -		
   4.114  		# Kernel at last
   4.115  		. $cache/linux-*/receipt
   4.116  		kvers="$VERSION"
   4.117 @@ -333,9 +276,6 @@
   4.118  EOT
   4.119  		tazpkg pack linux-$kvers ;;
   4.120  	
   4.121 -	get-fw)
   4.122 -		get_fw ;;
   4.123 -	
   4.124  	clone-fw)
   4.125  		clone_fw ;;
   4.126