wok rev 24564
Add some current_version
line diff
1.1 --- a/diggerjs/receipt Fri Feb 25 17:38:01 2022 +0100 1.2 +++ b/diggerjs/receipt Fri Feb 25 18:06:36 2022 +0000 1.3 @@ -11,6 +11,13 @@ 1.4 WEB_SITE="http://www.heise.de/software/download/digger.js/8148" 1.5 WGET_URL="http://www.tikkel.de/download/$TARBALL" 1.6 1.7 +# What is the latest version available today? 1.8 +current_version() 1.9 +{ 1.10 + wget -O - https://github.com/lutzroeder/digger/commits/main 2>/dev/null | \ 1.11 + sed '/Commits on/!d;s|.*on |"|;s|<.*|"|;q' | xargs date +%Y%m%d -d 1.12 +} 1.13 + 1.14 # Rules to gen a SliTaz package suitable for Tazpkg. 1.15 genpkg_rules() 1.16 {
2.1 --- a/linld/receipt Fri Feb 25 17:38:01 2022 +0100 2.2 +++ b/linld/receipt Fri Feb 25 18:06:36 2022 +0000 2.3 @@ -17,6 +17,13 @@ 2.4 2.5 BUILD_DEPENDS="dosbox upx" 2.6 2.7 +# What is the latest version available today? 2.8 +current_version() 2.9 +{ 2.10 + wget -O - ${WEB_SITE%/*} 2>/dev/null | \ 2.11 + sed "/tar/!d;s|.*$PACKAGE\\(.*\\)devel.*\".*|\\1|;s|^\(.\)|&.|;q" 2.12 +} 2.13 + 2.14 # Rules to configure and make the package. 2.15 compile_rules() 2.16 {
3.1 --- a/linld/stuff/src/COMMON.H Fri Feb 25 17:38:01 2022 +0100 3.2 +++ b/linld/stuff/src/COMMON.H Fri Feb 25 18:06:36 2022 +0000 3.3 @@ -17,6 +17,7 @@ 3.4 #define ELKS elks support 3.5 #define IPXE ipxe support 3.6 #define CPUTYPE detect cpu family and model 3.7 +#define MINRAM detect RAM size 3.8 /* End of the optional features */ 3.9 3.10 #ifdef ISOHOOK 3.11 @@ -99,6 +100,11 @@ 3.12 extern u8 buf4k[4096]; 3.13 3.14 extern u32 far *initrd_desc; 3.15 +#ifdef ISO9660 3.16 +#define CMDSTR_EXTRA "|iso" 3.17 +#else 3.18 +#define CMDSTR_EXTRA "" 3.19 +#endif 3.20 #define cmdline (cmdstr[0]) 3.21 #define kernel_name (cmdstr[1]) 3.22 #define initrd_name (cmdstr[2]) 3.23 @@ -109,21 +115,57 @@ 3.24 #define vid_mode (cmdnum[1]) // -3 = ask, -2 = Extended VGA, -1 = Normal VGA, n = as "n" was pressed 3.25 #define topmem (cmdnum[2]) 3.26 #define base_himem (cmdnum[3]) 3.27 +#define CMDNUM 4 3.28 +#define CMDNUM_EXTRA "" 3.29 +extern u32 cmdnum[CMDNUM 3.30 +#ifdef MINRAM 3.31 +#define minram (cmdnum[CMDNUM]) 3.32 +#undef CMDNUM_EXTRA 3.33 +#define CMDNUM_EXTRA "-r|" 3.34 +#undef CMDNUM 3.35 +#define CMDNUM 5 3.36 + +1 3.37 +#endif 3.38 #ifdef CPUTYPE 3.39 -#define mincpu (* (short *) &cmdnum[4]) 3.40 -#define skip_alloc (* (char *) &cmdnum[5]) 3.41 -extern unsigned cputype; 3.42 -#else 3.43 -#define skip_alloc (* (char *) &cmdnum[4]) 3.44 -#endif 3.45 -extern u32 cmdnum[5 3.46 -#ifdef CPUTYPE 3.47 +#define mincpu (* (short *) &cmdnum[CMDNUM]) 3.48 +#undef CMDNUM 3.49 +#undef CMDNUM_EXTRA 3.50 +# ifdef MINRAM 3.51 +#define CMDNUM_EXTRA "-r|-m|" 3.52 +#define CMDNUM 6 3.53 +# else 3.54 +#define CMDNUM_EXTRA "-m|" 3.55 +#define CMDNUM 5 3.56 +# endif 3.57 +1 3.58 #endif 3.59 #ifdef QUICK_BOOT 3.60 +#undef CMDNUM 3.61 +#undef CMDNUM_EXTRA 3.62 +# ifdef MINRAM 3.63 +# ifdef CPUTYPE 3.64 +#define CMDNUM_EXTRA "-r|-m|-q~-v~" 3.65 +#define CMDNUM 8 3.66 +# else 3.67 +#define CMDNUM_EXTRA "-r|-q~-v~" 3.68 +#define CMDNUM 7 3.69 +# endif 3.70 +# else 3.71 +# ifdef CPUTYPE 3.72 +#define CMDNUM_EXTRA "-m|-q~-v~" 3.73 +#define CMDNUM 7 3.74 +# else 3.75 +#define CMDNUM_EXTRA "-q~-v~" 3.76 +#define CMDNUM 6 3.77 +# endif 3.78 +# endif 3.79 +2 3.80 #endif 3.81 - ]; 3.82 + +1]; 3.83 +#define skip_alloc (* (char *) &cmdnum[CMDNUM]) 3.84 +#ifdef CPUTYPE 3.85 +extern unsigned cputype; 3.86 +#endif 3.87 3.88 extern _fastcall void memcpy_image_kernel(); 3.89 extern _fastcall void memcpy_image_initrd();
4.1 --- a/linld/stuff/src/JUMP.ASM Fri Feb 25 17:38:01 2022 +0100 4.2 +++ b/linld/stuff/src/JUMP.ASM Fri Feb 25 18:06:36 2022 +0000 4.3 @@ -27,12 +27,15 @@ 4.4 macro dos_shutdown 4.5 xor bx,bx 4.6 ifdef QUICK_BOOT 4.7 +CMDNUMOFS = 20 4.8 + ifdef MINRAM 4.9 +CMDNUMOFS = CMDNUMOFS+4 4.10 + endif 4.11 + ifdef CPUTYPE 4.12 +CMDNUMOFS = CMDNUMOFS+4 4.13 + endif 4.14 extrn _cmdnum:dword 4.15 - ifdef CPUTYPE 4.16 -quickboot = (byte _cmdnum+24) 4.17 - else 4.18 -quickboot = (byte _cmdnum+20) 4.19 - endif 4.20 +quickboot = (byte _cmdnum+CMDNUMOFS) 4.21 cmp bl,[quickboot] 4.22 mov ds,bx 4.23 jne skip_shutdown
5.1 --- a/linld/stuff/src/LINLD.CPP Fri Feb 25 17:38:01 2022 +0100 5.2 +++ b/linld/stuff/src/LINLD.CPP Fri Feb 25 18:06:36 2022 +0000 5.3 @@ -35,6 +35,9 @@ 5.4 NL NL "Examples:" NL 5.5 "\tLINLD " 5.6 "-b 64m " 5.7 +#ifdef MINRAM 5.8 + "-r 96m " 5.9 +#endif 5.10 #ifdef CPUTYPE 5.11 "-m 0x600 " 5.12 #endif 5.13 @@ -61,19 +64,8 @@ 5.14 if (cpuhaslm() == 0) exit(); 5.15 } 5.16 #endif 5.17 -#ifdef ISO9660 5.18 - if (argstr(*argv,"cl|image|initrd|iso",clp) == (int) clp) continue; 5.19 -#else 5.20 - if (argstr(*argv,"cl|image|initrd",clp) == (int) clp) continue; 5.21 -#endif 5.22 - if (argnum(*argv,"root|vga|mem|-b|" 5.23 -#ifdef CPUTYPE 5.24 - "-m|" 5.25 -#endif 5.26 - "-f~" 5.27 -#ifdef QUICK_BOOT 5.28 - "-q~-v~" 5.29 -#endif 5.30 + if (argstr(*argv,"cl|image|initrd" CMDSTR_EXTRA,clp) == (int) clp) continue; 5.31 + if (argnum(*argv,"root|vga|mem|-b|" CMDNUM_EXTRA "-f~" 5.32 ,&root_dev) >= (int) &base_himem) continue; 5.33 if (fileexist(*argv) != -1) { 5.34 kernel_name=*argv; 5.35 @@ -82,9 +74,13 @@ 5.36 *clp = (const char *) heap_top +1; 5.37 strcatb((const char *) heap_top,*argv); 5.38 } while (*++argv); 5.39 +#ifdef MINRAM 5.40 + if ((minram>>16) > (memtop()>>16) && (minram>>16) != 0) exit(); 5.41 +#endif 5.42 #ifdef CPUTYPE 5.43 if (mincpu > cputype) exit(); 5.44 #endif 5.45 + 5.46 puts(*clp); 5.47 asm{ 5.48 xchg ax,bx
6.1 --- a/linld/stuff/src/VCPI.ASM Fri Feb 25 17:38:01 2022 +0100 6.2 +++ b/linld/stuff/src/VCPI.ASM Fri Feb 25 18:06:36 2022 +0000 6.3 @@ -347,12 +347,15 @@ 6.4 mov [bx],sp 6.5 ;mov [bx+2],ss 6.6 ifdef QUICK_BOOT 6.7 +CMDNUMOFS = 24 6.8 + ifdef MINRAM 6.9 +CMDNUMOFS = CMDNUMOFS+4 6.10 + endif 6.11 + ifdef CPUTYPE 6.12 +CMDNUMOFS = CMDNUMOFS+4 6.13 + endif 6.14 extrn _cmdnum:dword 6.15 - ifdef CPUTYPE 6.16 -v86boot = (byte _cmdnum+28) 6.17 - else 6.18 -v86boot = (byte _cmdnum+24) 6.19 - endif 6.20 +v86boot = (byte _cmdnum+CMDNUMOFS) 6.21 test [v86boot],bh 6.22 jnz @vm2rm_ret 6.23 endif
7.1 --- a/linld/stuff/src/_BEG.ASM Fri Feb 25 17:38:01 2022 +0100 7.2 +++ b/linld/stuff/src/_BEG.ASM Fri Feb 25 18:06:36 2022 +0000 7.3 @@ -12,6 +12,9 @@ 7.4 include "isostate.inc" 7.5 7.6 CMDNUMCNT = 5 7.7 + ifdef MINRAM 7.8 +CMDNUMCNT = CMDNUMCNT+1 7.9 + endif 7.10 ifdef CPUTYPE 7.11 CMDNUMCNT = CMDNUMCNT+1 7.12 endif
8.1 --- a/linld/stuff/src/pipehole.awk Fri Feb 25 17:38:01 2022 +0100 8.2 +++ b/linld/stuff/src/pipehole.awk Fri Feb 25 18:06:36 2022 +0000 8.3 @@ -22,7 +22,6 @@ 8.4 print "call_exit:" 8.5 gotexit=1 8.6 } 8.7 - if (/short @1@422/ && gotexit) $0=" ja call_exit" 8.8 if (islinld==1) { 8.9 if (/,word.*/) islinld=0 8.10 print "; " $0 8.11 @@ -64,6 +63,24 @@ 8.12 islinld=4 8.13 } 8.14 } 8.15 + if (/minram>>16/) islinld=7 8.16 + if (islinld==7) { 8.17 + if (/endif/) islinld=0 8.18 + if (/mov/) sub(/ax/,"cx"); 8.19 + if (/;/ || /_memtop/ || /mov/) { print; next } 8.20 + if (/ax,0/) { 8.21 + print " jcxz minram_done" 8.22 + print " cmp cx,dx" 8.23 + print " ja call_exit" 8.24 + print "minram_done:" 8.25 + } 8.26 + next 8.27 + } 8.28 + if (/mincpu > cputype/) islinld=8 8.29 + if (islinld==8) { 8.30 + if (/endif/) islinld=0 8.31 + if (/jbe/) $0=" ja call_exit" 8.32 + } 8.33 } # file == "linld.cpp" 8.34 if (file == "himem.cpp") { 8.35 if (/sp,bp/ || /pop bp/ || /enter/ || /leave/) next
9.1 --- a/uclibc-cross-compiler-armv4eb/receipt Fri Feb 25 17:38:01 2022 +0100 9.2 +++ b/uclibc-cross-compiler-armv4eb/receipt Fri Feb 25 18:06:36 2022 +0000 9.3 @@ -15,6 +15,13 @@ 9.4 9.5 SUGGESTED="uclibc-${PACKAGE##*-}" 9.6 9.7 +# What is the latest version available today? 9.8 +current_version() 9.9 +{ 9.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 9.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 9.12 +} 9.13 + 9.14 # Rules to gen a SliTaz package suitable for Tazpkg. 9.15 genpkg_rules() 9.16 {
10.1 --- a/uclibc-cross-compiler-armv4l/receipt Fri Feb 25 17:38:01 2022 +0100 10.2 +++ b/uclibc-cross-compiler-armv4l/receipt Fri Feb 25 18:06:36 2022 +0000 10.3 @@ -15,6 +15,13 @@ 10.4 10.5 SUGGESTED="uclibc-${PACKAGE##*-}" 10.6 10.7 +# What is the latest version available today? 10.8 +current_version() 10.9 +{ 10.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 10.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 10.12 +} 10.13 + 10.14 # Rules to gen a SliTaz package suitable for Tazpkg. 10.15 genpkg_rules() 10.16 {
11.1 --- a/uclibc-cross-compiler-armv4tl/receipt Fri Feb 25 17:38:01 2022 +0100 11.2 +++ b/uclibc-cross-compiler-armv4tl/receipt Fri Feb 25 18:06:36 2022 +0000 11.3 @@ -15,6 +15,13 @@ 11.4 11.5 SUGGESTED="uclibc-${PACKAGE##*-}" 11.6 11.7 +# What is the latest version available today? 11.8 +current_version() 11.9 +{ 11.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 11.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 11.12 +} 11.13 + 11.14 # Rules to gen a SliTaz package suitable for Tazpkg. 11.15 genpkg_rules() 11.16 {
12.1 --- a/uclibc-cross-compiler-armv5l/receipt Fri Feb 25 17:38:01 2022 +0100 12.2 +++ b/uclibc-cross-compiler-armv5l/receipt Fri Feb 25 18:06:36 2022 +0000 12.3 @@ -15,6 +15,13 @@ 12.4 12.5 SUGGESTED="uclibc-${PACKAGE##*-}" 12.6 12.7 +# What is the latest version available today? 12.8 +current_version() 12.9 +{ 12.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 12.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 12.12 +} 12.13 + 12.14 # Rules to gen a SliTaz package suitable for Tazpkg. 12.15 genpkg_rules() 12.16 {
13.1 --- a/uclibc-cross-compiler-armv6l/receipt Fri Feb 25 17:38:01 2022 +0100 13.2 +++ b/uclibc-cross-compiler-armv6l/receipt Fri Feb 25 18:06:36 2022 +0000 13.3 @@ -15,6 +15,13 @@ 13.4 13.5 SUGGESTED="uclibc-${PACKAGE##*-}" 13.6 13.7 +# What is the latest version available today? 13.8 +current_version() 13.9 +{ 13.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 13.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 13.12 +} 13.13 + 13.14 # Rules to gen a SliTaz package suitable for Tazpkg. 13.15 genpkg_rules() 13.16 {
14.1 --- a/uclibc-cross-compiler-i486/receipt Fri Feb 25 17:38:01 2022 +0100 14.2 +++ b/uclibc-cross-compiler-i486/receipt Fri Feb 25 18:06:36 2022 +0000 14.3 @@ -15,6 +15,13 @@ 14.4 14.5 SUGGESTED="uclibc-${PACKAGE##*-}" 14.6 14.7 +# What is the latest version available today? 14.8 +current_version() 14.9 +{ 14.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 14.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 14.12 +} 14.13 + 14.14 # Rules to gen a SliTaz package suitable for Tazpkg. 14.15 genpkg_rules() 14.16 {
15.1 --- a/uclibc-cross-compiler-mips/receipt Fri Feb 25 17:38:01 2022 +0100 15.2 +++ b/uclibc-cross-compiler-mips/receipt Fri Feb 25 18:06:36 2022 +0000 15.3 @@ -15,6 +15,13 @@ 15.4 15.5 SUGGESTED="uclibc-${PACKAGE##*-}" 15.6 15.7 +# What is the latest version available today? 15.8 +current_version() 15.9 +{ 15.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 15.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 15.12 +} 15.13 + 15.14 # Rules to gen a SliTaz package suitable for Tazpkg. 15.15 genpkg_rules() 15.16 {
16.1 --- a/uclibc-cross-compiler-mips64/receipt Fri Feb 25 17:38:01 2022 +0100 16.2 +++ b/uclibc-cross-compiler-mips64/receipt Fri Feb 25 18:06:36 2022 +0000 16.3 @@ -15,6 +15,13 @@ 16.4 16.5 SUGGESTED="uclibc-${PACKAGE##*-}" 16.6 16.7 +# What is the latest version available today? 16.8 +current_version() 16.9 +{ 16.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 16.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 16.12 +} 16.13 + 16.14 # Rules to gen a SliTaz package suitable for Tazpkg. 16.15 genpkg_rules() 16.16 {
17.1 --- a/uclibc-cross-compiler-mipsel/receipt Fri Feb 25 17:38:01 2022 +0100 17.2 +++ b/uclibc-cross-compiler-mipsel/receipt Fri Feb 25 18:06:36 2022 +0000 17.3 @@ -15,6 +15,13 @@ 17.4 17.5 SUGGESTED="uclibc-${PACKAGE##*-}" 17.6 17.7 +# What is the latest version available today? 17.8 +current_version() 17.9 +{ 17.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 17.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 17.12 +} 17.13 + 17.14 # Rules to gen a SliTaz package suitable for Tazpkg. 17.15 genpkg_rules() 17.16 {
18.1 --- a/uclibc-cross-compiler-powerpc/receipt Fri Feb 25 17:38:01 2022 +0100 18.2 +++ b/uclibc-cross-compiler-powerpc/receipt Fri Feb 25 18:06:36 2022 +0000 18.3 @@ -15,6 +15,13 @@ 18.4 18.5 SUGGESTED="uclibc-${PACKAGE##*-}" 18.6 18.7 +# What is the latest version available today? 18.8 +current_version() 18.9 +{ 18.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 18.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 18.12 +} 18.13 + 18.14 # Rules to gen a SliTaz package suitable for Tazpkg. 18.15 genpkg_rules() 18.16 {
19.1 --- a/uclibc-cross-compiler-sh4/receipt Fri Feb 25 17:38:01 2022 +0100 19.2 +++ b/uclibc-cross-compiler-sh4/receipt Fri Feb 25 18:06:36 2022 +0000 19.3 @@ -15,6 +15,13 @@ 19.4 19.5 SUGGESTED="uclibc-${PACKAGE##*-}" 19.6 19.7 +# What is the latest version available today? 19.8 +current_version() 19.9 +{ 19.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 19.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 19.12 +} 19.13 + 19.14 # Rules to gen a SliTaz package suitable for Tazpkg. 19.15 genpkg_rules() 19.16 {
20.1 --- a/uclibc-cross-compiler-sparc/receipt Fri Feb 25 17:38:01 2022 +0100 20.2 +++ b/uclibc-cross-compiler-sparc/receipt Fri Feb 25 18:06:36 2022 +0000 20.3 @@ -15,6 +15,13 @@ 20.4 20.5 SUGGESTED="uclibc-${PACKAGE##*-}" 20.6 20.7 +# What is the latest version available today? 20.8 +current_version() 20.9 +{ 20.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 20.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 20.12 +} 20.13 + 20.14 # Rules to gen a SliTaz package suitable for Tazpkg. 20.15 genpkg_rules() 20.16 {
21.1 --- a/uclibc-cross-compiler-x86_64/receipt Fri Feb 25 17:38:01 2022 +0100 21.2 +++ b/uclibc-cross-compiler-x86_64/receipt Fri Feb 25 18:06:36 2022 +0000 21.3 @@ -15,6 +15,13 @@ 21.4 21.5 SUGGESTED="uclibc-${PACKAGE##*-}" 21.6 21.7 +# What is the latest version available today? 21.8 +current_version() 21.9 +{ 21.10 + wget -O - https://github.com/landley/aboriginal/tags 2>/dev/null | \ 21.11 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 21.12 +} 21.13 + 21.14 # Rules to gen a SliTaz package suitable for Tazpkg. 21.15 genpkg_rules() 21.16 {