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

.gitignore

@@ -1 +1,2 @@
 linux-*.tar.bz2*
+kernel-*/

Makefile

@@ -37,10 +37,14 @@ endif
 
 all: help
 
-MIRROR := kernel.inode.at
+MIRROR := ftp.kernel.org
-SRC_BASEURL := http://${MIRROR}/pub/linux/kernel/v$(shell echo $(VERSION) | sed 's/^\([0-9]*\.[0-9]*\).*/\1/')
+SRC_BASEURL := http://${MIRROR}/pub/linux/kernel/v$(shell echo $(VERSION) | sed 's/^\(2\.[0-9]*\).*/\1/;s/^3\..*/3.x/')
 SRC_FILE := linux-${VERSION}.tar.bz2
+ifeq ($(BUILD_FLAVOR),pvops)
+SIGN_FILE := linux-${VERSION}.tar.sign
+else
 SIGN_FILE := linux-${VERSION}.tar.bz2.sign
+endif
 
 URL := $(SRC_BASEURL)/$(SRC_FILE)
 URL_SIGN := $(SRC_BASEURL)/$(SIGN_FILE)
@@ -54,7 +58,11 @@ $(SRC_FILE):
 	@echo "OK."
 
 verify-sources:
+ifeq ($(BUILD_FLAVOR),pvops)
+	@bzcat $(SRC_FILE) | gpg --verify $(SIGN_FILE) -
+else
 	@gpg --verify $(SIGN_FILE) $(SRC_FILE)
+endif
 
 .PHONY: clean-sources
 clean-sources:

kernel.spec

@@ -35,6 +35,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
+BuildRequires:  qubes-core-vm-devel
 Provides:       multiversion(kernel)
 Provides:       %name = %version-%kernelrelease
 
@@ -95,11 +96,19 @@ mkdir -p %kernel_build_dir
 
 cd linux-%version
 
+if [ -r %_sourcedir/series-%{version}-%{build_flavor}.conf ]; then
+    %_sourcedir/apply-patches %_sourcedir/series-%{version}-%{build_flavor}.conf %_sourcedir $SYMBOLS
+else
     %_sourcedir/apply-patches %_sourcedir/series-%{build_flavor}.conf %_sourcedir $SYMBOLS
+fi
 
 cd %kernel_build_dir
 
+if [ -f %_sourcedir/config-%{version}-%{build_flavor} ]; then
+    cp %_sourcedir/config-%{version}-%{build_flavor} .config
+else
     cp %_sourcedir/config-%{build_flavor} .config
+fi
 
 %build_src_dir/scripts/config \
 	--set-str CONFIG_LOCALVERSION -%release.%cpu_arch \
@@ -328,7 +337,8 @@ INITRD_OPT="--mkinitrd --dracut"
 /sbin/new-kernel-pkg --package %{name}-%{kernelrelease}\
         $INITRD_OPT \
         --depmod --kernel-args="max_loop=255"\
-        --multiboot=/boot/xen.gz --banner="Qubes"\
+        --multiboot=/boot/xen.gz --mbargs="console=com1" \
+        --banner="Qubes"\
         --make-default --install %{kernelrelease}
 
 if [ -e /boot/grub/grub.conf ]; then
@@ -423,7 +433,7 @@ umount /tmp/qubes-modules-%kernelrelease
 rmdir /tmp/qubes-modules-%kernelrelease
 mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img
 
-qvm-set-default-kernel %version
+qubes-prefs --set default-kernel %version
 
 %files qubes-vm
 %defattr(-, root, root)

u2mfn/.gitignore

@@ -1,7 +1,7 @@
 .tmp_versions/
-.u2mfn.ko.cmd
+*.ko.cmd
-.u2mfn.mod.o.cmd
+*.o.cmd
-.u2mfn.o.cmd
+*.o
 Makefile.xen
 Module.symvers
 modules.order