wok-6.x rev 13747

syslinux: add MENU STARTIFNOARG
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Dec 31 11:41:25 2012 +0100 (2012-12-31)
parents d27efa12de84
children aece320227d7
files get-bitcoin/stuff/get-bitcoin syslinux/receipt syslinux/stuff/extra/iso9660.u syslinux/stuff/extra/md5sum.c syslinux/stuff/extra/readconfig.u syslinux/stuff/i18n.cfg syslinux/stuff/isolinux.cfg
line diff
     1.1 --- a/get-bitcoin/stuff/get-bitcoin	Mon Dec 31 13:28:06 2012 +0300
     1.2 +++ b/get-bitcoin/stuff/get-bitcoin	Mon Dec 31 11:41:25 2012 +0100
     1.3 @@ -6,7 +6,7 @@
     1.4  WEB_SITE="http://bitcoin.org/"
     1.5  SHORT_DESC="New digital currency for instant payments to anyone, anywhere."
     1.6  MAINTAINER="somebody@bitcoin.org"
     1.7 -DEPENDS="libQtGui"
     1.8 +DEPENDS="libQtGui bzlib"
     1.9  TARBALL="$PACKAGE-$VERSION-linux.tar.gz"
    1.10  SF_MIRROR="http://netcologne.dl.sourceforge.net/project"
    1.11  URL="$SF_MIRROR/$PACKAGE/Bitcoin/$PACKAGE-$VERSION/$TARBALL"
     2.1 --- a/syslinux/receipt	Mon Dec 31 13:28:06 2012 +0300
     2.2 +++ b/syslinux/receipt	Mon Dec 31 11:41:25 2012 +0100
     2.3 @@ -16,6 +16,8 @@
     2.4  compile_rules()
     2.5  {
     2.6      cd $src
     2.7 +    #patch -p 0 < $stuff/extra/iso9660.u
     2.8 +    patch -p 0 < $stuff/extra/readconfig.u
     2.9      cp -a $stuff/iso2exe .
    2.10      make -C iso2exe
    2.11      cp $stuff/tools/isohybrid.sh .
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/syslinux/stuff/extra/iso9660.u	Mon Dec 31 11:41:25 2012 +0100
     3.3 @@ -0,0 +1,56 @@
     3.4 +--- core/fs/iso9660/iso9660.c
     3.5 ++++ core/fs/iso9660/iso9660.c
     3.6 +@@ -132,6 +132,28 @@
     3.7 + 	
     3.8 + 	de_name_len = de->name_len;
     3.9 + 	de_name = de->name;
    3.10 ++#define __ROCKRIDGE
    3.11 ++#ifdef __ROCKRIDGE
    3.12 ++	{
    3.13 ++		char *name = NULL, *end;
    3.14 ++		int n = (offset - de_len + de->name_len + 34) & -2;
    3.15 ++		int len = data[n + 2];
    3.16 ++		do {
    3.17 ++			if (* (short *) (data + n) == 0x4D4E) { // NM
    3.18 ++				name = data + n + 5;
    3.19 ++				end = data + n + len;
    3.20 ++			}
    3.21 ++			n += len;
    3.22 ++		} while (n + 2 < offset);
    3.23 ++		if (name) {
    3.24 ++			*end = 0;
    3.25 ++			if (!strcmp(name, dname)) {
    3.26 ++				dprintf("Found rockridge.\n");
    3.27 ++				return de;
    3.28 ++			}
    3.29 ++		}
    3.30 ++	}
    3.31 ++#endif
    3.32 + 	if (iso_compare_name(de_name, de_name_len, dname)) {
    3.33 + 	    dprintf("Found.\n");
    3.34 + 	    return de;
    3.35 +@@ -211,6 +233,24 @@
    3.36 + 	    data = NULL;
    3.37 + 	    continue;
    3.38 + 	}
    3.39 ++#ifdef __ROCKRIDGE2
    3.40 ++	{
    3.41 ++		char *name = NULL;
    3.42 ++		int n = (offset + de->name_len + 34) & -2;
    3.43 ++		int len = data[n + 2], delen;
    3.44 ++		do {
    3.45 ++			if (* (short *) (data + n) == 0x4D4E) { // NM
    3.46 ++				name = data + n + 5;
    3.47 ++				delen = len - 5;
    3.48 ++			}
    3.49 ++			n += len;
    3.50 ++		} while (n + 2 < offset + de->length);
    3.51 ++		if (name) {
    3.52 ++			de->name_len = delen;
    3.53 ++			strcpy(de->name, name, delen);
    3.54 ++		}
    3.55 ++	}
    3.56 ++#endif
    3.57 + 	break;
    3.58 +     }
    3.59 +     
     4.1 --- a/syslinux/stuff/extra/md5sum.c	Mon Dec 31 13:28:06 2012 +0300
     4.2 +++ b/syslinux/stuff/extra/md5sum.c	Mon Dec 31 11:41:25 2012 +0100
     4.3 @@ -586,7 +586,6 @@
     4.4      msg="Append to kernel parameters: ";
     4.5      for (i = 3; i < (size_t) argc; i++, msg = " ")
     4.6  	printf("%s%s",msg,argv[i]);
     4.7 -    printf("\nNow select 'Start SliTaz' in top menu.");
     4.8      printf("\n\n                            Hit RETURN to continue.\n");
     4.9  
    4.10      msg = "Load error";
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/syslinux/stuff/extra/readconfig.u	Mon Dec 31 11:41:25 2012 +0100
     5.3 @@ -0,0 +1,15 @@
     5.4 +--- com32/menu/readconfig.c
     5.5 ++++ com32/menu/readconfig.c
     5.6 +@@ -874,6 +874,12 @@
     5.7 + 		}
     5.8 + 	    } else if (looking_at(p, "start")) {
     5.9 + 		start_menu = m;
    5.10 ++	    } else if ((ep = looking_at(p, "startifnoarg"))) {
    5.11 ++	    	size_t size;
    5.12 ++	    	int slot;
    5.13 ++	    	slot = strtoul(ep, &ep, 0);
    5.14 ++	    	if (!syslinux_getadv(slot, &size))
    5.15 ++			start_menu = m;
    5.16 + 	    } else if (looking_at(p, "help")) {
    5.17 + 		if (ld.label) {
    5.18 + 		    ld.action = MA_HELP;
     6.1 --- a/syslinux/stuff/i18n.cfg	Mon Dec 31 13:28:06 2012 +0300
     6.2 +++ b/syslinux/stuff/i18n.cfg	Mon Dec 31 11:41:25 2012 +0100
     6.3 @@ -2,12 +2,5 @@
     6.4  MENU BEGIN ^lang
     6.5  MENU TITLE Languages
     6.6  MENU TABMSG
     6.7 -MENU START
     6.8 +MENU STARTIFNOARG 1
     6.9  
    6.10 -LABEL boot
    6.11 -	MENU LABEL Start SliTaz
    6.12 -	MENU GOTO .top
    6.13 -	TEXT HELP
    6.14 -	          Did you select your language first ?
    6.15 -	ENDTEXT
    6.16 -
     7.1 --- a/syslinux/stuff/isolinux.cfg	Mon Dec 31 13:28:06 2012 +0300
     7.2 +++ b/syslinux/stuff/isolinux.cfg	Mon Dec 31 11:41:25 2012 +0100
     7.3 @@ -1,5 +1,4 @@
     7.4  UI vesamenu.c32
     7.5 -DEFAULT us
     7.6  PROMPT 0
     7.7  TIMEOUT 80
     7.8