summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD31
-rw-r--r--config11
3 files changed, 30 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 616f50c9f1ca..89f6134f6f56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-libre
pkgdesc = Linux Libre
- pkgver = 6.8
+ pkgver = 6.8.7
pkgrel = 1
url = https://linux-libre.fsfla.org/
arch = x86_64
@@ -19,9 +19,12 @@ pkgbase = linux-libre
makedepends = python-sphinx
makedepends = python-yaml
makedepends = texlive-latexextra
+ options = !debug
options = !strip
source = https://linux-libre.fsfla.org/pub/linux-libre/releases/6.8-gnu/linux-libre-6.8-gnu.tar.lz
source = https://linux-libre.fsfla.org/pub/linux-libre/releases/6.8-gnu/linux-libre-6.8-gnu.tar.lz.sign
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.7-gnu/patch-6.8-gnu-6.8.7-gnu.bz2
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.7-gnu/patch-6.8-gnu-6.8.7-gnu.bz2.sign
source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm
source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig
source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm
@@ -33,13 +36,15 @@ pkgbase = linux-libre
validpgpkeys = 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78
sha256sums = f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7
sha256sums = SKIP
+ sha256sums = 4cd27c89ef52256bd6efb03b4fbeaf5d0d9dc60f0ae8d7d36893a45701963036
+ sha256sums = SKIP
sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
sha256sums = SKIP
sha256sums = 6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a
sha256sums = SKIP
sha256sums = 13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74
sha256sums = SKIP
- sha256sums = 2513e5ed3d13f1ab1a1e874ec8d1cf0b995cec6779a5676b20e12498963fcf2f
+ sha256sums = 879a4a8e65790ae85ba69d73dd48d90324cdeb83449892aaf0589c0a46f52f5f
pkgname = linux-libre
pkgdesc = The Linux Libre kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 28a040cf3d9f..31afb83549f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# Contributor (Parabola): Luke R. <g4jc@openmailbox.org>
pkgbase=linux-libre
-pkgver=6.8
+pkgver=6.8.7
pkgrel=1
pkgdesc='Linux Libre'
url='https://linux-libre.fsfla.org/'
@@ -33,20 +33,23 @@ makedepends=(
python-yaml
texlive-latexextra
)
-options=('!strip')
-_srcname=linux-${pkgver}
-source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.lz"{,.sign}
+options=('!debug' '!strip')
+_srcname=linux-${pkgver%.*}
+source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/linux-libre-${pkgver%.*}-gnu.tar.lz"{,.sign}
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${pkgver%.*}-gnu-${pkgver}-gnu.bz2"{,.sign}
'https://repo.parabola.nu/other/linux-libre/logos/logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
'config')
sha256sums=('f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7'
'SKIP'
+ '4cd27c89ef52256bd6efb03b4fbeaf5d0d9dc60f0ae8d7d36893a45701963036'
+ 'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
'6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
'SKIP'
'13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
'SKIP'
- '2513e5ed3d13f1ab1a1e874ec8d1cf0b995cec6779a5676b20e12498963fcf2f')
+ '879a4a8e65790ae85ba69d73dd48d90324cdeb83449892aaf0589c0a46f52f5f')
validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
'6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P.
@@ -65,15 +68,15 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
sed -i 's|^-libre||' localversion.20-pkgname # minimize diff
- local src
- declare -n per_arch_source=source_${CARCH}
- for src in "${source[@]}" "${per_arch_source[@]}"; do
- src="${src%%::*}"
- src="${src##*/}"
- # *.zst n/a
- [[ $src = *.patch ]] || continue
- echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ local _src
+ ln -sf "patch-${pkgver%.*}-gnu-${pkgver}-gnu" "../patch-${pkgver%.*}-gnu-${pkgver}-gnu.patch"
+ for _src in "${source[@]}" "../patch-${pkgver%.*}-gnu-${pkgver}-gnu.patch"
+ do
+ _src="${_src%%::*}"
+ _src="${_src##*/}"
+ [[ $_src = *.patch ]] || continue
+ echo "Applying patch $_src..."
+ patch -Np1 < "../$_src"
done
echo "Setting config..."
diff --git a/config b/config
index 485bdf7c0709..d6912615115d 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.0-gnu Kernel Configuration
+# Linux/x86 6.8.7-gnu Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
CONFIG_CC_IS_GCC=y
@@ -470,7 +470,6 @@ CONFIG_X86_DIRECT_GBPAGES=y
CONFIG_X86_CPA_STATISTICS=y
CONFIG_X86_MEM_ENCRYPT=y
CONFIG_AMD_MEM_ENCRYPT=y
-# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
CONFIG_NUMA=y
CONFIG_AMD_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
@@ -565,6 +564,8 @@ CONFIG_CPU_IBRS_ENTRY=y
CONFIG_CPU_SRSO=y
CONFIG_SLS=y
# CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_MITIGATION_RFDS=y
+CONFIG_MITIGATION_SPECTRE_BHI=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -962,6 +963,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_FORCE is not set
CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
# CONFIG_MODULE_SIG_SHA256 is not set
# CONFIG_MODULE_SIG_SHA384 is not set
CONFIG_MODULE_SIG_SHA512=y
@@ -987,7 +989,7 @@ CONFIG_BLK_ICQ=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_INTEGRITY_T10=y
-# CONFIG_BLK_DEV_WRITE_MOUNTED is not set
+CONFIG_BLK_DEV_WRITE_MOUNTED=y
CONFIG_BLK_DEV_ZONED=y
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_THROTTLING_LOW=y
@@ -1997,7 +1999,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_6LOWPAN=m
@@ -4613,7 +4614,7 @@ CONFIG_MOXA_INTELLIO=m
CONFIG_MOXA_SMARTIO=m
CONFIG_N_HDLC=m
CONFIG_IPWIRELESS=m
-CONFIG_N_GSM=m
+# CONFIG_N_GSM is not set
CONFIG_NOZOMI=m
CONFIG_NULL_TTY=m
CONFIG_HVC_DRIVER=y