version 3.7.4-6

Required for use TrueCrypt containers with cryptsetup.

Makefile

@@ -108,7 +108,6 @@ srpm: get-sources $(SPECFILE)
 verrel:
 	@echo $(NAME)-$(VERSION)-$(RELEASE)
 
-
 update-repo-current:
 	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
 	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/

Makefile.builder

@@ -0,0 +1,8 @@
+ifeq ($(PACKAGE_SET),dom0)
+RPM_SPEC_FILES := kernel.spec
+else ifeq ($(PACKAGE_SET),vm)
+ifdef UPDATE_REPO
+# Include kernel-devel packages in VM repo - dummy spec file
+RPM_SPEC_FILES := kernel-devel.spec
+endif
+endif

config-pvops

@@ -1637,7 +1637,7 @@ CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
 CONFIG_HP_ILO=m
 CONFIG_APDS9802ALS=m
-# CONFIG_ISL29003 is not set
+CONFIG_ISL29003=m
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_BH1780=m
@@ -2301,7 +2301,7 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
-# CONFIG_PPTP is not set
+CONFIG_PPTP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_SLIP=m
@@ -2394,11 +2394,14 @@ CONFIG_ATH6KL_SDIO=m
 CONFIG_ATH6KL_USB=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
+CONFIG_B43_BCMA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2417,7 +2420,14 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_SDIO_OOB=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCMISCAN is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -3485,7 +3495,12 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-# CONFIG_BCMA is not set
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+# CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
@@ -4154,7 +4169,8 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
-# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX_FBCON is not set
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
@@ -4607,7 +4623,8 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4618,6 +4635,7 @@ CONFIG_USB_WUSB_CBAF=m
 #
 CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PLATFORM=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -4641,10 +4659,13 @@ CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
 CONFIG_USB_HWA_HCD=m
+CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
 CONFIG_XEN_USBDEV_FRONTEND=m
 CONFIG_XEN_USBDEV_BACKEND=m
 # CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
@@ -5091,8 +5112,8 @@ CONFIG_VIRTIO=m
 #
 # Virtio drivers
 #
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 
@@ -6139,7 +6160,7 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_TEA=m
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
@@ -6156,8 +6177,9 @@ CONFIG_CRYPTO_LZO=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m

kernel-devel.spec

@@ -0,0 +1,47 @@
+# default to pvops build
+%{!?build_flavor:%define build_flavor pvops}
+
+%if 0%{?qubes_builder}
+%define _sourcedir %(pwd)
+%endif
+
+#%define _unpackaged_files_terminate_build 0
+%define variant %{build_flavor}.qubes
+%define plainrel %(cat rel-%{build_flavor})
+%define rel %{plainrel}.%{variant}
+%define version %(cat version-%{build_flavor})
+
+Name:		kernel-devel
+Version:	%{version}
+Release:	%{rel}
+Epoch:      1000
+Summary:        Development files necessary for building kernel modules
+
+Group:          Development/Sources
+License:        GPL v2 only
+Url:            http://www.kernel.org/
+
+%description
+This package contains files necessary for building kernel modules (and
+kernel module packages) against the %build_flavor flavor of the kernel.
+
+%prep
+echo "Dummy spec, do not try to build, use kernel.spec instead"
+exit 1
+
+
+%build
+echo "Dummy spec, do not try to build, use kernel.spec instead"
+exit 1
+
+%install
+echo "Dummy spec, do not try to build, use kernel.spec instead"
+exit 1
+
+%files
+%doc
+
+
+
+%changelog
+

kernel.spec

@@ -2,6 +2,13 @@
 # Based on the Open SUSE kernel-spec & Fedora kernel-spec.
 #
 
+# default to pvops build
+%{!?build_flavor:%define build_flavor pvops}
+
+%if 0%{?qubes_builder}
+%define _sourcedir %(pwd)
+%endif
+
 #%define _unpackaged_files_terminate_build 0
 %define variant %{build_flavor}.qubes
 %define plainrel %(cat rel-%{build_flavor})
@@ -26,6 +33,10 @@
 
 %define install_vdso 1
 
+# If you want to build debuginfo package, enable also CONFIG_DEBUG_INFO in %%setup section
+# Otherwise debuginfo build is disabled by default to save disk space (it needs 2-3GB build time)
+%global debug_package %{nil}
+
 Name:           kernel
 Summary:        The Xen Kernel
 Version:        %{version}
@@ -38,7 +49,7 @@ AutoReqProv:    on
 BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  qubes-core-libs-devel
 Provides:       multiversion(kernel)
-Provides:       %name = %version-%kernelrelease
+Provides:       %name = %kernelrelease
 
 Provides:       kernel-xen-dom0
 Provides:       kernel-qubes-dom0
@@ -78,7 +89,7 @@ Source205:      patches.xen
 Source207:      patches.kernel.org
 Source300:      patches.qubes
 Source301:      u2mfn
-Source302:      vm-initramfs-pre-udev
+Source302:      vm-initramfs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 
@@ -97,6 +108,11 @@ SYMBOLS="xen-dom0 %{build_flavor}"
 # Unpack all sources and patches
 %setup -q -c -T -a 0
 
+if [ %{_sourcedir} != %{_builddir} ]; then
+    cp -r %{SOURCE301} %{_builddir}/
+    cp -r %{SOURCE302} %{_builddir}/
+fi
+
 mkdir -p %kernel_build_dir
 
 cd linux-%version
@@ -436,7 +452,7 @@ Conflicts:      sysfsutils < 2.0
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-Provides:       kernel-qubes-vm = %version-%kernelrelease
+Provides:       kernel-qubes-vm = %kernelrelease
 
 %description qubes-vm
 Qubes domU kernel.

patches.xen/pvops-3.4-0101-usb-xen-pvusb-driver-bugfix.patch

@@ -0,0 +1,13 @@
+diff -pur linux-3.4.18.orig/drivers/usb/host/xen-usbback/usbback.c linux-3.4.18/drivers/usb/host/xen-usbback/usbback.c
+--- linux-3.4.18.orig/drivers/usb/host/xen-usbback/usbback.c	2012-11-20 00:03:57.562663987 +0100
++++ linux-3.4.18/drivers/usb/host/xen-usbback/usbback.c	2012-12-09 16:16:36.395197677 +0100
+@@ -582,6 +582,8 @@
+ 		break;
+ 	}
+ 
++	urb->transfer_flags &= ~(URB_FREE_BUFFER);
++
+ 	if (req->buffer_length) {
+ 		urb->transfer_dma = pending_req->transfer_dma;
+ 		urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+diff -pur linux-3.4.18.orig/drivers/usb/host/xen-usbfront.c linux-3.4.18/drivers/usb/host/xen-usbfront.c

rel-pvops

@@ -1 +1 @@
-1
+6

series-pvops.conf

@@ -8,5 +8,6 @@ patches.xen/pvops-3.4-x86-cpa-Use-pte_attrs-instead-of-pte_flags-on-CPA-se.patch
 
 # Additional features
 patches.xen/pvops-0100-usb-xen-pvusb-driver.patch
+patches.xen/pvops-3.4-0101-usb-xen-pvusb-driver-bugfix.patch
 patches.xen/pvops-blkfront-removable-flag.patch
 patches.xen/pvops-blkfront-eject-support.patch

version-pvops

@@ -1 +1 @@
-3.7.6
+3.7.4