• Messages sorted by: [ date ][ thread ][ subject ][ author ] [ Next ]
• In reply to: Bengt Kleberg

Bengt Kleberg wrote:
>
> > I don't even get that far,
>
> OK. Do you run RedHAt Linux 5.1 or 5.2?

No, I run FreeBSD.

> Do you have the following env vars set?
> NETPBMDIR=/usr/bin
> EROS_ROOT=$HOME/eros
> EROS_CONFIG=DEFAULT
> EROS_ARCH=i486
>
> (note that EROS_ROOT may be something else :-)
>
> bengt
> (if you want to rerun anyhitng, be sure to reinstall. better safe than sorry)

Yeah, I've got everything set as it should be. I've more or less resolved the problem: it was caused by OB_MOD_CHECK no longer being set, which required a "make clean" to fix. However, to get a make clean to run, I had to do a make depend, and to get that to run I had to first do a make nodepend, and fix some stuff. Here's my current patch set...

Index: src/base/cross/bin/setboot/Makefile

--- Makefile	1999/01/14 23:56:56	1.7
+++ Makefile	1999/02/20 16:28:50

 INC=	-I$(EROS_ROOT)/cross/include $(XENV_INCLUDE)
-LIBS=	$(EROS_ROOT)/cross/lib/liberos.a
+LIBS=	$(EROS_ROOT)/cross/lib/liberos.a $(DISKLIB)

include $(EROS_SRC)/build/lib/make/makerules.mk Index: src/base/cross/bin/setboot/setboot.cxx

diff -u -r1.7 setboot.cxx
--- setboot.cxx	1998/12/30 22:20:24	1.7
+++ setboot.cxx	1999/02/20 16:28:51

 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <unistd.h>
-#include <getopt.h>
-#include <stdlib.h>
-
-#ifndef __FreeBSD__
-#include <linux/fd.h>
-#include <linux/hdreg.h>
-#include <syscall.h>
+#ifdef __FreeBSD__
+# include <stdlib.h>
+# include <sys/types.h>
+# include <libdisk.h>
+#else
+# include <getopt.h>
+# include <linux/fd.h>
+# include <linux/hdreg.h>
+# include <syscall.h>

#include <erosimg/App.hxx>
#include <erosimg/Volume.hxx>
@@ -58,13 +61,20 @@

#ifdef __FreeBSD__
void
-GetGeometry(int /* fd */, Geom& geom)
+GetGeometry(int /*fd*/, const char * /*szDevice*/, Geom& geom) {

+#if 0
+ struct disk *pDisk=Open_Disk(szDevice);
+ assert(pDisk);
+ Debug_Disk(pDisk);
+
+#else

/* This cheats, but at least it works for floppies... */

   geom.hd = 2;
-  geom.cyl = 80
+  geom.cyl = 80;
   geom.sec = 18;
   geom.start = 0;

geom.spcyl = geom.sec * geom.hd;
}
@@ -252,7 +262,7 @@

else if (garg) {
Geom geometry;

• GetGeometry(fd, geometry); + GetGeometry(fd, target, geometry); Diag::printf("Geometry c/h/s: %d/%d/%d\n", geometry.cyl, geometry.hd, geometry.sec); @@ -260,7 +270,7 @@ else { Geom geometry;
• GetGeometry(fd, geometry); + GetGeometry(fd, target, geometry);

UpdateBootTable(fd, geometry, warg); }
Index: src/base/cross/lib/erosimg/Diag.cxx

--- Diag.cxx	1998/12/23 08:54:00	1.13
+++ Diag.cxx	1999/02/20 16:28:51
@@ -70,6 +70,7 @@
     

fprintf(stderr, "%s: fatal ", App.name()); vfprintf(stderr, msg, ap);
+ perror("error");

App.SetExitValue(code);
App.Exit();
Index: src/base/sys/kerninc/Process.hxx

diff -u -r1.54 Process.hxx
--- Process.hxx	1998/12/23 09:19:42	1.54
+++ Process.hxx	1999/02/20 16:29:03

 #include <eros/ProcStats.h>
 #include <eros/machine/SaveArea.h>
 #ifdef EROS_HAVE_FPU
-#include <eros/machine/floatregs.h>
+#include <floatregs.h>
 #endif
 #ifdef EROS_HAVE_ARCH_REGS
 #include <eros/machine/archregs.h>

--- test.makeinc	1999/02/14 23:30:51	1.25
+++ test.makeinc	1999/02/20 16:29:05
@@ -47,7 +47,7 @@
 	$(EROS_ROOT)/cross/bin/sysgen -m sysgen.map test.sysvol test.sysimg
 
 tstflop: all test.sysvol
-	dd if=test.sysvol of=/dev/fd0H1440 bs=$(DDBS)
+	dd if=test.sysvol of=$(HOST_FD) bs=$(DDBS)
 	sync
 	sleep 5
 
@@ -56,7 +56,7 @@
 	$(EROS_ROOT)/cross/bin/setvol $(SETVOL_FLAGS) ztest.sysvol
 
 ztstflop: all ztest.sysvol
-	dd if=ztest.sysvol of=/dev/fd0H1440 bs=$(DDBS)
+	dd if=ztest.sysvol of=$(HOST_FD) bs=$(DDBS)
 	sync
 	sleep 5
 

Index: src/base/tests/func/constructor_test/Makefile

--- Makefile	1999/01/14 23:59:08	1.18
+++ Makefile	1999/02/20 16:29:05

EROS_SRC=../../../..
+CROSS_BUILD=yes
include $(EROS_SRC)/build/lib/make/makevars.mk

TARGETS=constructor_test
Index: src/base/tests/func/constructor_test/constructor_test.c

--- constructor_test.c	1998/12/23 09:25:23	1.11
+++ constructor_test.c	1999/02/20 16:29:05

-void
-main()
+int main()
{
uint32_t result;

@@ -94,4 +93,6 @@

}

key_destroy(KR_NEWCON);
+
+ return 0;
}
Index: src/build/lib/make/freebsd.mk

diff -u -r1.4 freebsd.mk
--- freebsd.mk	1998/12/31 20:29:12	1.4
+++ freebsd.mk	1999/02/20 16:29:09

-HOST_FD=/dev/rfd0
+HOST_FD=/dev/fd0.1440
Index: src/build/lib/make/makerules.mk

--- makerules.mk	1998/12/31 20:03:06	1.46
+++ makerules.mk	1999/02/20 16:29:10
@@ -67,7 +67,7 @@
 	@echo "Please rewrite .s file as .S file"
 
 .%.m: %.c
-	@$(GCC) $(GCCFLAGS) -E -M $< | $(SEDHACK) > $@
+	@$(GCC) $(GCCFLAGS) $(GCCWARN) -E -M $< | $(SEDHACK) > $@
 
 

.%.m: %.cxx
@@ -134,7 +134,7 @@
recursive-install:

 	@if [ -n "$(DIRS)" ]; then\
 		for i in $(DIRS); do \
-			if [ -d "$$i" ]; then\
+			if [ "$$i" \!= "doc" -a -d "$$i" ]; then\
 				$(MAKE) -C $$i $(MAKERULES) install; \
 				if [ $$? -ne 0 ]; then\
 					echo "*** RECURSIVE BUILD STOPS ***";\

--
http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
     - Indira Gandhi

[ Next ]
• In reply to: Bengt Kleberg