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

Switch to xz source packages

Browse Source 
kernel.org no longer provide bz2 packages.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-02 03:20:06 +01:00
parent 55e12b2859
commit 599a6f01c8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
linux-*.tar.bz2 linux-*.tar.bz2
linux-*.tar.xz
linux-*.sign linux-*.sign
kernel-*/ kernel-*/

4
Makefile
View File

@ -36,7 +36,7 @@ all: help
MIRROR := ftp.kernel.org MIRROR := ftp.kernel.org
SRC_BASEURL := http://${MIRROR}/pub/linux/kernel/v$(shell echo $(VERSION) | sed 's/^\(2\.[0-9]*\).*/\1/;s/^3\..*/3.x/') 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 SRC_FILE := linux-${VERSION}.tar.xz
ifeq ($(BUILD_FLAVOR),pvops) ifeq ($(BUILD_FLAVOR),pvops)
SIGN_FILE := linux-${VERSION}.tar.sign SIGN_FILE := linux-${VERSION}.tar.sign
else else
@ -60,7 +60,7 @@ import-keys:
verify-sources: import-keys verify-sources: import-keys
ifeq ($(BUILD_FLAVOR),pvops) ifeq ($(BUILD_FLAVOR),pvops)
@bzcat $(SRC_FILE) | gpg -q --verify $(SIGN_FILE) - 2>/dev/null @xzcat $(SRC_FILE) | gpg -q --verify $(SIGN_FILE) - 2>/dev/null
else else
# @gpg --verify $(SIGN_FILE) $(SRC_FILE) # @gpg --verify $(SIGN_FILE) $(SRC_FILE)
# The key has been compromised # The key has been compromised

4
kernel.spec
View File

@ -70,7 +70,7 @@ Conflicts: lvm2 < 2.02.33
Provides: kernel = %kernelrelease Provides: kernel = %kernelrelease
Provides: kernel-uname-r = %kernelrelease Provides: kernel-uname-r = %kernelrelease
Source0: linux-%version.tar.bz2 Source0: linux-%version.tar.xz
Source14: series-%{build_flavor}.conf Source14: series-%{build_flavor}.conf
Source16: guards Source16: guards
Source17: apply-patches Source17: apply-patches
@ -89,7 +89,7 @@ ExclusiveArch: x86_64
Qubes Dom0 kernel. Qubes Dom0 kernel.
%prep %prep
if ! [ -e %_sourcedir/linux-%version.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-%version.tar.xz ]; then
echo "The %name-%version.nosrc.rpm package does not contain the" \ echo "The %name-%version.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-%version.src.rpm." "complete sources. Please install kernel-source-%version.src.rpm."
exit 1 exit 1