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

Moved vchan and u2mfn code to core.

Browse Source
This commit is contained in:
Rafal Wojtczuk 2011-03-08 12:24:47 +01:00
parent ffb0fe1d87
commit 06c0bd007c
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -28,3 +28,4 @@ clean:
(cd dom0/qmemman && make clean) (cd dom0/qmemman && make clean)
(cd common && make clean) (cd common && make clean)
make -C qrexec clean make -C qrexec clean
make -C vchan clean

26
rpm_spec/core-appvm.spec
View File

@ -61,6 +61,8 @@ fi
make clean all make clean all
make -C ../common make -C ../common
make -C ../qrexec make -C ../qrexec
make -C ../vchan
make -C ../u2mfn
%install %install
@ -98,6 +100,14 @@ cp xorg-preload-apps.conf $RPM_BUILD_ROOT/etc/X11
mkdir -p $RPM_BUILD_ROOT/home_volatile/user mkdir -p $RPM_BUILD_ROOT/home_volatile/user
chown 500:500 $RPM_BUILD_ROOT/home_volatile/user chown 500:500 $RPM_BUILD_ROOT/home_volatile/user
install -D ../vchan/libvchan.h $RPM_BUILD_ROOT/usr/include/libvchan.h
install -D ../u2mfn/u2mfnlib.h $RPM_BUILD_ROOT/usr/include/u2mfnlib.h
install -D ../u2mfn/u2mfn-kernel.h $RPM_BUILD_ROOT/usr/include/u2mfn-kernel.h
install -D ../vchan/libvchan.so $RPM_BUILD_ROOT/%{_libdir}/libvchan.so
install -D ../u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so
%triggerin -- initscripts %triggerin -- initscripts
cp /var/lib/qubes/serial.conf /etc/init/serial.conf cp /var/lib/qubes/serial.conf /etc/init/serial.conf
@ -214,3 +224,19 @@ rm -rf $RPM_BUILD_ROOT
%dir /home_volatile %dir /home_volatile
%attr(700,user,user) /home_volatile/user %attr(700,user,user) /home_volatile/user
/etc/X11/xorg-preload-apps.conf /etc/X11/xorg-preload-apps.conf
/usr/include/libvchan.h
%{_libdir}/libvchan.so
%{_libdir}/libu2mfn.so
%package devel
Summary: Include files for qubes core libraries
License: GPL v2 only
Group: Development/Sources
%description devel
%files devel
/usr/include/libvchan.h
/usr/include/u2mfnlib.h
/usr/include/u2mfn-kernel.h

7
rpm_spec/core-netvm.spec
View File

@ -51,6 +51,8 @@ fi
%build %build
make -C ../qrexec make -C ../qrexec
make -C ../vchan
make -C ../u2mfn
%install %install
@ -78,6 +80,9 @@ cp ../common/serial.conf $RPM_BUILD_ROOT/var/lib/qubes/
mkdir -p $RPM_BUILD_ROOT/var/run/qubes mkdir -p $RPM_BUILD_ROOT/var/run/qubes
mkdir -p $RPM_BUILD_ROOT/etc/xen/scripts mkdir -p $RPM_BUILD_ROOT/etc/xen/scripts
cp ../common/vif-route-qubes $RPM_BUILD_ROOT/etc/xen/scripts cp ../common/vif-route-qubes $RPM_BUILD_ROOT/etc/xen/scripts
install -D ../vchan/libvchan.so $RPM_BUILD_ROOT/%{_libdir}/libvchan.so
install -D ../u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so
%triggerin -- initscripts %triggerin -- initscripts
cp /var/lib/qubes/serial.conf /etc/init/serial.conf cp /var/lib/qubes/serial.conf /etc/init/serial.conf
@ -186,3 +191,5 @@ rm -rf $RPM_BUILD_ROOT
/sbin/qubes_serial_login /sbin/qubes_serial_login
/etc/xen/scripts/vif-route-qubes /etc/xen/scripts/vif-route-qubes
%dir /var/run/qubes %dir /var/run/qubes
%{_libdir}/libvchan.so
%{_libdir}/libu2mfn.so