- add support for mkargs - remove support for cnk kernel - update clean target Reference: /n/atom/patch/applied/nixmkupd Date: Sat Mar 22 04:17:39 CET 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/mk/portmkfile Sat Mar 22 04:17:22 2014 +++ /sys/src/nix/mk/portmkfile Sat Mar 22 04:17:22 2014 @@ -107,10 +107,11 @@ mk 'CONF='$i install %.clean:V: - rm -f $AGEN $PGEN $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* + rm -f $AGEN $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* -clean:V: ${CONFLIST:%=%.clean} - rm -f *.[$OS] *.root.[cs] *.out *.m *.acid errstr.h init.h $objtype^l.h +clean:V: + rm -f *.[$OS] *.root.[cs] *.out *.m *.acid errstr.h init.h reboot.h $objtype^l.h + rm -f $AGEN ($CONFLIST)^.c [9bz]^($CONFLIST) boot^($CONFLIST)^.* nuke:V: clean rm -f ../boot/libboot.a$O *.elf *.rr --- /sys/src/nix/mk/parse Sat Mar 22 04:17:24 2014 +++ /sys/src/nix/mk/parse Sat Mar 22 04:17:25 2014 @@ -87,6 +87,8 @@ o = o "\t$CC $CFLAGS " s " " dir "/$stem1.c\n"; } } + for(i = 1; i < section["mkargs"]; i++) + o = o line["mkargs", i] "\n"; } if((!oargc || ("-mkrootrules" in oargv)) && ("rootdir" in section)){ mkrootrules(name, cname, src); @@ -438,27 +440,14 @@ s = s "{\n"; s = s "\tsplhi();\n"; s = s "\tiprint(\"rdb...not installed\\n\");\n"; - s = s "\tfor(;;);\n"; + s = s "\tfor(;;)\n"; + s = s "\t\thardhalt();\n"; s = s "}\n\n"; } if(objtype == "power"){ for(i = 1; i < section[objtype]; i++){ split(line[objtype, i], a); m[a[1]] = line[objtype, i]; - } - if(!("cnksyscall" in m)){ - s = s "void\n"; - s = s "cnksyscall(Ureg*)\n"; - s = s "{\n"; - s = s "\tpanic(\"cnkemu...not installed\\n\");\n"; - s = s "\tfor(;;);\n"; - s = s "}\n\n"; - s = s "void*\n"; - s = s "cnksysexecregs(uintptr, ulong, ulong)\n"; - s = s "{\n"; - s = s "\tpanic(\"cnkemu...not installed\\n\");\n"; - s = s "\tfor(;;);\n"; - s = s "}\n\n"; } } if("conf" in section){