From 3d137ac204e260c34142fc8f2fc1a5f9139a5d4d Mon Sep 17 00:00:00 2001 From: "tim.newsham" Date: Sat, 17 May 2008 17:53:41 +0000 Subject: [PATCH] - remove origin hack when installing sh.s and init.s - build sh.s in src/cmd/mak --- build/Makefile | 4 +++- src/cmd/mak | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build/Makefile b/build/Makefile index 1eb31d3..e423cc4 100644 --- a/build/Makefile +++ b/build/Makefile @@ -109,6 +109,7 @@ unix usyms : $(KSRCS) @mv a.out unix # build a prototype filesystems +# XXX has hack to fix our orig hack in sh.s and init.s root usr protofs : $(ALLSRCS) init.0405 sh.0405 @echo Building filesystems... @$(TREECOPY) ../fs/root . @@ -116,7 +117,8 @@ root usr protofs : $(ALLSRCS) init.0405 sh.0405 @$(TREECOPY) ../fs/usr . @$(TREECOPY) ../fs/new/usr . @$(TREECOPY) ../src usr - @cp init.s sh.s usr/src/cmd + @sed '/40014/d' < sh.s > usr/src/cmd/sh.s + @sed '/40014/d' < init.s > usr/src/cmd/init.s @cp $(KSRCS) usr/sys @cp init.0405 root/etc/init @cp sh.0405 root/bin/sh diff --git a/src/cmd/mak b/src/cmd/mak index b08d5bb..0f968a8 100755 --- a/src/cmd/mak +++ b/src/cmd/mak @@ -15,6 +15,7 @@ echo init.s; as init.s; mv a.out init echo ln.s; as ln.s; mv a.out ln echo login.s; as login.s; mv a.out login echo ls.s; as ls.s; mv a.out ls +echo sh.s; as sh.s; mv a.out sh echo db; as db?.s; mv a.out db echo ld; as ld?.s; mv a.out ld echo as2; as as2?.s; mv a.out as2 @@ -30,4 +31,4 @@ echo ... install new "as" to build dc echo You can rm ':' acct ar cat chmod chown echo You can rm cmp date df dsw dusg fstrip getty -echo You can rm init ln login ls as as2 db ld +echo You can rm init ln login ls sh as as2 db ld