Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-03-15 22:57:27 +01:00
commit 4ecaf86361
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appvm/.gitignore vendored
View File

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

4
appvm/Makefile
View File

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

1
common/.gitignore vendored
View File

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

4
common/Makefile
View File

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

0
appvm/xenstore-watch.c → common/xenstore-watch.c
View File

10
rpm_spec/core-commonvm.spec
View File

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