SliTaz Repositories

     1.1 --- a/linld/stuff/src/COMMON.H	Sun Feb 27 17:43:39 2022 +0100
     1.2 +++ b/linld/stuff/src/COMMON.H	Sun Feb 27 21:20:06 2022 +0000
     1.3 @@ -131,10 +131,10 @@
     1.4  #undef CMDNUM
     1.5  #undef CMDNUM_EXTRA
     1.6  # ifdef MINRAM
     1.7 -#define CMDNUM_EXTRA	"-r|-m|"
     1.8 +#define CMDNUM_EXTRA	"-r|-c|"
     1.9  #define CMDNUM		6
    1.10  # else
    1.11 -#define CMDNUM_EXTRA	"-m|"
    1.12 +#define CMDNUM_EXTRA	"-c|"
    1.13  #define CMDNUM		5
    1.14  # endif
    1.15  	+1
    1.16 @@ -144,25 +144,52 @@
    1.17  #undef CMDNUM_EXTRA
    1.18  # ifdef MINRAM
    1.19  #  ifdef CPUTYPE
    1.20 -#define CMDNUM_EXTRA	"-r|-m|-q~-v~"
    1.21 +#   ifdef VCPI
    1.22 +#define CMDNUM_EXTRA	"-r|-c|-q~-v~"
    1.23  #define CMDNUM		8
    1.24 +#   else
    1.25 +#define CMDNUM_EXTRA	"-r|-c|-q~"
    1.26 +#define CMDNUM		7
    1.27 +#   endif
    1.28  #  else
    1.29 +#   ifdef VCPI
    1.30  #define CMDNUM_EXTRA	"-r|-q~-v~"
    1.31  #define CMDNUM		7
    1.32 +#   else
    1.33 +#define CMDNUM_EXTRA	"-r|-q~"
    1.34 +#define CMDNUM		6
    1.35 +#   endif
    1.36  #  endif
    1.37  # else
    1.38  #  ifdef CPUTYPE
    1.39 -#define CMDNUM_EXTRA	"-m|-q~-v~"
    1.40 +#   ifdef VCPI
    1.41 +#define CMDNUM_EXTRA	"-c|-q~-v~"
    1.42  #define CMDNUM		7
    1.43 +#   else
    1.44 +#define CMDNUM_EXTRA	"-c|-q~"
    1.45 +#define CMDNUM		6
    1.46 +#   endif
    1.47  #  else
    1.48 +#   ifdef VCPI
    1.49  #define CMDNUM_EXTRA	"-q~-v~"
    1.50  #define CMDNUM		6
    1.51 +#   else
    1.52 +#define CMDNUM_EXTRA	"-q~"
    1.53 +#define CMDNUM		5
    1.54 +#   endif
    1.55  #  endif
    1.56  # endif
    1.57 +# ifdef VCPI
    1.58  	+2
    1.59 +# else
    1.60 +	+1
    1.61 +# endif
    1.62  #endif
    1.63 -	+1];
    1.64 +#ifdef WITH_XMM_ALLOC
    1.65 +	+1
    1.66  #define	skip_alloc	(* (char *) &cmdnum[CMDNUM])
    1.67 +#endif
    1.68 +	];
    1.69  #ifdef CPUTYPE
    1.70  extern unsigned cputype;
    1.71  #endif

     2.1 --- a/linld/stuff/src/LINLD.CPP	Sun Feb 27 17:43:39 2022 +0100
     2.2 +++ b/linld/stuff/src/LINLD.CPP	Sun Feb 27 21:20:06 2022 +0000
     2.3 @@ -22,32 +22,40 @@
     2.4  	"\t-r minRAM" NL
     2.5  #endif
     2.6  #ifdef CPUTYPE
     2.7 -        "\t-m minCPU	family*256+model" NL
     2.8 +        "\t-c minCPU\tfamily*256+model" NL
     2.9  #endif
    2.10  #ifdef CPU64
    2.11 -        "\t-64 cpu64 only" NL
    2.12 +        "\t-64\t\t64 bits cpu" NL
    2.13  #endif
    2.14 -        "Defaults:"
    2.15 -        "\timage=bzImage"
    2.16 -        "\tmem=256m"
    2.17 -        "\tcl=auto" 
    2.18 -        "\t-b 1088k" NL
    2.19 -        "Use quotes: \"cl=...\" if you need spaces in cmdline" NL
    2.20 -        "Use cl=@filename to get it from a file"
    2.21 +#ifdef WITH_XMM_ALLOC
    2.22 +	"\t-f\t\tskip XMMS alloc" NL
    2.23 +#endif
    2.24 +#ifdef QUICK_BOOT
    2.25 +# ifdef VCPI
    2.26 +	"\t-v\t\tV86 mode" NL
    2.27 +# endif
    2.28 +	"\t-q\t\tskip shutdown" NL
    2.29 +#endif
    2.30 +        "Defaults:\t"
    2.31 +        "image=bzImage "
    2.32 +        "mem=256m "
    2.33 +        "cl=auto " 
    2.34 +        "-b 1088k" NL
    2.35 +        "Use quotes \"cl=...\" for spaces in cmdline"
    2.36 +        ", cl=@filename to get it from a file"
    2.37  #if 1
    2.38          NL NL "Examples:" NL
    2.39  	"\tLINLD "
    2.40 -	"-b 64m "
    2.41  #ifdef MINRAM
    2.42  	"-r 96m "
    2.43  #endif
    2.44  #ifdef CPUTYPE
    2.45 -	"-m 0x600 "
    2.46 +	"-c 0x600 "
    2.47  #endif
    2.48 -        "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "
    2.49 +        "initrd=rootfs.gz,mycfg.gz "
    2.50  	"\"cl=root=/dev/null video=-32\""
    2.51  	NL "\tLINLD memtest"
    2.52 -	NL "\tLINLD @args"
    2.53 +	NL "\tLINLD @linld.cmd"
    2.54  #endif
    2.55      );
    2.56  }
    2.57 @@ -69,7 +77,10 @@
    2.58  	}
    2.59  #endif
    2.60  	if (argstr(*argv,"cl|image|initrd" CMDSTR_EXTRA,clp) == (int) clp) continue;
    2.61 -	if (argnum(*argv,"root|vga|mem|-b|" CMDNUM_EXTRA "-f~"
    2.62 +	if (argnum(*argv,"root|vga|mem|-b|" CMDNUM_EXTRA
    2.63 +#ifdef WITH_XMM_ALLOC
    2.64 +		"-f~"
    2.65 +#endif
    2.66  		,&root_dev) >= (int) &base_himem) continue;
    2.67  	if (fileexist(*argv) != -1) {
    2.68              kernel_name=*argv;

     3.1 --- a/tazlito/receipt	Sun Feb 27 17:43:39 2022 +0100
     3.2 +++ b/tazlito/receipt	Sun Feb 27 21:20:06 2022 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="tazlito"
     3.7 -VERSION="533"
     3.8 +VERSION="534"
     3.9  CATEGORY="base-system"
    3.10  SHORT_DESC="SliTaz Live Tool."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"