wok-6.x rev 12927

util-linux: cross-compile for ARM (and pack blkid/uuid)
author Christophe Lincoln <pankso@slitaz.org>
date Tue May 29 22:45:34 2012 +0000 (2012-05-29)
parents 61ad9c3b0a5a
children b586b25939cf
files e2fsprogs-dev/receipt e2fsprogs/receipt pciids/receipt util-linux-blkid-dev/receipt util-linux-blkid/receipt util-linux-cfdisk/receipt util-linux-uuid-dev/receipt util-linux-uuid/receipt util-linux/receipt
line diff
     1.1 --- a/e2fsprogs-dev/receipt	Tue May 29 22:43:32 2012 +0000
     1.2 +++ b/e2fsprogs-dev/receipt	Tue May 29 22:45:34 2012 +0000
     1.3 @@ -7,17 +7,19 @@
     1.4  MAINTAINER="pankso@slitaz.org"
     1.5  WANTED="e2fsprogs"
     1.6  WEB_SITE="http://e2fsprogs.sourceforge.net/"
     1.7 +HOST_ARCH="i486 arm"
     1.8 +
     1.9  DEPENDS="libcomerr-dev"
    1.10  
    1.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.12  genpkg_rules()
    1.13  {
    1.14  	mkdir -p $fs/usr/lib
    1.15 -	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.16 -	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.17 -	cp -a $_pkg/usr/include $fs/usr
    1.18 +	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.19 +	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.20 +	cp -a $install/usr/include $fs/usr
    1.21  	cat $wanted_stuff/*.files-list | while read file; do
    1.22 -		[ -f $fs$file ] && rm -f $fs$file
    1.23 +		[ -f ${fs}$file ] && rm -f ${fs}$file
    1.24  	done
    1.25  	# Remove blkid files.
    1.26  	rm -rf $fs/usr/include/blkid
     2.1 --- a/e2fsprogs/receipt	Tue May 29 22:43:32 2012 +0000
     2.2 +++ b/e2fsprogs/receipt	Tue May 29 22:45:34 2012 +0000
     2.3 @@ -12,11 +12,6 @@
     2.4  
     2.5  DEPENDS="libcomerr util-linux-blkid util-linux-uuid"
     2.6  
     2.7 -# Handle arch installation
     2.8 -case "$SLITAZ_ARCH" in
     2.9 -	arm) DEPENDS="libcomerr" ;;
    2.10 -esac
    2.11 -
    2.12  # Rules to configure and make the package.
    2.13  compile_rules()
    2.14  {
    2.15 @@ -47,10 +42,6 @@
    2.16  	done
    2.17  	# Remove fsck provided by Busybox.
    2.18  	rm $fs/sbin/fsck* $fs/sbin/blkid
    2.19 -	# Package util-linux dont cross actually, keep uuid/blkid libs.
    2.20 -	case "$ARCH" in
    2.21 -		arm) return 0 ;;
    2.22 -	esac
    2.23  	# Remove blkid provided by util-linux.
    2.24  	rm $fs/lib/libblkid* $fs/usr/lib/libblkid*
    2.25  	# Remove uuid files provided by util-linux.
     3.1 --- a/pciids/receipt	Tue May 29 22:43:32 2012 +0000
     3.2 +++ b/pciids/receipt	Tue May 29 22:45:34 2012 +0000
     3.3 @@ -5,10 +5,12 @@
     3.4  CATEGORY="misc"
     3.5  SHORT_DESC="pci.ids file for pciutils"
     3.6  MAINTAINER="slaxemulator@gmail.com"
     3.7 -DEPENDS=""
     3.8  TARBALL="pci-$VERSION.ids"
     3.9  WEB_SITE="http://pciids.sourceforge.net/"
    3.10  WGET_URL="http://pciids.sourceforge.net/v2.2/pci.ids"
    3.11 +HOST_ARCH="i486 arm"
    3.12 +
    3.13 +DEPENDS=""
    3.14  
    3.15  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.16  genpkg_rules()
     4.1 --- a/util-linux-blkid-dev/receipt	Tue May 29 22:43:32 2012 +0000
     4.2 +++ b/util-linux-blkid-dev/receipt	Tue May 29 22:45:34 2012 +0000
     4.3 @@ -7,6 +7,7 @@
     4.4  MAINTAINER="pankso@slitaz.org"
     4.5  WANTED="util-linux"
     4.6  WEB_SITE="http://kernel.org/~kzak/util-linux/"
     4.7 +HOST_ARCH="i486 arm"
     4.8  
     4.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.10  genpkg_rules()
     5.1 --- a/util-linux-blkid/receipt	Tue May 29 22:43:32 2012 +0000
     5.2 +++ b/util-linux-blkid/receipt	Tue May 29 22:45:34 2012 +0000
     5.3 @@ -8,6 +8,7 @@
     5.4  DEPENDS="glibc-base util-linux-uuid"
     5.5  WANTED="util-linux"
     5.6  WEB_SITE="http://kernel.org/~kzak/util-linux/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.10  genpkg_rules()
    5.11 @@ -22,20 +23,20 @@
    5.12  # Remove old package
    5.13  post_install()
    5.14  {
    5.15 -	if [ -d "/var/lib/tazpkg/installed/util-linux-ng-blkid" ]; then
    5.16 +	if [ -d "$INSTALLED/util-linux-ng-blkid" ]; then
    5.17  		echo "Removing old: util-linux-ng-blkid"
    5.18 -		yes | tazpkg -r util-linux-ng-blkid
    5.19 +		rm -rf $INSTALLED/util-linux-ng-blkid
    5.20  	fi
    5.21  }
    5.22  
    5.23  # Overlap busybox
    5.24  pre_install()
    5.25  {
    5.26 -	[ -d "$INSTALLED/util-linux-ng-blkid" ] && yes | tazpkg -r util-linux-ng-blkid
    5.27 -	rm -f $1/sbin/blkid
    5.28 +	rm -f $root/sbin/blkid
    5.29  }
    5.30  
    5.31  post_remove()
    5.32  {
    5.33 -	ln -s /bin/busybox /sbin/blkid
    5.34 +	cd $root/sbin
    5.35 +	ln -s ../bin/busybox blkid
    5.36  }
     6.1 --- a/util-linux-cfdisk/receipt	Tue May 29 22:43:32 2012 +0000
     6.2 +++ b/util-linux-cfdisk/receipt	Tue May 29 22:45:34 2012 +0000
     6.3 @@ -5,14 +5,16 @@
     6.4  CATEGORY="system-tools"
     6.5  SHORT_DESC="The cfdisk utility from Util linux NG."
     6.6  MAINTAINER="pankso@slitaz.org"
     6.7 -DEPENDS="glibc-base ncurses"
     6.8  WANTED="util-linux"
     6.9  WEB_SITE="http://kernel.org/~kzak/util-linux/"
    6.10 +HOST_ARCH="i486 arm"
    6.11 +
    6.12 +DEPENDS="glibc-base ncursesw"
    6.13  
    6.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.15  genpkg_rules()
    6.16  {
    6.17  	mkdir -p $fs/sbin $fs/usr/share/applications
    6.18 -	cp -a $_pkg/sbin/cfdisk $fs/sbin
    6.19 -	cp stuff/cfdisk.desktop $fs/usr/share/applications
    6.20 +	cp -a $install/sbin/cfdisk $fs/sbin
    6.21 +	cp $stuff/cfdisk.desktop $fs/usr/share/applications
    6.22  }
     7.1 --- a/util-linux-uuid-dev/receipt	Tue May 29 22:43:32 2012 +0000
     7.2 +++ b/util-linux-uuid-dev/receipt	Tue May 29 22:45:34 2012 +0000
     7.3 @@ -7,12 +7,13 @@
     7.4  MAINTAINER="pankso@slitaz.org"
     7.5  WANTED="util-linux"
     7.6  WEB_SITE="http://kernel.org/~kzak/util-linux/"
     7.7 +HOST_ARCH="i486 arm"
     7.8  
     7.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.10  genpkg_rules()
    7.11  {
    7.12  	mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include
    7.13 -	cp -a $_pkg/usr/lib/libuuid.*a $fs/usr/lib
    7.14 -	cp -a $_pkg/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig
    7.15 -	cp -a $_pkg/usr/include/uuid $fs/usr/include
    7.16 +	cp -a $install/usr/lib/libuuid.*a $fs/usr/lib
    7.17 +	cp -a $install/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig
    7.18 +	cp -a $install/usr/include/uuid $fs/usr/include
    7.19  }
     8.1 --- a/util-linux-uuid/receipt	Tue May 29 22:43:32 2012 +0000
     8.2 +++ b/util-linux-uuid/receipt	Tue May 29 22:45:34 2012 +0000
     8.3 @@ -5,9 +5,11 @@
     8.4  CATEGORY="base-system"
     8.5  SHORT_DESC="The uuid utility and library from Util linux NG."
     8.6  MAINTAINER="pankso@slitaz.org"
     8.7 -DEPENDS="glibc-base"
     8.8  WANTED="util-linux"
     8.9  WEB_SITE="http://kernel.org/~kzak/util-linux/"
    8.10 +HOST_ARCH="i486 arm"
    8.11 +
    8.12 +DEPENDS="ncursesw"
    8.13  
    8.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.15  genpkg_rules()
    8.16 @@ -23,8 +25,8 @@
    8.17  # Remove old package
    8.18  post_install()
    8.19  {
    8.20 -	if [ -d "/var/lib/tazpkg/installed/util-linux-ng-uuid" ]; then
    8.21 +	if [ -d "$INSTALLED/util-linux-ng-uuid" ]; then
    8.22  		echo "Removing old: util-linux-ng-uuid"
    8.23 -		yes "y" | tazpkg -r util-linux-ng-uuid
    8.24 +		rm -rf $INSTALLED/util-linux-ng-uuid
    8.25  	fi
    8.26  }
     9.1 --- a/util-linux/receipt	Tue May 29 22:43:32 2012 +0000
     9.2 +++ b/util-linux/receipt	Tue May 29 22:45:34 2012 +0000
     9.3 @@ -9,7 +9,7 @@
     9.4  TARBALL="$SOURCE-$VERSION.tar.xz"
     9.5  WEB_SITE="http://kernel.org/~kzak/util-linux/"
     9.6  WGET_URL="http://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/$TARBALL"
     9.7 -COOK_OPT="!fs"
     9.8 +HOST_ARCH="i486 arm"
     9.9  LOCALE=""
    9.10  
    9.11  DEPENDS=""
    9.12 @@ -19,6 +19,10 @@
    9.13  compile_rules()
    9.14  {
    9.15  	cd $src
    9.16 +	# Fix undeclared 'LINE_MAX'
    9.17 +	case "$ARCH" in
    9.18 +		arm) sed -i s'|LINE_MAX|25|' text-utils/*.c ;;
    9.19 +	esac
    9.20  	./configure \
    9.21  		--prefix=/usr \
    9.22  		--sysconfdir=/etc \