From a3df520ee39eac65952a71f2fb54b242aa45b9cc Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:24:20 +0000 Subject: [PATCH] Stefan Fiedler: util-linux: pass non-empty ARCH to make; add work-around for guessing fs types of CD images with mount on qemu-system-arm [2007091816035632006] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8749 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/util-linux/util-linux.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/base/util-linux/util-linux.conf b/package/base/util-linux/util-linux.conf index cbfca1443..21fe216c2 100644 --- a/package/base/util-linux/util-linux.conf +++ b/package/base/util-linux/util-linux.conf @@ -27,12 +27,21 @@ hook_add premake 5 "cp hwclock/hwclock.c{,.orig}; \ mkdir -pv ${CLFS}/var/lib/hwclock" # hook_add postmake 5 "mv -v ${CLFS}/usr/bin/logger ${CLFS}/bin" +tmp1=`echo "$arch_machine" | sed 's/i.86/intel/;s/arm.*/arm/'` + var_append makeopt " " "CC='$CC' CPU='$arch_machine' ARCH='$tmp1'" var_append makeinstopt " " "CC='$CC' CPU='$arch_machine' ARCH='$tmp1' DESTDIR='$root'" var_append makeopt " " 'HAVE_KILL=yes HAVE_SLN=yes' var_append makeinstopt " " 'HAVE_KILL=yes HAVE_SLN=yes USE_TTY_GROUP=no' +# On arm, using libblkid causes qemu 0.9.0 to exit with the error +# lsi_scsi: error: readb 0x8 +# when mount tries to guess the fs type of CD images. +if [ "$arch" = arm ] ; then + var_append makeopt " " "HAVE_BLKID=no" +fi + util_linux_postmake() { rm -f $root/sbin/sln # we are using sln from glibc $CC $confdir/freeramdisk.c -o $root/sbin/freeramdisk