QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-06-22 00:58:04 +02:00
commit a026343945
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -4,7 +4,8 @@
#%define _unpackaged_files_terminate_build 0 #%define _unpackaged_files_terminate_build 0
%define variant %{build_flavor}.qubes %define variant %{build_flavor}.qubes
%define rel %(cat rel-%{build_flavor}).%{variant} %define plainrel %(cat rel-%{build_flavor})
%define rel %{plainrel}.%{variant}
%define version %(cat version-%{build_flavor}) %define version %(cat version-%{build_flavor})
%define _buildshell /bin/bash %define _buildshell /bin/bash
@ -19,7 +20,7 @@
%define build_src_dir %my_builddir/linux-%version %define build_src_dir %my_builddir/linux-%version
%define src_install_dir /usr/src/kernels/%kernelrelease %define src_install_dir /usr/src/kernels/%kernelrelease
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%define vm_install_dir /var/lib/qubes/vm-kernels/%version-%rel %define vm_install_dir /var/lib/qubes/vm-kernels/%version-%{plainrel}
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes})
@ -436,7 +437,7 @@ umount /tmp/qubes-modules-%kernelrelease
rmdir /tmp/qubes-modules-%kernelrelease rmdir /tmp/qubes-modules-%kernelrelease
mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img
qubes-prefs --set default-kernel %version qubes-prefs --set default-kernel %version-%plainrel
%files qubes-vm %files qubes-vm
%defattr(-, root, root) %defattr(-, root, root)

1
vm-initramfs/pre-pivot
View File

@ -1 +0,0 @@
lib/dracut/hooks/pre-pivot

1
vm-initramfs/pre-pivot/50_mount_modules.sh Symbolic link
View File

@ -0,0 +1 @@
../lib/dracut/hooks/pre-pivot/50_mount_modules.sh

1
vm-initramfs/pre-udev
View File

@ -1 +0,0 @@
lib/dracut/hooks/pre-udev

1
vm-initramfs/pre-udev/90_qubes_cow_setup.sh Symbolic link
View File

@ -0,0 +1 @@
../lib/dracut/hooks/pre-udev/90_qubes_cow_setup.sh