openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File kuli-suse-build of Package kuli

Index: kuli/Makefile
===================================================================
--- kuli.orig/Makefile
+++ kuli/Makefile
@@ -7,26 +7,34 @@
 %.o : %.c ; echo "	Compiling	" $<; $(CC) $(CFLAGS) -c $<
 
 CC	:= $(CROSS)gcc
-INCLUDE := -I$(PWD)/include -I$(KERNELDIR)/include
-CFLAGS	:= -Wall -Wno-missing-field-initializers -Wno-nonnull -W -D_GNU_SOURCE -m64 -fpic -ggdb $(INCLUDE)
+INCLUDE := -I$(PWD)/include -I$(KERNELDIR)/include -I$(KERNELDIR)/arch/s390/include
+CFLAGS	:= -Wno-missing-field-initializers -Wno-nonnull -D_GNU_SOURCE -m64 -fpic -ggdb $(INCLUDE) $(OPTFLAGS)
 EXELDFLAGS := -Tkuli.ld -m64 -fpic -lpthread
 LDFLAGS := -m64
 ASFLAGS  := -Wall -m64
 GCCVERSION = `gcc -dumpversion`
-GCCLIB = /usr/lib/gcc/s390x-redhat-linux/$(GCCVERSION)
-#GCCLIB = /usr/lib64/gcc/s390x-suse-linux/$(GCCVERSION)
+#GCCLIB = /usr/lib/gcc/s390x-redhat-linux/$(GCCVERSION)
+GCCLIB = /usr/lib64/gcc/s390x-suse-linux/$(GCCVERSION)
 SUBDIRS = init core drivers
 
 MAKEFLAGS+=--quiet
 
 export CC CFLAGS LDFLAGS ASFLAGS
 
-all: kuli
+all: kuli tunctl
 
 kuli: subdirs main.o
 	echo "	Linking		" $@
 	$(CC) $(EXELDFLAGS) -nostartfiles -o kuli /usr/lib64/crt1.o /usr/lib64/crti.o $(GCCLIB)/crtbeginS.o main.o init/*.o core/*.o drivers/*.o $(GCCLIB)/crtendS.o /usr/lib64/crtn.o
 
+tunctl: tunctl.o
+	echo "  Linking        " $@
+	$(CC) -o $@ $<
+
+tunctl.o: tunctl.c
+	echo "  Compiling      " $@
+	$(CC) $(OPTFLAGS) -c -o $@ $<
+
 .PHONY: clean all subdirs mrproper tags TAGS $(SUBDIRS)
 
 subdirs: $(SUBDIRS)
@@ -54,8 +62,10 @@ mrproper: clean
 	find . -name "*.i" |xargs -e rm -f	
 	rm -f TAGS tags
 
-install: kuli
-	install kuli /usr/bin
+install: kuli tunctl
+	install -D -m 755 kuli $(DESTDIR)/usr/bin/kuli
+	install -D -m 755 tunctl $(DESTDIR)/usr/bin/tunctl
 
 uninstall:
-	rm -rf /usr/bin/kuli
+	rm -rf $(DESTDIR)/usr/bin/kuli
+	rm -rf $(DESTDIR)/usr/bin/tunctl
Index: kuli/README
===================================================================
--- kuli.orig/README
+++ kuli/README
@@ -153,3 +153,13 @@ Signals:
 The kuli userspace process catches the following signals:
 SIGINT terminates the guest immediately, and takes a system dump if -s or -sysdump parameter is present.
 SIGUSR1 takes a system dump and terminates the guest. If no -s or -sysdump parameter is present, the dump file will be named kuli.dump.
+
+Console:
+Currently kuli supports only the hypervisor virtual console 'hvc'. So
+you should make sure to enable 'hvc0' in the guest system by enabling
+'hvc0' in /etc/inittab. A sample entry is
+
+# KVM hypervisor console:
+1:2345:respawn:/sbin/mingetty --noclear /dev/hvc0 linux
+
+Also make sure to uncomment or delete all other console entries.

Places

File kuli-suse-build of Package kuli

Places