- sh.s builds from sources now, but doesnt work entirely from login yet.

right now it installs into /bin/xsh for testing.

newbuild/Makefile

@@ -120,17 +120,25 @@ init : init.s
 	@rm a.out
 	@mv b.out init
 
-# build sh from sources   XXX notyet
-# sh : sh.s
+# build sh from sources
+# XXX make fixaout.py overwrite a.out instead of write b.out
+sh : sh.s
+	@echo Building sh...
+	@$(AS) sh.s
+	@../tools/fixaout.py
+	@rm a.out
+	@mv b.out sh
 
 # build a prototype filesystems
-root usr protofs : init
+# XXX shell is not quite ready for prime time.  works partially but
+# not from login.
+root usr protofs : init sh
 	@echo Building filesystems...
 	@$(TREECOPY) ../fs/root .
 	@$(TREECOPY) ../fs/new/etc root
 	@$(TREECOPY) ../fs/usr .
-	@#cp init root/etc/init
-	@#cp sh root/etc/sh    XXX notyet
+	@cp init root/etc/init
+	@cp sh root/bin/xsh
 	@touch protofs
 
 # build filesystem images
@@ -151,7 +159,7 @@ clean :
 	rm -f $(ALLSRCS) patched *.orig
 	rm -f unix usyms
 	rm -rf usr root protofs
-	rm -f init
+	rm -f init sh
 	rm -f images
 
 # clean intermediate and target files

patches/core/shorig.patch

@@ -0,0 +1,9 @@
+--- rebuilt/sh.clean	2008-05-07 18:44:47.000000000 -1000
++++ build/sh.s	2008-05-07 18:50:26.000000000 -1000
+@@ -1,4 +1,6 @@
+ / sh -- command interpreter
++.. = 40014
++
+ 	mov	sp,r5
+ 	mov	r5,shellarg / save orig sp in shellarg
+ 	cmpb	8(r5),$'- / was this sh calleZd by init or loginx~