summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD26
2 files changed, 13 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f3cded15134..359841b37b8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-clear-current
pkgdesc = Clear Linux current
- pkgver = 5.6.6
+ pkgver = 5.7.0.rc2
pkgrel = 1
url = https://github.com/clearlinux-pkgs/linux-current
arch = x86_64
@@ -12,16 +12,12 @@ pkgbase = linux-clear-current
makedepends = libelf
makedepends = xmlto
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.sign
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.6.6.xz
- source = clearlinux-current::git+https://github.com/clearlinux-pkgs/linux-current.git#tag=5.6.5-23
+ source = https://git.kernel.org/torvalds/t/linux-5.7-rc2.tar.gz
+ source = clearlinux-current::git+https://github.com/clearlinux-pkgs/linux-current.git#tag=5.7.0.rc2-25
source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622
- sha256sums = SKIP
- sha256sums = 669e3bebb988e7f1124e6687e384304ed70139ea4a869bd4159c3df27c3d9082
+ sha256sums = 7a5369e141ec8d6c139a9357bf9a4e668bac7364e4bd96e9fafe11e462a6071a
sha256sums = SKIP
sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5
diff --git a/PKGBUILD b/PKGBUILD
index e2a501cc2eb5..b68f316996c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -58,13 +58,13 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
-_major=5.6
-_minor=6
-_rc=
-_srcname=linux-${_major}
-_clr=${_major}.5-23
+_major=5.7
+_minor=0
+_rc=2
+_srcname=linux-${_major}-rc${_rc}
+_clr=${_major}.0.rc${_rc}-25
pkgbase=linux-clear-current
-pkgver=${_major}.${_minor}
+pkgver=${_major}.${_minor}.rc${_rc}
pkgrel=1
pkgdesc='Clear Linux current'
arch=('x86_64')
@@ -74,9 +74,7 @@ makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
options=('!strip')
_gcc_more_v='20191217'
source=(
- "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
- "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign"
- "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+ "https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
"clearlinux-current::git+https://github.com/clearlinux-pkgs/linux-current.git#tag=${_clr}"
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
)
@@ -88,10 +86,6 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
prepare() {
cd ${_srcname}
- ### Add upstream patches
- echo "Add upstream patches"
- patch -Np1 -i ../patch-${pkgver}
-
### Setting version
echo "Setting version..."
scripts/setlocalversion --save-scmversion
@@ -99,7 +93,7 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
### Add Clearlinux patches
- for i in $(grep '^Patch' ${srcdir}/clearlinux-current/linux-current.spec | grep -Ev '^Patch0123' | sed -n 's/.*: //p'); do
+ for i in $(grep '^Patch' ${srcdir}/clearlinux-current/linux-current.spec | sed -n 's/.*: //p'); do
echo "Applying patch ${i}..."
patch -Np1 -i "$srcdir/clearlinux-current/${i}"
done
@@ -314,9 +308,7 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622'
- 'SKIP'
- '669e3bebb988e7f1124e6687e384304ed70139ea4a869bd4159c3df27c3d9082'
+sha256sums=('7a5369e141ec8d6c139a9357bf9a4e668bac7364e4bd96e9fafe11e462a6071a'
'SKIP'
'7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5')