# HG changeset patch # User Christophe Lincoln # Date 1394909788 -3600 # Node ID f20bb2aafa21bc86cdeb169940716b314535604e # Parent 5455fda8689301c88f4d6100e3890409beac1c9e ARM: add more basic Xorg pkgs and improve jwm receipt diff -r 5455fda86893 -r f20bb2aafa21 aterm/receipt --- a/aterm/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/aterm/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -9,19 +9,17 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://aterm.sourceforge.net" WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/aterm/$TARBALL" +HOST_ARCH="i486 arm" + TAGS="terminal" - DEPENDS="xorg-libSM xorg-libXext" BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev" # Rules to configure and make the package. compile_rules() { - cd $src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS && - make && - make DESTDIR=$DESTDIR install + ./configure $CONFIGURE_ARGS && + make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -30,4 +28,3 @@ mkdir -p $fs/usr cp -a $install/usr/bin $fs/usr } - diff -r 5455fda86893 -r f20bb2aafa21 jwm/receipt --- a/jwm/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/jwm/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -14,12 +14,16 @@ DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \ xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \ -libpng slitaz-configs-base xorg-xload xorg-xclock nano imlib2 hsetroot compton" +libpng slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot" BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng-dev" # Handle cross compilation case "$ARCH" in - arm) ARCH_ARGS="--disable-nls" ;; + arm) + DEPENDS="$DEPENDS joe lynx ytree" + ARCH_ARGS="--disable-nls" ;; + i?86) + DEPENDS="$DEPENDS compton nano" ;; esac # Rules to configure and make the package. diff -r 5455fda86893 -r f20bb2aafa21 rsync/receipt --- a/rsync/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/rsync/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -11,7 +11,7 @@ WGET_URL="${WEB_SITE}ftp/rsync/$TARBALL" CONFIG_FILES="/etc/rsyncd.conf /etc/rsyncd.secrets" TAGS="sync copy secure" -#HOST_ARCH="i486 arm" +HOST_ARCH="i486 arm" DEPENDS="popt attr acl" BUILD_DEPENDS="popt-dev attr-dev acl-dev" @@ -22,7 +22,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff -r 5455fda86893 -r f20bb2aafa21 slitaz-configs-base/receipt --- a/slitaz-configs-base/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/slitaz-configs-base/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -10,26 +10,40 @@ SOURCE="slitaz-configs" TARBALL="$SOURCE-$VERSION.tar.gz" WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz" +HOST_ARCH="i486 arm" DEPENDS="tazlito tazpkg" +# Handle SliTaz arch +case "$SLITAZ_ARCH" in + arm*) DEPENDS="" ;; +esac + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - # Copy rootfs files from the stuff and set permissions. - mkdir -p \ - $fs/etc \ - $fs/boot \ - $fs/usr/share \ - $fs/etc/skel/Music \ - $fs/etc/skel/Documents - cp -a $src/rootfs/boot $fs - cp -a $src/rootfs/etc/skel $fs/etc - cp -a $src/rootfs/etc/X11 $fs/etc - - for i in images pixmaps themes webhome; do - cp -r $src/rootfs/usr/share/$i $fs/usr/share - done + # Copy rootfs files and set permissions. + case "$ARCH" in + arm*) + # Most ARM configs are in: slitaz-arm repo + mkdir -p $fs/usr/share + cp -a $src/rootfs/usr/bin $fs/usr + cp -a $src/rootfs/usr/share/webhome $fs/usr/share ;; + *) + mkdir -p \ + $fs/etc \ + $fs/boot \ + $fs/usr/share \ + $fs/etc/skel/Music \ + $fs/etc/skel/Documents + cp -a $src/rootfs/boot $fs + cp -a $src/rootfs/etc/skel $fs/etc + cp -a $src/rootfs/etc/X11 $fs/etc + + for i in images pixmaps themes webhome; do + cp -r $src/rootfs/usr/share/$i $fs/usr/share + done ;; + esac cp -a $src/rootfs/root $fs chown -R root.root $fs diff -r 5455fda86893 -r f20bb2aafa21 slitaz-dev-tools/receipt --- a/slitaz-dev-tools/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/slitaz-dev-tools/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -6,8 +6,9 @@ SHORT_DESC="SliTaz developers tools meta package." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -DEPENDS="rsync tazdev tazchroot libtaz tazwok mercurial" +DEPENDS="rsync tazdev mercurial" WEB_SITE="http://www.slitaz.org/" +#HOST_ARCH="i486 arm" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r 5455fda86893 -r f20bb2aafa21 slitaz-icon/receipt --- a/slitaz-icon/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/slitaz-icon/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -9,6 +9,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.slitaz.org/" WGET_URL="http://mirror.slitaz.org/sources/artwok/$TARBALL" +HOST_ARCH="i486 arm" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r 5455fda86893 -r f20bb2aafa21 slitaz-polar-cursors/receipt --- a/slitaz-polar-cursors/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/slitaz-polar-cursors/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -9,6 +9,7 @@ TARBALL=$PACKAGE-$VERSION.tar.gz WEB_SITE="http://www.slitaz.org/" WGET_URL="ftp://download.tuxfamily.org/slitaz/sources/artwok/$TARBALL" +HOST_ARCH="i486 arm" BUILD_DEPENDS="xorg-xcursorgen" diff -r 5455fda86893 -r f20bb2aafa21 xorg-libXcursor-dev/receipt --- a/xorg-libXcursor-dev/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/xorg-libXcursor-dev/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -7,6 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="other" WEB_SITE="http://www.x.org/" +HOST_ARCH="i486 arm" WANTED="xorg-libXcursor" DEPENDS="xorg-libXcursor xorg-libXrender-dev xorg-libXfixes-dev pkg-config" diff -r 5455fda86893 -r f20bb2aafa21 xorg-libXcursor/receipt --- a/xorg-libXcursor/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/xorg-libXcursor/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -10,6 +10,7 @@ TARBALL="$SOURCE-$VERSION.tar.bz2" WEB_SITE="http://www.x.org/" WGET_URL="$XORG_MIRROR/lib/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="xorg-libXfixes xorg-libXrender" BUILD_DEPENDS="xorg-libXrender-dev xorg-libXfixes-dev" diff -r 5455fda86893 -r f20bb2aafa21 xorg-xcursorgen/receipt --- a/xorg-xcursorgen/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/xorg-xcursorgen/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -10,6 +10,7 @@ TARBALL="$SOURCE-$VERSION.tar.bz2" WEB_SITE="http://www.x.org/" WGET_URL="$XORG_MIRROR/app/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="xorg-libX11 xorg-libXcursor libpng" BUILD_DEPENDS="xorg-libX11-dev xorg-libXcursor-dev libpng-dev" diff -r 5455fda86893 -r f20bb2aafa21 xorg-xwininfo/receipt --- a/xorg-xwininfo/receipt Sat Mar 15 13:11:09 2014 +0100 +++ b/xorg-xwininfo/receipt Sat Mar 15 19:56:28 2014 +0100 @@ -11,6 +11,7 @@ WEB_SITE="http://xorg.freedesktop.org/" WGET_URL="$WEB_SITE/releases/individual/app/$TARBALL" TAGS="util xorg windows" +HOST_ARCH="i486 arm" DEPENDS="xorg-libX11" BUILD_DEPENDS="xorg-libX11-dev"