# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1338331534 0
# Node ID 64e7fff3f73c6d1f590584e16412e64af8e3018c
# Parent  61ad9c3b0a5a6471b912c13b9cbab99e061879a6
util-linux: cross-compile for ARM (and pack blkid/uuid)

diff -r 61ad9c3b0a5a -r 64e7fff3f73c e2fsprogs-dev/receipt
--- a/e2fsprogs-dev/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/e2fsprogs-dev/receipt	Tue May 29 22:45:34 2012 +0000
@@ -7,17 +7,19 @@
 MAINTAINER="pankso@slitaz.org"
 WANTED="e2fsprogs"
 WEB_SITE="http://e2fsprogs.sourceforge.net/"
+HOST_ARCH="i486 arm"
+
 DEPENDS="libcomerr-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $_pkg/usr/include $fs/usr
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/include $fs/usr
 	cat $wanted_stuff/*.files-list | while read file; do
-		[ -f $fs$file ] && rm -f $fs$file
+		[ -f ${fs}$file ] && rm -f ${fs}$file
 	done
 	# Remove blkid files.
 	rm -rf $fs/usr/include/blkid
diff -r 61ad9c3b0a5a -r 64e7fff3f73c e2fsprogs/receipt
--- a/e2fsprogs/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/e2fsprogs/receipt	Tue May 29 22:45:34 2012 +0000
@@ -12,11 +12,6 @@
 
 DEPENDS="libcomerr util-linux-blkid util-linux-uuid"
 
-# Handle arch installation
-case "$SLITAZ_ARCH" in
-	arm) DEPENDS="libcomerr" ;;
-esac
-
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -47,10 +42,6 @@
 	done
 	# Remove fsck provided by Busybox.
 	rm $fs/sbin/fsck* $fs/sbin/blkid
-	# Package util-linux dont cross actually, keep uuid/blkid libs.
-	case "$ARCH" in
-		arm) return 0 ;;
-	esac
 	# Remove blkid provided by util-linux.
 	rm $fs/lib/libblkid* $fs/usr/lib/libblkid*
 	# Remove uuid files provided by util-linux.
diff -r 61ad9c3b0a5a -r 64e7fff3f73c pciids/receipt
--- a/pciids/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/pciids/receipt	Tue May 29 22:45:34 2012 +0000
@@ -5,10 +5,12 @@
 CATEGORY="misc"
 SHORT_DESC="pci.ids file for pciutils"
 MAINTAINER="slaxemulator@gmail.com"
-DEPENDS=""
 TARBALL="pci-$VERSION.ids"
 WEB_SITE="http://pciids.sourceforge.net/"
 WGET_URL="http://pciids.sourceforge.net/v2.2/pci.ids"
+HOST_ARCH="i486 arm"
+
+DEPENDS=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 61ad9c3b0a5a -r 64e7fff3f73c util-linux-blkid-dev/receipt
--- a/util-linux-blkid-dev/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/util-linux-blkid-dev/receipt	Tue May 29 22:45:34 2012 +0000
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 WANTED="util-linux"
 WEB_SITE="http://kernel.org/~kzak/util-linux/"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 61ad9c3b0a5a -r 64e7fff3f73c util-linux-blkid/receipt
--- a/util-linux-blkid/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/util-linux-blkid/receipt	Tue May 29 22:45:34 2012 +0000
@@ -8,6 +8,7 @@
 DEPENDS="glibc-base util-linux-uuid"
 WANTED="util-linux"
 WEB_SITE="http://kernel.org/~kzak/util-linux/"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -22,20 +23,20 @@
 # Remove old package
 post_install()
 {
-	if [ -d "/var/lib/tazpkg/installed/util-linux-ng-blkid" ]; then
+	if [ -d "$INSTALLED/util-linux-ng-blkid" ]; then
 		echo "Removing old: util-linux-ng-blkid"
-		yes | tazpkg -r util-linux-ng-blkid
+		rm -rf $INSTALLED/util-linux-ng-blkid
 	fi
 }
 
 # Overlap busybox
 pre_install()
 {
-	[ -d "$INSTALLED/util-linux-ng-blkid" ] && yes | tazpkg -r util-linux-ng-blkid
-	rm -f $1/sbin/blkid
+	rm -f $root/sbin/blkid
 }
 
 post_remove()
 {
-	ln -s /bin/busybox /sbin/blkid
+	cd $root/sbin
+	ln -s ../bin/busybox blkid
 }
diff -r 61ad9c3b0a5a -r 64e7fff3f73c util-linux-cfdisk/receipt
--- a/util-linux-cfdisk/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/util-linux-cfdisk/receipt	Tue May 29 22:45:34 2012 +0000
@@ -5,14 +5,16 @@
 CATEGORY="system-tools"
 SHORT_DESC="The cfdisk utility from Util linux NG."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="glibc-base ncurses"
 WANTED="util-linux"
 WEB_SITE="http://kernel.org/~kzak/util-linux/"
+HOST_ARCH="i486 arm"
+
+DEPENDS="glibc-base ncursesw"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/sbin $fs/usr/share/applications
-	cp -a $_pkg/sbin/cfdisk $fs/sbin
-	cp stuff/cfdisk.desktop $fs/usr/share/applications
+	cp -a $install/sbin/cfdisk $fs/sbin
+	cp $stuff/cfdisk.desktop $fs/usr/share/applications
 }
diff -r 61ad9c3b0a5a -r 64e7fff3f73c util-linux-uuid-dev/receipt
--- a/util-linux-uuid-dev/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/util-linux-uuid-dev/receipt	Tue May 29 22:45:34 2012 +0000
@@ -7,12 +7,13 @@
 MAINTAINER="pankso@slitaz.org"
 WANTED="util-linux"
 WEB_SITE="http://kernel.org/~kzak/util-linux/"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include
-	cp -a $_pkg/usr/lib/libuuid.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig
-	cp -a $_pkg/usr/include/uuid $fs/usr/include
+	cp -a $install/usr/lib/libuuid.*a $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig
+	cp -a $install/usr/include/uuid $fs/usr/include
 }
diff -r 61ad9c3b0a5a -r 64e7fff3f73c util-linux-uuid/receipt
--- a/util-linux-uuid/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/util-linux-uuid/receipt	Tue May 29 22:45:34 2012 +0000
@@ -5,9 +5,11 @@
 CATEGORY="base-system"
 SHORT_DESC="The uuid utility and library from Util linux NG."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="glibc-base"
 WANTED="util-linux"
 WEB_SITE="http://kernel.org/~kzak/util-linux/"
+HOST_ARCH="i486 arm"
+
+DEPENDS="ncursesw"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -23,8 +25,8 @@
 # Remove old package
 post_install()
 {
-	if [ -d "/var/lib/tazpkg/installed/util-linux-ng-uuid" ]; then
+	if [ -d "$INSTALLED/util-linux-ng-uuid" ]; then
 		echo "Removing old: util-linux-ng-uuid"
-		yes "y" | tazpkg -r util-linux-ng-uuid
+		rm -rf $INSTALLED/util-linux-ng-uuid
 	fi
 }
diff -r 61ad9c3b0a5a -r 64e7fff3f73c util-linux/receipt
--- a/util-linux/receipt	Tue May 29 22:43:32 2012 +0000
+++ b/util-linux/receipt	Tue May 29 22:45:34 2012 +0000
@@ -9,7 +9,7 @@
 TARBALL="$SOURCE-$VERSION.tar.xz"
 WEB_SITE="http://kernel.org/~kzak/util-linux/"
 WGET_URL="http://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/$TARBALL"
-COOK_OPT="!fs"
+HOST_ARCH="i486 arm"
 LOCALE=""
 
 DEPENDS=""
@@ -19,6 +19,10 @@
 compile_rules()
 {
 	cd $src
+	# Fix undeclared 'LINE_MAX'
+	case "$ARCH" in
+		arm) sed -i s'|LINE_MAX|25|' text-utils/*.c ;;
+	esac
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \