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-12 12:29:47 +02:00
commit 60ec92374a
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config-pvops
View File

@ -2292,23 +2292,22 @@ CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
CONFIG_IPW2100_DEBUG=y
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2200=m
CONFIG_IPW2200_MONITOR=y
CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPW2200_PROMISCUOUS=y
CONFIG_IPW2200_QOS=y
CONFIG_IPW2200_DEBUG=y
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
CONFIG_LIBIPW_DEBUG=y
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLWIFI=m
#
# Debugging Options
#
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEBUGFS=y
# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI_DEVICE_SVTOOL=y
CONFIG_IWLWIFI_LEGACY=m

6
kernel.spec
View File

@ -19,7 +19,7 @@
%define build_src_dir %my_builddir/linux-%version
%define src_install_dir /usr/src/kernels/%kernelrelease
%define kernel_build_dir %my_builddir/linux-obj
%define vm_install_dir /var/lib/qubes/vm-kernels/%version
%define vm_install_dir /var/lib/qubes/vm-kernels/%version-%rel
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes})
@ -225,7 +225,9 @@ rm -f %buildroot/lib/modules/%kernelrelease/build/scripts/*/*.o
cp -a scripts/* %buildroot/lib/modules/%kernelrelease/build/scripts/
cp -a include/* %buildroot/lib/modules/%kernelrelease/build/include
cp -a --parents arch/x86/include/generated %buildroot/lib/modules/%kernelrelease/build/
if [ "%{build_flavor}" != "xenlinux" ]; then
cp -a --parents arch/x86/include/generated %buildroot/lib/modules/%kernelrelease/build/
fi
# Make sure the Makefile and version.h have a matching timestamp so that
# external modules can be built

0
vm-initramfs/pre-pivot/50_mount_modules.sh → vm-initramfs/lib/dracut/hooks/pre-pivot/50_mount_modules.sh
View File

2
vm-initramfs/pre-udev/90_qubes_cow_setup.sh → vm-initramfs/lib/dracut/hooks/pre-udev/90_qubes_cow_setup.sh
View File

@ -20,7 +20,7 @@ if [ `blockdev --getro /dev/xvda` = 1 ] ; then
while ! [ -e /dev/xvdc ]; do sleep 0.1; done
while ! [ -e /dev/xvdc2 ]; do sleep 0.1; done
echo "0 `blockdev --getsz /dev/xvda` snapshot /dev/xvda /dev/xvdc2 P 16" | \
echo "0 `blockdev --getsz /dev/xvda` snapshot /dev/xvda /dev/xvdc2 N 16" | \
dmsetup create dmroot || { echo "Qubes: FATAL: cannot create dmroot!"; }
echo Qubes: done.
else

1
vm-initramfs/pre-pivot Symbolic link
View File

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

1
vm-initramfs/pre-udev Symbolic link
View File

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