version 3.9.2-3

Required for use TrueCrypt containers with cryptsetup.

Makefile.builder

@@ -1,3 +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

@@ -1402,7 +1402,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
@@ -5726,7 +5726,7 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
+# CONFIG_DELL_RBU is not set
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=m
@@ -6318,7 +6318,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
@@ -6335,8 +6335,9 @@ CONFIG_CRYPTO_LZO=y
 # 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

@@ -33,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}
@@ -45,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
@@ -220,7 +224,7 @@ mkdir -p %buildroot/lib/modules/%kernelrelease/weak-updates
 pushd %build_src_dir
 cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` %buildroot/lib/modules/%kernelrelease/build
 cp -a scripts %buildroot/lib/modules/%kernelrelease/build
-cp -a --parents arch/x86/include/asm %buildroot/lib/modules/%kernelrelease/build/
+cp -a --parents arch/x86/include %buildroot/lib/modules/%kernelrelease/build/
 if [ "%{build_flavor}" == "xenlinux" ]; then
     cp -a --parents arch/x86/include/mach-xen %buildroot/lib/modules/%kernelrelease/build/
 fi
@@ -245,13 +249,14 @@ 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
-touch -r %buildroot/lib/modules/%kernelrelease/build/Makefile %buildroot/lib/modules/%kernelrelease/build/include/linux/version.h
-touch -r %buildroot/lib/modules/%kernelrelease/build/.config %buildroot/lib/modules/%kernelrelease/build/include/linux/autoconf.h
 # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
 cp %buildroot/lib/modules/%kernelrelease/build/.config %buildroot/lib/modules/%kernelrelease/build/include/config/auto.conf
 
+# Make sure the Makefile and version.h have a matching timestamp so that
+# external modules can be built
+touch -r %buildroot/lib/modules/%kernelrelease/build/Makefile %buildroot/lib/modules/%kernelrelease/build/include/generated/uapi/linux/version.h
+touch -r %buildroot/lib/modules/%kernelrelease/build/.config %buildroot/lib/modules/%kernelrelease/build/include/config/auto.conf
+
 if test -s vmlinux.id; then
 cp vmlinux.id %buildroot/lib/modules/%kernelrelease/build/vmlinux.id
 else
@@ -441,7 +446,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.

rel-pvops

@@ -1 +1 @@
-1
+3