Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

appvm/.gitignore

@@ -1,4 +1,3 @@
 qubes_add_pendrive_script
 qubes_penctl
 qvm-open-in-dvm
-xenstore-watch

appvm/Makefile

@@ -1,14 +1,12 @@
 CC=gcc
 CFLAGS=-Wall
-all:	qubes_penctl qubes_add_pendrive_script qvm-open-in-dvm xenstore-watch
+all:	qubes_penctl qubes_add_pendrive_script qvm-open-in-dvm
 qubes_penctl: qubes_penctl.o
 	$(CC) -o qubes_penctl qubes_penctl.o -lxenstore
 qubes_add_pendrive_script: qubes_add_pendrive_script.o
 	$(CC) -o qubes_add_pendrive_script qubes_add_pendrive_script.o -lxenstore
 qvm-open-in-dvm: qvm-open-in-dvm.o
 	 $(CC) -o qvm-open-in-dvm qvm-open-in-dvm.o -lxenstore
-xenstore-watch: xenstore-watch.o
-	$(CC) -o xenstore-watch xenstore-watch.o -lxenstore
 
 clean:
 	rm -f qubes_penctl qubes_add_pendrive_script qvm-open-in-dvm xenstore-watch *.o *~

common/.gitignore

@@ -1 +1,2 @@
 meminfo-writer
+xenstore-watch

common/Makefile

@@ -1,7 +1,9 @@
 CC=gcc
 CFLAGS=-Wall -g -O3
-all:	meminfo-writer
+all:	meminfo-writer xenstore-watch
 meminfo-writer: meminfo-writer.o
 	$(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore
+xenstore-watch: xenstore-watch.o
+	$(CC) -o xenstore-watch xenstore-watch.o -lxenstore
 clean:
 	rm -f meminfo-writer *.o *~

rpm_spec/core-commonvm.spec

@@ -39,6 +39,9 @@ Requires:   fedora-release = 13
 %description
 The Qubes core files for installation inside a Qubes VM.
 
+%build
+make
+
 %pre
 
 if [ "$1" !=  1 ] ; then
@@ -63,9 +66,11 @@ cp iptables $RPM_BUILD_ROOT/etc/sysconfig/
 mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
 cp ../appvm/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 mkdir -p $RPM_BUILD_ROOT/sbin
-cp ../common/qubes_serial_login $RPM_BUILD_ROOT/sbin
+cp qubes_serial_login $RPM_BUILD_ROOT/sbin
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+cp xenstore-watch $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc
-cp ../common/serial.conf $RPM_BUILD_ROOT/var/lib/qubes/
+cp serial.conf $RPM_BUILD_ROOT/var/lib/qubes/
 
 %triggerin -- initscripts
 cp /var/lib/qubes/serial.conf /etc/init/serial.conf
@@ -164,3 +169,4 @@ rm -rf $RPM_BUILD_ROOT
 /var/lib/qubes
 /etc/yum.repos.d/qubes.repo
 /sbin/qubes_serial_login
+/usr/bin/xenstore-watch