tazlito diff modules/calc_sizes @ rev 417
tazlito: fix old busybox awk function: "%*x formats are not supported" (supported in current busybox 1.23.2); small fixes
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Mar 14 00:56:29 2016 +0200 (2016-03-14) |
parents | 22eaf700fab5 |
children | 37099ca8e3c1 |
line diff
1.1 --- a/modules/calc_sizes Wed Feb 24 22:02:58 2016 +0200 1.2 +++ b/modules/calc_sizes Mon Mar 14 00:56:29 2016 +0200 1.3 @@ -11,6 +11,8 @@ 1.4 # File $1/warn output: warnings about missing packages 1.5 # TODO: use 'equivalent packages' rules 1.6 1.7 +#tokens dir flavor outfile lsdir rootfs_p rootfs_u rootcd_u errfile warnfile root pkgdb loop undigest repos arr pi h2b h i b2h b p mark_deps pkg localdepend localdepends pkgs sizes depends size_u size_p boot_u boot_p num_pkgs size_packed size_unpacked size_iso s 1.8 + 1.9 BEGIN { 1.10 FS = "\t"; 1.11 K = 1024; M = K * 1024; G = M * 1024; 1.12 @@ -53,7 +55,7 @@ 1.13 pi = pkgdb "/packages.info"; 1.14 else 1.15 pi = pkgdb "/undigest/" repos[i] "/packages.info"; 1.16 - if (!system("test -e "pi)) { 1.17 + if (!system("test -e " pi)) { 1.18 ARGV[ARGC] = pi; 1.19 ARGC ++; 1.20 } 1.21 @@ -134,9 +136,9 @@ 1.22 1.23 # Check critical packages: "syslinux" and one of the packages containing "vmlinuz*" 1.24 if (! pkgs["syslinux"]) printf " * Syslinux\n" >> warnfile; 1.25 - if (! pkgs["linux"] && ! pkgs["linux-without-modules"] && \ 1.26 - ! pkgs["linux64"] && ! pkgs["linux64-without-modules"] && \ 1.27 - ! pkgs["linux-libre"] && ! pkgs["linux-libre-without-modules"] && \ 1.28 + if (! pkgs["linux"] && ! pkgs["linux-without-modules"] && 1.29 + ! pkgs["linux64"] && ! pkgs["linux64-without-modules"] && 1.30 + ! pkgs["linux-libre"] && ! pkgs["linux-libre-without-modules"] && 1.31 ! pkgs["linux-uml"]) printf " * Linux kernel\n" >> warnfile; 1.32 1.33 # Calculate unpacked and packed sizes of /boot