Skip to content

Commit 36aacbe

Browse files
committed
Fetch -rc kernels via git using qubesbuilder
Getting tarball hash is not needed anymore, qubesbuilderv2 can take care of git tag verification.
1 parent fe0d585 commit 36aacbe

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

.qubesbuilder

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ source:
1212
- url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@[email protected]
1313
signature: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@[email protected]
1414
uncompress: true
15+
## for -rc kernels, use this:
16+
# - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
17+
# git-basename: linux-@VERSION@
18+
# tag: v@VERSION@
1519
pubkeys:
1620
- kernel.org-2-key.asc
1721
- kernel.org-1-key.asc
18-
## for -rc kernels, use this:
19-
# - url: https://git.kernel.org/torvalds/t/linux-@[email protected]
20-
# uncompress: true
21-
# sha256: linux-@[email protected]
2222
# - url: https://github.com/PatrickVerner/macbook12-spi-driver/archive/2905d318d1a3ee1a227052490bf20eddef2592f9.tar.gz#/macbook12-spi-driver-2905d318d1a3ee1a227052490bf20eddef2592f9.tar.gz
2323
# uncompress: true
2424
# sha256: macbook12-spi-driver-2905d318d1a3ee1a227052490bf20eddef2592f9.tar.sha256

README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,4 @@ Building release candidate kernels
55
----------------------------------
66

77
1. Write kernel version into `version` file, for example 6.0-rc7.
8-
2. Write hash of `linux-*.tar` file (the uncompressed source tarball) into `linux-*.tar.sha256` file.
9-
3. Comment out "normal" tarball section in `.qubesbuilder` and uncomment the one for rc kernel.
10-
11-
12-
As for getting the trustworthy tarball hash, it can be via signed git tag:
13-
14-
```
15-
version=6.0-rc7
16-
git clone -n --depth=1 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -b v$version linux-rc
17-
cd linux-rc
18-
git verify-tag v$version
19-
# should be signed by Linus, you can find key in kernel.org-1-key.asc
20-
git archive --prefix=linux-$version/ v$version | sha256sum
21-
```
22-
8+
2. Comment out "normal" tarball section in `.qubesbuilder` and uncomment the one for rc kernel.

kernel.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ Provides: kernel-uname-r = %kernelrelease
120120

121121
ExclusiveArch: x86_64
122122

123+
%if %prerelease
124+
Source0: linux-%{upstream_version}.tar.gz
125+
%else
123126
Source0: linux-%{upstream_version}.tar
127+
%endif
124128
Source1: @dummy-psu@
125129
Source2: @dummy-backlight@
126130
Source3: @linux-utils@

0 commit comments

Comments
 (0)