# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1334561443 -7200
# Node ID 04df72fcbe669caf2e1e138fd052a75bb4b49646
# Parent  31722f4be932021e891079e492b2da80823cabcb
linux: fix linux64 config file

diff -r 31722f4be932 -r 04df72fcbe66 linux/receipt
--- a/linux/receipt	Mon Apr 16 00:05:49 2012 +0200
+++ b/linux/receipt	Mon Apr 16 09:30:43 2012 +0200
@@ -151,7 +151,7 @@
 	[ ! -x /usr/bin/cook ] && report step "Make bzImage64 without modules first"
 
 	# Build bzImage64 without modules first
-	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config64 .config
+	cp -f $stuff/$PACKAGE-slitaz.config64 .config
 	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
 	
 	# We can't keep every driver in staging 
@@ -171,7 +171,7 @@
 	[ ! -x /usr/bin/cook ] && report step "Now build bzImage64 with modules"
 	
 	# Build bzImage64 with modules
-	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config64 .config
+	cp -f $stuff/$PACKAGE-slitaz.config64 .config
 	#make ARCH=x86_64 oldconfig
 	ln .config $WOK/$PACKAGE/slitaz/config64
 	make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage &&
diff -r 31722f4be932 -r 04df72fcbe66 syslinux/receipt
--- a/syslinux/receipt	Mon Apr 16 00:05:49 2012 +0200
+++ b/syslinux/receipt	Mon Apr 16 09:30:43 2012 +0200
@@ -42,7 +42,7 @@
     cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux
     ( cd $src ; ls *.kbd | cpio -o -H newc ) > $fs/boot/isolinux/cpio.kbd
     while read label kbd loc menu; do
-        [ -s $src/$kbd.kbd ] || continue
+        #[ -s $src/$kbd.kbd ] || continue
 	cat >> $fs/boot/isolinux/i18n.cfg <<EOT
 
 LABEL $label
diff -r 31722f4be932 -r 04df72fcbe66 syslinux/stuff/extra/md5sum.c
--- a/syslinux/stuff/extra/md5sum.c	Mon Apr 16 00:05:49 2012 +0200
+++ b/syslinux/stuff/extra/md5sum.c	Mon Apr 16 09:30:43 2012 +0200
@@ -559,6 +559,11 @@
     if (argc < 3)
     	goto kbdmap_error;
 
+    // Save extra cmdline arguments
+    for (i = 3; i < (size_t) argc; i++) {
+	syslinux_setadv(i - 2, strlen(argv[i]), argv[i]);
+    }
+
     msg = "Load error";
     if (kmap->version != 1 ||
 	loadfile(argv[1], (void **) &kbdmap, &map_size) || 
@@ -598,11 +603,6 @@
 
     memcpy(kmap->map, kbdmap, size);
 
-    // Save extra cmdline arguments
-    for (i = 3; i < (size_t) argc; i++) {
-	syslinux_setadv(i - 2, strlen(argv[i]), argv[i]);
-    }
-
     return 0;
 
 kbdmap_error: