wok diff slitaz-configs-base/receipt @ rev 16100
Up php (5.4.26) with CVE-2014-1943 fix
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Mar 17 11:15:00 2014 +0000 (2014-03-17) |
parents | 1e20660220da |
children | 6ebbb23fa7c2 |
line diff
1.1 --- a/slitaz-configs-base/receipt Sun Jan 19 13:35:48 2014 +0100 1.2 +++ b/slitaz-configs-base/receipt Mon Mar 17 11:15:00 2014 +0000 1.3 @@ -10,26 +10,40 @@ 1.4 SOURCE="slitaz-configs" 1.5 TARBALL="$SOURCE-$VERSION.tar.gz" 1.6 WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz" 1.7 +HOST_ARCH="i486 arm" 1.8 1.9 DEPENDS="tazlito tazpkg" 1.10 1.11 +# Handle SliTaz arch 1.12 +case "$SLITAZ_ARCH" in 1.13 + arm*) DEPENDS="" ;; 1.14 +esac 1.15 + 1.16 # Rules to gen a SliTaz package suitable for Tazpkg. 1.17 genpkg_rules() 1.18 { 1.19 - # Copy rootfs files from the stuff and set permissions. 1.20 - mkdir -p \ 1.21 - $fs/etc \ 1.22 - $fs/boot \ 1.23 - $fs/usr/share \ 1.24 - $fs/etc/skel/Music \ 1.25 - $fs/etc/skel/Documents 1.26 - cp -a $src/rootfs/boot $fs 1.27 - cp -a $src/rootfs/etc/skel $fs/etc 1.28 - cp -a $src/rootfs/etc/X11 $fs/etc 1.29 - 1.30 - for i in images pixmaps themes webhome; do 1.31 - cp -r $src/rootfs/usr/share/$i $fs/usr/share 1.32 - done 1.33 + # Copy rootfs files and set permissions. 1.34 + case "$ARCH" in 1.35 + arm*) 1.36 + # Most ARM configs are in: slitaz-arm repo 1.37 + mkdir -p $fs/usr/share 1.38 + cp -a $src/rootfs/usr/bin $fs/usr 1.39 + cp -a $src/rootfs/usr/share/webhome $fs/usr/share ;; 1.40 + *) 1.41 + mkdir -p \ 1.42 + $fs/etc \ 1.43 + $fs/boot \ 1.44 + $fs/usr/share \ 1.45 + $fs/etc/skel/Music \ 1.46 + $fs/etc/skel/Documents 1.47 + cp -a $src/rootfs/boot $fs 1.48 + cp -a $src/rootfs/etc/skel $fs/etc 1.49 + cp -a $src/rootfs/etc/X11 $fs/etc 1.50 + 1.51 + for i in images pixmaps themes webhome; do 1.52 + cp -r $src/rootfs/usr/share/$i $fs/usr/share 1.53 + done ;; 1.54 + esac 1.55 1.56 cp -a $src/rootfs/root $fs 1.57 chown -R root.root $fs