wok-next rev 12293
linux: fix linux64 config file
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Apr 16 09:30:43 2012 +0200 (2012-04-16) |
parents | 31722f4be932 |
children | 2e8cd6aba55c |
files | linux/receipt syslinux/receipt syslinux/stuff/extra/md5sum.c |
line diff
1.1 --- a/linux/receipt Mon Apr 16 00:05:49 2012 +0200 1.2 +++ b/linux/receipt Mon Apr 16 09:30:43 2012 +0200 1.3 @@ -151,7 +151,7 @@ 1.4 [ ! -x /usr/bin/cook ] && report step "Make bzImage64 without modules first" 1.5 1.6 # Build bzImage64 without modules first 1.7 - cp -f $stuff/$PACKAGE-$VERSION-slitaz.config64 .config 1.8 + cp -f $stuff/$PACKAGE-slitaz.config64 .config 1.9 sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config 1.10 1.11 # We can't keep every driver in staging 1.12 @@ -171,7 +171,7 @@ 1.13 [ ! -x /usr/bin/cook ] && report step "Now build bzImage64 with modules" 1.14 1.15 # Build bzImage64 with modules 1.16 - cp -f $stuff/$PACKAGE-$VERSION-slitaz.config64 .config 1.17 + cp -f $stuff/$PACKAGE-slitaz.config64 .config 1.18 #make ARCH=x86_64 oldconfig 1.19 ln .config $WOK/$PACKAGE/slitaz/config64 1.20 make -j 4 ARCH=x86_64 CROSS_COMPILE=uclibc-x86_64- bzImage &&
2.1 --- a/syslinux/receipt Mon Apr 16 00:05:49 2012 +0200 2.2 +++ b/syslinux/receipt Mon Apr 16 09:30:43 2012 +0200 2.3 @@ -42,7 +42,7 @@ 2.4 cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux 2.5 ( cd $src ; ls *.kbd | cpio -o -H newc ) > $fs/boot/isolinux/cpio.kbd 2.6 while read label kbd loc menu; do 2.7 - [ -s $src/$kbd.kbd ] || continue 2.8 + #[ -s $src/$kbd.kbd ] || continue 2.9 cat >> $fs/boot/isolinux/i18n.cfg <<EOT 2.10 2.11 LABEL $label
3.1 --- a/syslinux/stuff/extra/md5sum.c Mon Apr 16 00:05:49 2012 +0200 3.2 +++ b/syslinux/stuff/extra/md5sum.c Mon Apr 16 09:30:43 2012 +0200 3.3 @@ -559,6 +559,11 @@ 3.4 if (argc < 3) 3.5 goto kbdmap_error; 3.6 3.7 + // Save extra cmdline arguments 3.8 + for (i = 3; i < (size_t) argc; i++) { 3.9 + syslinux_setadv(i - 2, strlen(argv[i]), argv[i]); 3.10 + } 3.11 + 3.12 msg = "Load error"; 3.13 if (kmap->version != 1 || 3.14 loadfile(argv[1], (void **) &kbdmap, &map_size) || 3.15 @@ -598,11 +603,6 @@ 3.16 3.17 memcpy(kmap->map, kbdmap, size); 3.18 3.19 - // Save extra cmdline arguments 3.20 - for (i = 3; i < (size_t) argc; i++) { 3.21 - syslinux_setadv(i - 2, strlen(argv[i]), argv[i]); 3.22 - } 3.23 - 3.24 return 0; 3.25 3.26 kbdmap_error: