# HG changeset patch # User Pascal Bellard # Date 1645812396 0 # Node ID c11594098e34b20c6750d23ece3a9ee8ec7dcd13 # Parent 257d3372786a1f97efaf6546cd9ed1022443c325 Add some current_version diff -r 257d3372786a -r c11594098e34 diggerjs/receipt --- a/diggerjs/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/diggerjs/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -11,6 +11,13 @@ WEB_SITE="http://www.heise.de/software/download/digger.js/8148" WGET_URL="http://www.tikkel.de/download/$TARBALL" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/lutzroeder/digger/commits/main 2>/dev/null | \ + sed '/Commits on/!d;s|.*on |"|;s|<.*|"|;q' | xargs date +%Y%m%d -d +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 linld/receipt --- a/linld/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -17,6 +17,13 @@ BUILD_DEPENDS="dosbox upx" +# What is the latest version available today? +current_version() +{ + wget -O - ${WEB_SITE%/*} 2>/dev/null | \ + sed "/tar/!d;s|.*$PACKAGE\\(.*\\)devel.*\".*|\\1|;s|^\(.\)|&.|;q" +} + # Rules to configure and make the package. compile_rules() { diff -r 257d3372786a -r c11594098e34 linld/stuff/src/COMMON.H --- a/linld/stuff/src/COMMON.H Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/stuff/src/COMMON.H Fri Feb 25 18:06:36 2022 +0000 @@ -17,6 +17,7 @@ #define ELKS elks support #define IPXE ipxe support #define CPUTYPE detect cpu family and model +#define MINRAM detect RAM size /* End of the optional features */ #ifdef ISOHOOK @@ -99,6 +100,11 @@ extern u8 buf4k[4096]; extern u32 far *initrd_desc; +#ifdef ISO9660 +#define CMDSTR_EXTRA "|iso" +#else +#define CMDSTR_EXTRA "" +#endif #define cmdline (cmdstr[0]) #define kernel_name (cmdstr[1]) #define initrd_name (cmdstr[2]) @@ -109,21 +115,57 @@ #define vid_mode (cmdnum[1]) // -3 = ask, -2 = Extended VGA, -1 = Normal VGA, n = as "n" was pressed #define topmem (cmdnum[2]) #define base_himem (cmdnum[3]) +#define CMDNUM 4 +#define CMDNUM_EXTRA "" +extern u32 cmdnum[CMDNUM +#ifdef MINRAM +#define minram (cmdnum[CMDNUM]) +#undef CMDNUM_EXTRA +#define CMDNUM_EXTRA "-r|" +#undef CMDNUM +#define CMDNUM 5 + +1 +#endif #ifdef CPUTYPE -#define mincpu (* (short *) &cmdnum[4]) -#define skip_alloc (* (char *) &cmdnum[5]) -extern unsigned cputype; -#else -#define skip_alloc (* (char *) &cmdnum[4]) -#endif -extern u32 cmdnum[5 -#ifdef CPUTYPE +#define mincpu (* (short *) &cmdnum[CMDNUM]) +#undef CMDNUM +#undef CMDNUM_EXTRA +# ifdef MINRAM +#define CMDNUM_EXTRA "-r|-m|" +#define CMDNUM 6 +# else +#define CMDNUM_EXTRA "-m|" +#define CMDNUM 5 +# endif +1 #endif #ifdef QUICK_BOOT +#undef CMDNUM +#undef CMDNUM_EXTRA +# ifdef MINRAM +# ifdef CPUTYPE +#define CMDNUM_EXTRA "-r|-m|-q~-v~" +#define CMDNUM 8 +# else +#define CMDNUM_EXTRA "-r|-q~-v~" +#define CMDNUM 7 +# endif +# else +# ifdef CPUTYPE +#define CMDNUM_EXTRA "-m|-q~-v~" +#define CMDNUM 7 +# else +#define CMDNUM_EXTRA "-q~-v~" +#define CMDNUM 6 +# endif +# endif +2 #endif - ]; + +1]; +#define skip_alloc (* (char *) &cmdnum[CMDNUM]) +#ifdef CPUTYPE +extern unsigned cputype; +#endif extern _fastcall void memcpy_image_kernel(); extern _fastcall void memcpy_image_initrd(); diff -r 257d3372786a -r c11594098e34 linld/stuff/src/JUMP.ASM --- a/linld/stuff/src/JUMP.ASM Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/stuff/src/JUMP.ASM Fri Feb 25 18:06:36 2022 +0000 @@ -27,12 +27,15 @@ macro dos_shutdown xor bx,bx ifdef QUICK_BOOT +CMDNUMOFS = 20 + ifdef MINRAM +CMDNUMOFS = CMDNUMOFS+4 + endif + ifdef CPUTYPE +CMDNUMOFS = CMDNUMOFS+4 + endif extrn _cmdnum:dword - ifdef CPUTYPE -quickboot = (byte _cmdnum+24) - else -quickboot = (byte _cmdnum+20) - endif +quickboot = (byte _cmdnum+CMDNUMOFS) cmp bl,[quickboot] mov ds,bx jne skip_shutdown diff -r 257d3372786a -r c11594098e34 linld/stuff/src/LINLD.CPP --- a/linld/stuff/src/LINLD.CPP Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/stuff/src/LINLD.CPP Fri Feb 25 18:06:36 2022 +0000 @@ -35,6 +35,9 @@ NL NL "Examples:" NL "\tLINLD " "-b 64m " +#ifdef MINRAM + "-r 96m " +#endif #ifdef CPUTYPE "-m 0x600 " #endif @@ -61,19 +64,8 @@ if (cpuhaslm() == 0) exit(); } #endif -#ifdef ISO9660 - if (argstr(*argv,"cl|image|initrd|iso",clp) == (int) clp) continue; -#else - if (argstr(*argv,"cl|image|initrd",clp) == (int) clp) continue; -#endif - if (argnum(*argv,"root|vga|mem|-b|" -#ifdef CPUTYPE - "-m|" -#endif - "-f~" -#ifdef QUICK_BOOT - "-q~-v~" -#endif + if (argstr(*argv,"cl|image|initrd" CMDSTR_EXTRA,clp) == (int) clp) continue; + if (argnum(*argv,"root|vga|mem|-b|" CMDNUM_EXTRA "-f~" ,&root_dev) >= (int) &base_himem) continue; if (fileexist(*argv) != -1) { kernel_name=*argv; @@ -82,9 +74,13 @@ *clp = (const char *) heap_top +1; strcatb((const char *) heap_top,*argv); } while (*++argv); +#ifdef MINRAM + if ((minram>>16) > (memtop()>>16) && (minram>>16) != 0) exit(); +#endif #ifdef CPUTYPE if (mincpu > cputype) exit(); #endif + puts(*clp); asm{ xchg ax,bx diff -r 257d3372786a -r c11594098e34 linld/stuff/src/VCPI.ASM --- a/linld/stuff/src/VCPI.ASM Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/stuff/src/VCPI.ASM Fri Feb 25 18:06:36 2022 +0000 @@ -347,12 +347,15 @@ mov [bx],sp ;mov [bx+2],ss ifdef QUICK_BOOT +CMDNUMOFS = 24 + ifdef MINRAM +CMDNUMOFS = CMDNUMOFS+4 + endif + ifdef CPUTYPE +CMDNUMOFS = CMDNUMOFS+4 + endif extrn _cmdnum:dword - ifdef CPUTYPE -v86boot = (byte _cmdnum+28) - else -v86boot = (byte _cmdnum+24) - endif +v86boot = (byte _cmdnum+CMDNUMOFS) test [v86boot],bh jnz @vm2rm_ret endif diff -r 257d3372786a -r c11594098e34 linld/stuff/src/_BEG.ASM --- a/linld/stuff/src/_BEG.ASM Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/stuff/src/_BEG.ASM Fri Feb 25 18:06:36 2022 +0000 @@ -12,6 +12,9 @@ include "isostate.inc" CMDNUMCNT = 5 + ifdef MINRAM +CMDNUMCNT = CMDNUMCNT+1 + endif ifdef CPUTYPE CMDNUMCNT = CMDNUMCNT+1 endif diff -r 257d3372786a -r c11594098e34 linld/stuff/src/pipehole.awk --- a/linld/stuff/src/pipehole.awk Fri Feb 25 17:38:01 2022 +0100 +++ b/linld/stuff/src/pipehole.awk Fri Feb 25 18:06:36 2022 +0000 @@ -22,7 +22,6 @@ print "call_exit:" gotexit=1 } - if (/short @1@422/ && gotexit) $0=" ja call_exit" if (islinld==1) { if (/,word.*/) islinld=0 print "; " $0 @@ -64,6 +63,24 @@ islinld=4 } } + if (/minram>>16/) islinld=7 + if (islinld==7) { + if (/endif/) islinld=0 + if (/mov/) sub(/ax/,"cx"); + if (/;/ || /_memtop/ || /mov/) { print; next } + if (/ax,0/) { + print " jcxz minram_done" + print " cmp cx,dx" + print " ja call_exit" + print "minram_done:" + } + next + } + if (/mincpu > cputype/) islinld=8 + if (islinld==8) { + if (/endif/) islinld=0 + if (/jbe/) $0=" ja call_exit" + } } # file == "linld.cpp" if (file == "himem.cpp") { if (/sp,bp/ || /pop bp/ || /enter/ || /leave/) next diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-armv4eb/receipt --- a/uclibc-cross-compiler-armv4eb/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-armv4eb/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-armv4l/receipt --- a/uclibc-cross-compiler-armv4l/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-armv4l/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-armv4tl/receipt --- a/uclibc-cross-compiler-armv4tl/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-armv4tl/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-armv5l/receipt --- a/uclibc-cross-compiler-armv5l/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-armv5l/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-armv6l/receipt --- a/uclibc-cross-compiler-armv6l/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-armv6l/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-i486/receipt --- a/uclibc-cross-compiler-i486/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-i486/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-mips/receipt --- a/uclibc-cross-compiler-mips/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-mips/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-mips64/receipt --- a/uclibc-cross-compiler-mips64/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-mips64/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-mipsel/receipt --- a/uclibc-cross-compiler-mipsel/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-mipsel/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-powerpc/receipt --- a/uclibc-cross-compiler-powerpc/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-powerpc/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-sh4/receipt --- a/uclibc-cross-compiler-sh4/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-sh4/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-sparc/receipt --- a/uclibc-cross-compiler-sparc/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-sparc/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 257d3372786a -r c11594098e34 uclibc-cross-compiler-x86_64/receipt --- a/uclibc-cross-compiler-x86_64/receipt Fri Feb 25 17:38:01 2022 +0100 +++ b/uclibc-cross-compiler-x86_64/receipt Fri Feb 25 18:06:36 2022 +0000 @@ -15,6 +15,13 @@ SUGGESTED="uclibc-${PACKAGE##*-}" +# What is the latest version available today? +current_version() +{ + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() {