[Pkg-ltsp-devel] Bug#539898: ltsp-server: ltsp-build-client fails to build i386 client on amd64

[Vagrant Cascadian]

tags 539898 pending
thanks

On Tue, Aug 04, 2009 at 12:05:54PM +0200, Libor Klepáč wrote:
> Unfortunately, build-client fails to build i386  version of boot, amd64 version builds ok
> It dies on
> cp: omitting directory `/usr/bin/'
> error: LTSP client installation ended abnormally

ah, this is a bug introduced by the new cross-architecture code (which is
*should* be un-used for i386 on amd64 servers)...

fixed upstream, and will include it in the next upload (although it just missed
the 5.1.79-2 upload i made half an hour ago, unfortunately).

this patch should fix the issue, please test it (i am unable to test it
myself):

=== modified file 'server/plugins/ltsp-build-client/Debian/002-cross-arch'
--- server/plugins/ltsp-build-client/Debian/002-cross-arch      2009-07-29 16:12:13 +0000
+++ server/plugins/ltsp-build-client/Debian/002-cross-arch      2009-08-04 13:28:08 +0000
@@ -23,11 +23,16 @@
                 *) echo "WARNING: unknown cross-architecture combination: $ARCH on $HOST_ARCH"
                     ;;
             esac
-            if [ -x "/usr/bin/${CROSS_ARCH_EMULATOR}-static" ]; then
+            if [ -z "$CROSS_ARCH_EMULATOR" ]; then
+                : # no cross-architecture emulator detected
+            elif [ -x "/usr/bin/${CROSS_ARCH_EMULATOR}-static" ]; then
                 # prefer static variants
                 CROSS_ARCH_EMULATOR="/usr/bin/${CROSS_ARCH_EMULATOR}-static"
+            elif [ -x /usr/bin/${CROSS_ARCH_EMULATOR}" ]; then
+                CROSS_ARCH_EMULATOR="/usr/bin/${CROSS_ARCH_EMULATOR}"
             else
-                CROSS_ARCH_EMULATOR="/usr/bin/${CROSS_ARCH_EMULATOR}"
+                echo "WARNING: unable to find: $CROSS_ARCH_EMULATOR in /usr/bin"
+                unset CROSS_ARCH_EMULATOR
             fi
         fi
         if [ -n "$CROSS_ARCH_EMULATOR" ] && [ ! -x "$CROSS_ARCH_EMULATOR" ]; then

live well,
  vagrant