ref: c2a416869c5376a51d17cd246b187955023e349c
parent: 7be64ada77124d28f3a445ec7f749ea5de73345d
author: 9ferno <gophone2015@gmail.com>
date: Mon Jul 26 16:23:26 EDT 2021
getting osinit.dis to work with the different inferno root directory
--- a/os/init/mkfile
+++ b/os/init/mkfile
@@ -1,6 +1,7 @@
<../../mkconfig
OBJ=\
+ shell.dis\
wminit.dis\
all:V: $OBJ
--- a/os/pc64/mkfile
+++ b/os/pc64/mkfile
@@ -8,7 +8,7 @@
SYSTARG=Inferno # $OSTARG
OBJTYPE=amd64 # 386
-INSTALLDIR=$SRC/Inferno/$OBJTYPE/ #path of directory where kernel is installed
+INSTALLDIR=$ROOT/Inferno/$OBJTYPE/ #path of directory where kernel is installed
#INSTALLDIR=/$OBJTYPE
# must match mem.h
--- a/os/pc64/pc64
+++ b/os/pc64/pc64
@@ -198,7 +198,6 @@
/dis/lib/workdir.dis
/dis/sh/std.dis
/dis/9660srv.dis
- /dis/bootrc
bootdir
/$objtype/bin/paqfs
--- a/os/port/mkroot
+++ b/os/port/mkroot
@@ -5,6 +5,7 @@
conf = ARGV[1];
infernoroot = ENVIRON["ROOT"];
+ infernosrc = ENVIRON["SRC"];
init = ENVIRON["INIT"];
data2s = ENVIRON["DATA2S"];
nroot = 0;
@@ -22,8 +23,9 @@
dst[nroot] = $1;
if (NF > 1)
src[nroot] = infernoroot $2;
- else if (dst[nroot] == "/osinit.dis")
- src[nroot] = infernoroot "/os/init/" init ".dis";
+ else if (dst[nroot] == "/osinit.dis"){+ src[nroot] = infernosrc "/os/init/" init ".dis";
+ }
else
src[nroot] = infernoroot $1;
for(i=0; i<nroot; i++)