wok-next rev 16167

ARM: improve slitaz-configs*
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 29 13:56:21 2014 +0100 (2014-03-29)
parents e42fcb3f39be
children 68f00cd672fd
files emotion/receipt ethumb/receipt slitaz-configs-base/receipt slitaz-configs/receipt
line diff
     1.1 --- a/emotion/receipt	Sat Mar 29 09:33:57 2014 +0000
     1.2 +++ b/emotion/receipt	Sat Mar 29 13:56:21 2014 +0100
     1.3 @@ -12,8 +12,9 @@
     1.4  TAGS="e enlightenment efl"
     1.5  HOST_ARCH="i486 arm"
     1.6  
     1.7 -DEPENDS="edje eio eeze xine-lib"
     1.8 -BUILD_DEPENDS="edje-dev eio-dev eeze-dev xine-lib-dev"
     1.9 +DEPENDS="eet evas ecore edje eio eeze embryo xine-lib lua"
    1.10 +BUILD_DEPENDS="eet-dev evas-dev ecore-dev embryo-dev edje-dev eio-dev \
    1.11 +eeze-dev xine-lib-dev lua-dev"
    1.12  OPTIONAL_DEPENDS="gstreamer-dev gst-plugins-base-dev"
    1.13  
    1.14  # Rules to configure and make the package.
     2.1 --- a/ethumb/receipt	Sat Mar 29 09:33:57 2014 +0000
     2.2 +++ b/ethumb/receipt	Sat Mar 29 13:56:21 2014 +0100
     2.3 @@ -12,8 +12,9 @@
     2.4  TAGS="e enlightenment efl"
     2.5  HOST_ARCH="i486 arm"
     2.6  
     2.7 -DEPENDS="emotion edbus libexif"
     2.8 -BUILD_DEPENDS="emotion-dev edbus-dev libexif-dev"
     2.9 +DEPENDS="eet ecore eio evas edje embryo emotion eeze edbus libexif"
    2.10 +BUILD_DEPENDS="eet-dev ecore-dev eio-dev evas-dev edje-dev embryo-dev \
    2.11 +eeze-dev emotion-dev edbus-dev libexif-dev lua-dev"
    2.12  
    2.13  # Rules to configure and make the package.
    2.14  compile_rules()
     3.1 --- a/slitaz-configs-base/receipt	Sat Mar 29 09:33:57 2014 +0000
     3.2 +++ b/slitaz-configs-base/receipt	Sat Mar 29 13:56:21 2014 +0100
     3.3 @@ -24,25 +24,29 @@
     3.4  {
     3.5  	# Copy rootfs files and set permissions.
     3.6  	case "$ARCH" in
     3.7 -	arm*)
     3.8 -		# Most ARM configs are in: slitaz-arm repo
     3.9 -		mkdir -p $fs/usr/share
    3.10 -		cp -a $src/rootfs/usr/bin $fs/usr 
    3.11 -		cp -a $src/rootfs/usr/share/webhome $fs/usr/share ;;
    3.12 -	*)
    3.13 -		mkdir -p \
    3.14 -			$fs/etc \
    3.15 -			$fs/boot \
    3.16 -			$fs/usr/share \
    3.17 -			$fs/etc/skel/Music \
    3.18 -			$fs/etc/skel/Documents
    3.19 -		cp -a $src/rootfs/boot $fs
    3.20 -		cp -a $src/rootfs/etc/skel $fs/etc
    3.21 -		cp -a $src/rootfs/etc/X11 $fs/etc
    3.22 -		
    3.23 -		for i in images pixmaps themes webhome; do
    3.24 -			cp -r $src/rootfs/usr/share/$i $fs/usr/share
    3.25 -		done ;;
    3.26 +		arm*)
    3.27 +			# Most ARM configs are in: slitaz-arm repo but Openbox, webhome
    3.28 +			# are common to all arch.
    3.29 +			mkdir -p $fs/usr/share
    3.30 +			cp -a $src/rootfs/usr/bin $fs/usr 
    3.31 +			cp -a $src/rootfs/usr/share/webhome $fs/usr/share
    3.32 +			cp -a $src/rootfs/usr/share/applications $fs/usr/share 
    3.33 +			cp -a $src/rootfs/usr/share/pixmaps $fs/usr/share 
    3.34 +			cp -a $src/rootfs/usr/share/themes $fs/usr/share ;;
    3.35 +		*)
    3.36 +			mkdir -p \
    3.37 +				$fs/etc \
    3.38 +				$fs/boot \
    3.39 +				$fs/usr/share \
    3.40 +				$fs/etc/skel/Music \
    3.41 +				$fs/etc/skel/Documents
    3.42 +			cp -a $src/rootfs/boot $fs
    3.43 +			cp -a $src/rootfs/etc/skel $fs/etc
    3.44 +			cp -a $src/rootfs/etc/X11 $fs/etc
    3.45 +			
    3.46 +			for i in images pixmaps themes webhome; do
    3.47 +				cp -r $src/rootfs/usr/share/$i $fs/usr/share
    3.48 +			done ;;
    3.49  	esac
    3.50  
    3.51  	cp -a $src/rootfs/root $fs
     4.1 --- a/slitaz-configs/receipt	Sat Mar 29 09:33:57 2014 +0000
     4.2 +++ b/slitaz-configs/receipt	Sat Mar 29 13:56:21 2014 +0100
     4.3 @@ -2,6 +2,7 @@
     4.4  
     4.5  PACKAGE="slitaz-configs"
     4.6  VERSION="5.2.2"
     4.7 +ARM_VERSION="0.1"
     4.8  CATEGORY="base-system"
     4.9  SHORT_DESC="SliTaz config files and artwork."
    4.10  MAINTAINER="pankso@slitaz.org"
    4.11 @@ -10,46 +11,75 @@
    4.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.13  WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz"
    4.14  CONFIG_FILES="/etc/slitaz/applications.conf"
    4.15 +HOST_ARCH="i486 arm"
    4.16  
    4.17  DEPENDS="slitaz-configs-base xorg-libXcomposite xorg-libXdamage xorg-xcompmgr \
    4.18  transset-df ttf-dejavu slim"
    4.19  
    4.20 +# Special case for ARM since some (most) config files are in slitaz-arm repo.
    4.21 +# i486/arm common configs are provided by slitaz-configs-base.
    4.22 +case "$SLITAZ_ARCH" in
    4.23 +	arm*)
    4.24 +		VERSION="$ARM_VERSION"
    4.25 +		WEB_SITE="http://arm.slitaz.org/"
    4.26 +		DEPENDS="slitaz-configs-base ttf-dejavu slim" ;;
    4.27 +esac
    4.28 +
    4.29 +case "$ARCH" in
    4.30 +	arm*)
    4.31 +		VERSION="$ARM_VERSION"
    4.32 +		WEB_SITE="http://arm.slitaz.org/"
    4.33 +		TARBALL="$PACKAGE-arm-$VERSION.tar.bz2"
    4.34 +		WGET_URL="http://hg.slitaz.org/slitaz-arm/archive/tip.tar.bz2" ;;
    4.35 +esac
    4.36 +
    4.37  # Rules to configure and make the package.
    4.38  compile_rules()
    4.39  {
    4.40 -	make DESTDIR=$DESTDIR menu
    4.41 -	ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml
    4.42 +	case "$ARCH" in
    4.43 +		i?86)
    4.44 +			make DESTDIR=$DESTDIR menu
    4.45 +			ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml ;;
    4.46 +	esac
    4.47  }
    4.48  
    4.49  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.50  genpkg_rules()
    4.51  {
    4.52 -	# Copy rootfs files from the stuff and set permissions.
    4.53 -	mkdir -p $fs/etc/xdg/openbox $fs/usr/share
    4.54 -	cp -a $src/rootfs/etc/xdg/openbox $fs/etc/xdg
    4.55 -
    4.56 -	# /usr/share
    4.57 -	for i in applications lxdm slim slitaz
    4.58 -	do
    4.59 -		cp -r $src/rootfs/usr/share/$i $fs/usr/share
    4.60 -	done
    4.61 -
    4.62 -	cp -a $src/rootfs/usr/bin $fs/usr
    4.63 -	cp -a $src/rootfs/etc/lxpanel $fs/etc
    4.64 -	cp -a $src/rootfs/etc/slitaz $fs/etc
    4.65 -	cp -a $install/etc/xdg/openbox/menu.en.xml $install/etc/xdg/openbox/menu.xml \
    4.66 -		$fs/etc/xdg/openbox
    4.67 -
    4.68 +	cd ${src}
    4.69 +	case "$ARCH" in
    4.70 +		i?86)
    4.71 +			# Copy rootfs files from the stuff and set permissions.
    4.72 +			mkdir -p $fs/etc/xdg/openbox $fs/usr/share
    4.73 +			cp -a $src/rootfs/etc/xdg/openbox $fs/etc/xdg
    4.74 +		
    4.75 +			# /usr/share
    4.76 +			for i in applications lxdm slim slitaz
    4.77 +			do
    4.78 +				cp -r $src/rootfs/usr/share/$i $fs/usr/share
    4.79 +			done
    4.80 +		
    4.81 +			cp -a $src/rootfs/usr/bin $fs/usr
    4.82 +			cp -a $src/rootfs/etc/lxpanel $fs/etc
    4.83 +			cp -a $src/rootfs/etc/slitaz $fs/etc
    4.84 +			cp -a $install/etc/xdg/openbox/menu.en.xml $install/etc/xdg/openbox/menu.xml \
    4.85 +				$fs/etc/xdg/openbox ;;
    4.86 +		arm)
    4.87 +			cp -a rootfs/* ${fs} ;;
    4.88 +	esac
    4.89  	chown -R root.root $fs
    4.90  }
    4.91  
    4.92  post_install()
    4.93  {
    4.94 -	# By default slim provide a base theme and config file have both
    4.95 -	# base and slitaz who will be choose randomly, so make sure we use
    4.96 -	# only slitaz theme.
    4.97 -	if grep -q 'current_theme       slitaz,base' $1/etc/slim.conf; then
    4.98 -		sed -i s/"current_theme .*"/"current_theme       slitaz"/ \
    4.99 -			$1/etc/slim.conf
   4.100 -	fi
   4.101 +	case "$SLITAZ_ARCH" in
   4.102 +		i?86)
   4.103 +			# By default slim provide a base theme and config file have both
   4.104 +			# base and slitaz who will be choose randomly, so make sure we use
   4.105 +			# only slitaz theme.
   4.106 +			if grep -q 'current_theme       slitaz,base' $1/etc/slim.conf; then
   4.107 +				sed -i s/"current_theme .*"/"current_theme       slitaz"/ \
   4.108 +					$1/etc/slim.conf
   4.109 +			fi ;;
   4.110 +	esac
   4.111  }