shithub: 9ferno

Download patch

ref: ae1b9c4855fee006da7e9eb2473fea64cb94724c
parent: a78a125090be64f1f52686c4a2f24f2ee653cb82
author: joe9 <joe9mail@gmail.com>
date: Wed Jul 28 12:39:42 EDT 2021

Revert "getting osinit.dis to work with the different inferno root directory"

This reverts commit c2a416869c5376a51d17cd246b187955023e349c.

--- a/os/init/mkfile	Wed Jul 28 12:39:33 2021
+++ b/os/init/mkfile	Wed Jul 28 12:39:42 2021
@@ -1,7 +1,6 @@
 <../../mkconfig
 
 OBJ=\
-	shell.dis\
 	wminit.dis\
 
 all:V:	$OBJ
--- a/os/pc64/mkfile	Wed Jul 28 12:39:33 2021
+++ b/os/pc64/mkfile	Wed Jul 28 12:39:42 2021
@@ -8,7 +8,7 @@
 
 SYSTARG=Inferno # $OSTARG
 OBJTYPE=amd64 # 386
-INSTALLDIR=$ROOT/Inferno/$OBJTYPE/	#path of directory where kernel is installed
+INSTALLDIR=$SRC/Inferno/$OBJTYPE/	#path of directory where kernel is installed
 #INSTALLDIR=/$OBJTYPE
 
 # must match mem.h
--- a/os/pc64/pc64	Wed Jul 28 12:39:33 2021
+++ b/os/pc64/pc64	Wed Jul 28 12:39:42 2021
@@ -198,6 +198,7 @@
 	/dis/lib/workdir.dis
 	/dis/sh/std.dis
 	/dis/9660srv.dis
+	/dis/bootrc
 
 bootdir
 	/$objtype/bin/paqfs
--- a/os/port/mkroot	Wed Jul 28 12:39:33 2021
+++ b/os/port/mkroot	Wed Jul 28 12:39:42 2021
@@ -5,7 +5,6 @@
 
 		conf = ARGV[1];
 		infernoroot = ENVIRON["ROOT"];
-		infernosrc = ENVIRON["SRC"];
 		init = ENVIRON["INIT"];
 		data2s = ENVIRON["DATA2S"];
 		nroot = 0;
@@ -23,9 +22,8 @@
 		dst[nroot] = $1;
 		if (NF > 1)
 			src[nroot] = infernoroot $2;
-		else if (dst[nroot] == "/osinit.dis"){
-			src[nroot] = infernosrc "/os/init/" init ".dis";
-		}
+		else if (dst[nroot] == "/osinit.dis")
+			src[nroot] = infernoroot "/os/init/" init ".dis";
 		else
 			src[nroot] = infernoroot $1;
 		for(i=0; i<nroot; i++)