Bump to 6.8.2.arch1

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
Bump to 6.7-arch3
2024-03-27 14:34:28 +00:00 · 2024-01-19 12:13:28 +00:00 · 2023-11-21 09:11:34 +00:00 · 2023-11-21 08:55:45 +00:00 · 2023-11-21 08:55:40 +00:00 · 2023-08-07 09:28:35 +03:00
11 changed files with 2019 additions and 877 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -0,0 +1,61 @@
+pkgbase = linux
+	pkgdesc = Linux
+	pkgver = 6.8.2.arch1
+	pkgrel = 1
+	url = https://github.com/archlinux/linux
+	arch = x86_64
+	license = GPL-2.0-only
+	makedepends = bc
+	makedepends = cpio
+	makedepends = gettext
+	makedepends = libelf
+	makedepends = pahole
+	makedepends = perl
+	makedepends = python
+	makedepends = tar
+	makedepends = xz
+	makedepends = graphviz
+	makedepends = imagemagick
+	makedepends = python-sphinx
+	makedepends = python-yaml
+	makedepends = texlive-latexextra
+	options = !debug
+	options = !strip
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.2.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.2.tar.sign
+	source = https://github.com/archlinux/linux/releases/download/v6.8.2-arch1/linux-v6.8.2-arch1.patch.zst
+	source = https://github.com/archlinux/linux/releases/download/v6.8.2-arch1/linux-v6.8.2-arch1.patch.zst.sig
+	source = config
+	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
+	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
+	validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
+	sha256sums = 9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04
+	sha256sums = SKIP
+	sha256sums = 9ccb26c046bacf04777617e96cad5b33d3d048b30bb4840a3b5ac2cdf40a3aba
+	sha256sums = SKIP
+	sha256sums = ad11e6d5b3ae88d5b52c8bf4b7d6f700ac23200fb870091290cb25b744b914dc
+	b2sums = f057c2512040600fbf0df67cf9c7200aee0c06b82b3cf749be8c5685844d2662a585ce17685c7af880c0d9dbbbd81302e5a1fa41c3dbd39869123121a0e82dc2
+	b2sums = SKIP
+	b2sums = 053c6239c5b800c4e25c6369328e238f63d634ea6fab2dae629884495c2c0e5fb204bde44d6cc2e21d8dd52f9752e6887fed5ce2a2c25b8b0ff0de21a2f80344
+	b2sums = SKIP
+	b2sums = 47b48c2ad671e5a2e2f11f8b0c3f52c50118a9a88513245f07125a7481c4e19bb02053c99f5eece7c2672a63c545936cce56e301635244bf2af6e5ccf87edb24
+
+pkgname = linux
+	pkgdesc = The Linux kernel and modules
+	depends = coreutils
+	depends = initramfs
+	depends = kmod
+	optdepends = wireless-regdb: to set the correct wireless channels of your country
+	optdepends = linux-firmware: firmware images needed for some devices
+	provides = KSMBD-MODULE
+	provides = VIRTUALBOX-GUEST-MODULES
+	provides = WIREGUARD-MODULE
+	replaces = virtualbox-guest-modules-arch
+	replaces = wireguard-arch
+
+pkgname = linux-headers
+	pkgdesc = Headers and scripts for building modules for the Linux kernel
+	depends = pahole
+
+pkgname = linux-docs
+	pkgdesc = Documentation for the Linux kernel
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ build/
 pkg/
 src/
 *.tar.zst
+*.tar.xz
+*.tar.sign
+*.zst
+*.zst.sig
--- a/0001-add-acs-overrides.patch
+++ b/0001-add-acs-overrides.patch
@@ -1,19 +1,7 @@
-From c1ed6974bffaee49ae8a82838a4cf7cd8ebad36c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=A9clairevoyant?=
- <848000+eclairevoyant@users.noreply.github.com>
-Date: Sun, 1 Jan 2023 16:21:00 -0500
-Subject: [PATCH 1/2] add-acs-overrides
-
---
- .../admin-guide/kernel-parameters.txt         |   8 ++
- drivers/pci/quirks.c                          | 102 ++++++++++++++++++
- 2 files changed, 110 insertions(+)
-
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 42af9ca0127e..4f94a9f2cff0 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4145,6 +4145,14 @@
+diff --unified --recursive --text a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
+--- a/Documentation/admin-guide/kernel-parameters.txt 2023-08-26 21:41:59.900155485 +0200
+++ b/Documentation/admin-guide/kernel-parameters.txt 2023-08-26 21:42:33.030920840 +0200
+@@ -4256,6 +4256,14 @@
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
@@ -28,11 +16,10 @@ index 42af9ca0127e..4f94a9f2cff0 100644
 		noioapicquirk	[APIC] Disable all boot interrupt quirks.
 				Safety option to keep boot IRQs enabled. This
 				should never be necessary.
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 285acc4aaccc..7ad267e87c34 100644
--- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
+diff --unified --recursive --text a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+--- a/drivers/pci/quirks.c 2023-08-26 21:42:01.850200571 +0200
+++ b/drivers/pci/quirks.c 2023-08-26 21:42:33.030920840 +0200
+@@ -194,6 +194,106 @@
 }
 fs_initcall_sync(pci_apply_final_quirks);

@@ -139,7 +126,7 @@ index 285acc4aaccc..7ad267e87c34 100644
 /*
  * Decoding should be disabled for a PCI device during BAR sizing to avoid
  * conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -5002,6 +5102,8 @@ static const struct pci_dev_acs_enabled {
+@@ -5017,6 +5117,8 @@
 	{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
 	/* Wangxun nics */
 	{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
@@ -149,5 +136,3 @@ index 285acc4aaccc..7ad267e87c34 100644
 };

 --
-2.38.1
-
--- a/0002-i915-vga-arbiter.patch
+++ b/0002-i915-vga-arbiter.patch
@@ -1,23 +1,7 @@
-From c8894968896294c7ced91b86fb59ca2c1aa6e031 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=A9clairevoyant?=
- <848000+eclairevoyant@users.noreply.github.com>
-Date: Sun, 1 Jan 2023 16:21:24 -0500
-Subject: [PATCH 2/2] i915-vga-arbiter
-
---
- drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++--
- drivers/gpu/drm/i915/display/intel_display.h |  1 +
- drivers/gpu/drm/i915/display/intel_vga.c     | 31 ++++++++++++++++++++
- drivers/gpu/drm/i915/display/intel_vga.h     |  4 +++
- drivers/gpu/drm/i915/i915_params.c           |  3 ++
- drivers/gpu/drm/i915/i915_params.h           |  1 +
- 6 files changed, 52 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
-index de77054195c6..507ee4e0d1dc 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
-+++ b/drivers/gpu/drm/i915/display/intel_display.c
-@@ -8656,9 +8656,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
+diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_display_driver.c package.new/drivers/gpu/drm/i915/display/intel_display_driver.c
+--- package.orig/drivers/gpu/drm/i915/display/intel_display_driver.c	2023-09-23 10:14:39.000000000 +0100
+++ package.new/drivers/gpu/drm/i915/display/intel_display_driver.copy.c	2023-10-02 11:08:54.420518964 +0100
+@@ -203,9 +203,11 @@

 	intel_bios_init(i915);

@@ -31,8 +15,8 @@ index de77054195c6..507ee4e0d1dc 100644
 +	}

 	/* FIXME: completely on the wrong abstraction layer */
- 	intel_power_domains_init_hw(i915, false);
-@@ -8807,6 +8809,12 @@ int intel_modeset_init(struct drm_i915_private *i915)
+ 	ret = intel_power_domains_init(i915);
+@@ -364,6 +366,12 @@
 	if (ret)
 		return ret;

@@ -45,7 +29,7 @@ index de77054195c6..507ee4e0d1dc 100644
 	/* Only enable hotplug handling once the fbdev is fully set up. */
 	intel_hpd_init(i915);
 	intel_hpd_poll_disable(i915);
-@@ -8977,6 +8985,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)
+@@ -410,6 +418,7 @@
 	if (!HAS_DISPLAY(i915))
 		return;

@@ -53,11 +37,10 @@ index de77054195c6..507ee4e0d1dc 100644
 	flush_workqueue(i915->display.wq.flip);
 	flush_workqueue(i915->display.wq.modeset);

-diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
-index 884e8e67b17c..90f932db61f0 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
-+++ b/drivers/gpu/drm/i915/display/intel_display.h
-@@ -576,6 +576,7 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
+diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_display.h package.new/drivers/gpu/drm/i915/display/intel_display.h
+--- package.orig/drivers/gpu/drm/i915/display/intel_display.h 2023-08-26 21:42:01.223519415 +0200
+++ package.new/drivers/gpu/drm/i915/display/intel_display.h 2023-08-26 21:47:01.677083488 +0200
+@@ -426,6 +426,7 @@
 int vlv_get_hpll_vco(struct drm_i915_private *dev_priv);
 int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
 		      const char *name, u32 reg, int ref_freq);
@@ -65,11 +48,10 @@ index 884e8e67b17c..90f932db61f0 100644
 int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
 			   const char *name, u32 reg);
 void intel_init_display_hooks(struct drm_i915_private *dev_priv);
-diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
-index b5d058404c14..ad23732a9f21 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.c
-+++ b/drivers/gpu/drm/i915/display/intel_vga.c
-@@ -45,6 +45,36 @@ void intel_vga_disable(struct drm_i915_private *dev_priv)
+diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_vga.c package.new/drivers/gpu/drm/i915/display/intel_vga.c
+--- package.orig/drivers/gpu/drm/i915/display/intel_vga.c 2023-08-26 21:42:01.230186236 +0200
+++ package.new/drivers/gpu/drm/i915/display/intel_vga.c 2023-08-26 21:47:01.677083488 +0200
+@@ -47,6 +47,36 @@
 	intel_de_posting_read(dev_priv, vga_reg);
 }

@@ -106,7 +88,7 @@ index b5d058404c14..ad23732a9f21 100644
 void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
 {
 	i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv);
-@@ -53,6 +83,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
+@@ -55,6 +85,7 @@
 		drm_dbg_kms(&dev_priv->drm,
 			    "Something enabled VGA plane, disabling it\n");
 		intel_vga_disable(dev_priv);
@@ -114,11 +96,10 @@ index b5d058404c14..ad23732a9f21 100644
 	}
 }

-diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h
-index ba5b55b917f0..7e2af7924e99 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.h
-+++ b/drivers/gpu/drm/i915/display/intel_vga.h
-@@ -15,4 +15,8 @@ void intel_vga_redisable_power_on(struct drm_i915_private *i915);
+diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_vga.h package.new/drivers/gpu/drm/i915/display/intel_vga.h
+--- package.orig/drivers/gpu/drm/i915/display/intel_vga.h 2023-08-26 21:42:01.230186236 +0200
+++ package.new/drivers/gpu/drm/i915/display/intel_vga.h 2023-08-26 21:47:01.677083488 +0200
+@@ -15,4 +15,8 @@
 int intel_vga_register(struct drm_i915_private *i915);
 void intel_vga_unregister(struct drm_i915_private *i915);

@@ -127,11 +108,10 @@ index ba5b55b917f0..7e2af7924e99 100644
 +void intel_vga_disable_mem(struct drm_i915_private *i915);
 +
 #endif /* __INTEL_VGA_H__ */
-diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
-index d1e4d528cb17..a00cbc6591b0 100644
--- a/drivers/gpu/drm/i915/i915_params.c
-+++ b/drivers/gpu/drm/i915/i915_params.c
-@@ -154,6 +154,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400,
+diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/i915_params.c package.new/drivers/gpu/drm/i915/i915_params.c
+--- package.orig/drivers/gpu/drm/i915/i915_params.c 2023-08-26 21:42:01.243519878 +0200
+++ package.new/drivers/gpu/drm/i915/i915_params.c 2023-08-26 21:47:01.680416897 +0200
+@@ -160,6 +160,9 @@
 i915_param_named(disable_display, bool, 0400,
 	"Disable display (default: false)");

@@ -141,11 +121,10 @@ index d1e4d528cb17..a00cbc6591b0 100644
 i915_param_named(memtest, bool, 0400,
 	"Perform a read/write test of all device memory on module load (default: off)");

-diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
-index 2733cb6cfe09..f21c5b1529cc 100644
--- a/drivers/gpu/drm/i915/i915_params.h
-+++ b/drivers/gpu/drm/i915/i915_params.h
-@@ -76,6 +76,7 @@ struct drm_printer;
+diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/i915_params.h package.new/drivers/gpu/drm/i915/i915_params.h
+--- package.orig/drivers/gpu/drm/i915/i915_params.h 2023-08-26 21:42:01.243519878 +0200
+++ package.new/drivers/gpu/drm/i915/i915_params.h 2023-08-26 21:47:01.680416897 +0200
+@@ -79,6 +79,7 @@
 	param(unsigned int, lmem_size, 0, 0400) \
 	param(unsigned int, lmem_bar_size, 0, 0400) \
 	/* leave bools at the end to not create holes */ \
@@ -154,5 +133,3 @@ index 2733cb6cfe09..f21c5b1529cc 100644
 	param(bool, load_detect_test, false, 0600) \
 	param(bool, force_reset_modeset_test, false, 0600) \
 --
-2.38.1
-
--- a/147
+++ b/147
@@ -1,38 +1,66 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

 pkgbase=linux-eirene
-pkgver=6.2.12.arch1
+pkgver=6.8.2.arch1
 pkgrel=1
 pkgdesc='Linux'
-_srctag=v${pkgver%.*}-${pkgver##*.}
-url="https://github.com/archlinux/linux/commits/$_srctag"
+url='https://github.com/archlinux/linux'
 arch=(x86_64)
-license=(GPL2)
+license=(GPL-2.0-only)
 makedepends=(
-  bc libelf pahole cpio perl tar xz gettext
-  xmlto python-sphinx graphviz imagemagick texlive-latexextra
-  git
+  bc
+  cpio
+  gettext
+  libelf
+  pahole
+  perl
+  python
+  tar
+  xz
+
+  # htmldocs
+  graphviz
+  imagemagick
+  python-sphinx
+  python-yaml
+  texlive-latexextra
 )
-options=('!strip')
-_srcname=archlinux-linux
+options=(
+  !debug
+  !strip
+)
+_srcname=linux-${pkgver%.*}
+_srctag=v${pkgver%.*}-${pkgver##*.}
 source=(
-  "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag"
-  config         # the main kernel config file
+  https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
+  $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
+  config  # the main kernel config file
  0001-add-acs-overrides.patch
  0002-i915-vga-arbiter.patch
  0003-skip-pat-check.patch
 )
 validpgpkeys=(
-  'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
-  '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
-  'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
-  'C7E7849466FE2358343588377258734B41C31549'  # David Runge <dvzrv@archlinux.org>
+  ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
+  647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman
+  83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig)
 )
-sha256sums=('SKIP'
-            'c16920da137fc99ad5ec379d9be60546fc2c50fd9fbbb506d944f012d11b032d'
-            'd61f77fad364ca02b14d04ace86c149c40350db4c803e5a5045139fa7eede2cb'
-            '750c57539f17332cafe01a978a0133fc9500dbe37a411b823dad2eee66652cfc'
+# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256sums=('9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04'
+            'SKIP'
+            '9ccb26c046bacf04777617e96cad5b33d3d048b30bb4840a3b5ac2cdf40a3aba'
+            'SKIP'
+            'ad11e6d5b3ae88d5b52c8bf4b7d6f700ac23200fb870091290cb25b744b914dc'
+            'd8b5cfb04ef3de8971ac36a55b5aecea04d891203a1a6009c67ce6c98c5e2a8d'
+            'dba50d9d153787ff0dd1225ca45f0a0b2d5a46b0dccfe06200a67232cc24928e'
            'd37258e84eb1d55c6206300acfc5f12ca4f97aa2e9d9f7cd446451428f7dc1b6')
+b2sums=('f057c2512040600fbf0df67cf9c7200aee0c06b82b3cf749be8c5685844d2662a585ce17685c7af880c0d9dbbbd81302e5a1fa41c3dbd39869123121a0e82dc2'
+        'SKIP'
+        '053c6239c5b800c4e25c6369328e238f63d634ea6fab2dae629884495c2c0e5fb204bde44d6cc2e21d8dd52f9752e6887fed5ce2a2c25b8b0ff0de21a2f80344'
+        'SKIP'
+        '47b48c2ad671e5a2e2f11f8b0c3f52c50118a9a88513245f07125a7481c4e19bb02053c99f5eece7c2672a63c545936cce56e301635244bf2af6e5ccf87edb24'
+        '45f0e1b3175c3fd21f84a08c0d3f21f742635019e2add83f45bf734ee3f0a42cb6f6745c69b819c9719660bfb09fc2067652ace66315699d113de4ccc2e3b60e'
+        '8c7e6bdc3346ad823c70cc054457429a1fc8600f52e3ddc297c74e1ee45192ba450906325a105daaac872fa08e645e12ef2afeeedac90ac911ffe8f661024da5'
+        'f6652b62dc20932aff69b3f0fc8cfc30a0ac9ce6a16f4365576bfef10c0da7a2a357496a94ea54f2f6da2e33ec9a53f375fa2a8391586b3648f94e684e45cc61')

 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -42,7 +70,6 @@ prepare() {
  cd $_srcname

  echo "Setting version..."
-  scripts/setlocalversion --save-scmversion
  echo "-$pkgrel" > localversion.10-pkgrel
  echo "${pkgbase#linux}" > localversion.20-pkgname

@@ -50,6 +77,7 @@ prepare() {
  for src in "${source[@]}"; do
    src="${src%%::*}"
    src="${src##*/}"
+    src="${src%.zst}"
    [[ $src = *.patch ]] || continue
    echo "Applying patch $src..."
    patch -Np1 < "../$src"
@@ -57,6 +85,24 @@ prepare() {

  echo "Setting config..."
  cp ../config .config
+
+  sed -i 's/CONFIG_BUILD_SALT=""/CONFIG_BUILD_SALT="-eirene"/' .config
+  sed -i 's/CONFIG_DEFAULT_HOSTNAME="archlinux"/CONFIG_DEFAULT_HOSTNAME="eirene"/' .config
+
+  sed -i 's/# CONFIG_KERNEL_LZ4 is not set/CONFIG_KERNEL_LZ4=y/' .config
+  sed -i 's/CONFIG_KERNEL_ZSTD=y/# CONFIG_KERNEL_ZSTD is not set/' .config
+
+  sed -i 's/CONFIG_MODULE_COMPRESS_ZSTD=y/# CONFIG_MODULE_COMPRESS_ZSTD is not set/' .config
+  sed -i 's/CONFIG_MODULE_DECOMPRESS=y/# CONFIG_MODULE_DECOMPRESS is not set/' .config
+  sed -i 's/# CONFIG_MODULE_COMPRESS_NONE is not set/CONFIG_MODULE_COMPRESS_NONE=y/' .config
+
+  sed -i 's/CONFIG_GENERIC_CPU=y/# CONFIG_GENERIC_CPU is not set/' .config
+  sed -i 's/# CONFIG_MK8 is not set/CONFIG_MK8=y/' .config
+
+  sed -i 's/CONFIG_NR_CPUS=320/CONFIG_NR_CPUS=16/' .config
+
+  sed -i 's/# CONFIG_LIVEPATCH is not set/CONFIG_LIVEPATCH=y/' .config
+
  make olddefconfig
  diff -u ../config .config || :

@@ -67,19 +113,33 @@ prepare() {
 build() {
  cd $_srcname
  make all
+  make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
+  make htmldocs
 }

 _package() {
  pkgdesc="The $pkgdesc kernel and modules"
-  depends=(coreutils kmod initramfs)
-  optdepends=('wireless-regdb: to set the correct wireless channels of your country'
-              'linux-firmware: firmware images needed for some devices')
-  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
-  replaces=(virtualbox-guest-modules-arch wireguard-arch)
+  depends=(
+    coreutils
+    initramfs
+    kmod
+  )
+  optdepends=(
+    'wireless-regdb: to set the correct wireless channels of your country'
+    'linux-firmware: firmware images needed for some devices'
+  )
+  provides=(
+    KSMBD-MODULE
+    VIRTUALBOX-GUEST-MODULES
+    WIREGUARD-MODULE
+  )
+  replaces=(
+    virtualbox-guest-modules-arch
+    wireguard-arch
+  )

  cd $_srcname
-  local kernver="$(<version)"
-  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
+  local modulesdir="$pkgdir/usr/lib/modules/$(<version)"

  echo "Installing boot image..."
  # systemd expects to find the kernel here to allow hibernation
@@ -90,11 +150,11 @@ _package() {
  echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"

  echo "Installing modules..."
-  make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+  ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
    DEPMOD=/doesnt/exist modules_install  # Suppress depmod

-  # remove build and source links
-  rm "$modulesdir"/{source,build}
+  # remove build link
+  rm "$modulesdir"/build
 }

 _package-headers() {
@@ -106,7 +166,7 @@ _package-headers() {

  echo "Installing build files..."
  install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
-    localversion.* version vmlinux
+    localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
  install -Dt "$builddir/kernel" -m644 kernel/Makefile
  install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
  cp -t "$builddir" -a scripts
@@ -179,7 +239,30 @@ _package-headers() {
  ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }

-pkgname=("$pkgbase" "$pkgbase-headers")
+_package-docs() {
+  pkgdesc="Documentation for the $pkgdesc kernel"
+
+  cd $_srcname
+  local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+
+  echo "Installing documentation..."
+  local src dst
+  while read -rd '' src; do
+    dst="${src#Documentation/}"
+    dst="$builddir/Documentation/${dst#output/}"
+    install -Dm644 "$src" "$dst"
+  done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
+
+  echo "Adding symlink..."
+  mkdir -p "$pkgdir/usr/share/doc"
+  ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
+}
+
+pkgname=(
+  "$pkgbase"
+  "$pkgbase-headers"
+  "$pkgbase-docs"
+)
 for _p in "${pkgname[@]}"; do
  eval "package_$_p() {
    $(declare -f "_package${_p#$pkgbase}")
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # linux-eirene

-## What is this?
-
-This is a version of the Linux kernel optimized for the Lenovo Legion 7 (16ACH6H) laptop.
+A version of the Linux kernel optimized for the Lenovo Legion 7 2021 (16ACH6H) laptop.

 It contains the following patches:

 - ACS Override
+- i915 VGA Arbiter
+- PAT Check Skip
--- a/1270
+++ b/1270
--- a/linux/.SRCINFO
+++ b/linux/.SRCINFO
@@ -0,0 +1,61 @@
+pkgbase = linux
+	pkgdesc = Linux
+	pkgver = 6.8.2.arch1
+	pkgrel = 1
+	url = https://github.com/archlinux/linux
+	arch = x86_64
+	license = GPL-2.0-only
+	makedepends = bc
+	makedepends = cpio
+	makedepends = gettext
+	makedepends = libelf
+	makedepends = pahole
+	makedepends = perl
+	makedepends = python
+	makedepends = tar
+	makedepends = xz
+	makedepends = graphviz
+	makedepends = imagemagick
+	makedepends = python-sphinx
+	makedepends = python-yaml
+	makedepends = texlive-latexextra
+	options = !debug
+	options = !strip
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.2.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.2.tar.sign
+	source = https://github.com/archlinux/linux/releases/download/v6.8.2-arch1/linux-v6.8.2-arch1.patch.zst
+	source = https://github.com/archlinux/linux/releases/download/v6.8.2-arch1/linux-v6.8.2-arch1.patch.zst.sig
+	source = config
+	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
+	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
+	validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
+	sha256sums = 9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04
+	sha256sums = SKIP
+	sha256sums = 9ccb26c046bacf04777617e96cad5b33d3d048b30bb4840a3b5ac2cdf40a3aba
+	sha256sums = SKIP
+	sha256sums = ad11e6d5b3ae88d5b52c8bf4b7d6f700ac23200fb870091290cb25b744b914dc
+	b2sums = f057c2512040600fbf0df67cf9c7200aee0c06b82b3cf749be8c5685844d2662a585ce17685c7af880c0d9dbbbd81302e5a1fa41c3dbd39869123121a0e82dc2
+	b2sums = SKIP
+	b2sums = 053c6239c5b800c4e25c6369328e238f63d634ea6fab2dae629884495c2c0e5fb204bde44d6cc2e21d8dd52f9752e6887fed5ce2a2c25b8b0ff0de21a2f80344
+	b2sums = SKIP
+	b2sums = 47b48c2ad671e5a2e2f11f8b0c3f52c50118a9a88513245f07125a7481c4e19bb02053c99f5eece7c2672a63c545936cce56e301635244bf2af6e5ccf87edb24
+
+pkgname = linux
+	pkgdesc = The Linux kernel and modules
+	depends = coreutils
+	depends = initramfs
+	depends = kmod
+	optdepends = wireless-regdb: to set the correct wireless channels of your country
+	optdepends = linux-firmware: firmware images needed for some devices
+	provides = KSMBD-MODULE
+	provides = VIRTUALBOX-GUEST-MODULES
+	provides = WIREGUARD-MODULE
+	replaces = virtualbox-guest-modules-arch
+	replaces = wireguard-arch
+
+pkgname = linux-headers
+	pkgdesc = Headers and scripts for building modules for the Linux kernel
+	depends = pahole
+
+pkgname = linux-docs
+	pkgdesc = Documentation for the Linux kernel
--- a/linux/PKGBUILD
+++ b/linux/PKGBUILD
@@ -1,32 +1,57 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

 pkgbase=linux
-pkgver=6.2.12.arch1
+pkgver=6.8.2.arch1
 pkgrel=1
 pkgdesc='Linux'
-_srctag=v${pkgver%.*}-${pkgver##*.}
-url="https://github.com/archlinux/linux/commits/$_srctag"
+url='https://github.com/archlinux/linux'
 arch=(x86_64)
-license=(GPL2)
+license=(GPL-2.0-only)
 makedepends=(
-  bc libelf pahole cpio perl tar xz gettext
-  xmlto python-sphinx graphviz imagemagick texlive-latexextra
-  git
+  bc
+  cpio
+  gettext
+  libelf
+  pahole
+  perl
+  python
+  tar
+  xz
+
+  # htmldocs
+  graphviz
+  imagemagick
+  python-sphinx
+  python-yaml
+  texlive-latexextra
 )
-options=('!strip')
-_srcname=archlinux-linux
+options=(
+  !debug
+  !strip
+)
+_srcname=linux-${pkgver%.*}
+_srctag=v${pkgver%.*}-${pkgver##*.}
 source=(
-  "$_srcname::git+https://github.com/archlinux/linux?signed#tag=$_srctag"
-  config         # the main kernel config file
+  https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
+  $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
+  config  # the main kernel config file
 )
 validpgpkeys=(
-  'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
-  '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
-  'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
-  'C7E7849466FE2358343588377258734B41C31549'  # David Runge <dvzrv@archlinux.org>
+  ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
+  647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
+  83BC8889351B5DEBBB68416EB8AC08600F108CDF  # Jan Alexander Steffens (heftig)
 )
-sha256sums=('SKIP'
-            'c8b3fbb7664801bebc2d2d1fdf624524865a7817d0021c55c98523cb58dee201')
+# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256sums=('9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04'
+            'SKIP'
+            '9ccb26c046bacf04777617e96cad5b33d3d048b30bb4840a3b5ac2cdf40a3aba'
+            'SKIP'
+            'ad11e6d5b3ae88d5b52c8bf4b7d6f700ac23200fb870091290cb25b744b914dc')
+b2sums=('f057c2512040600fbf0df67cf9c7200aee0c06b82b3cf749be8c5685844d2662a585ce17685c7af880c0d9dbbbd81302e5a1fa41c3dbd39869123121a0e82dc2'
+        'SKIP'
+        '053c6239c5b800c4e25c6369328e238f63d634ea6fab2dae629884495c2c0e5fb204bde44d6cc2e21d8dd52f9752e6887fed5ce2a2c25b8b0ff0de21a2f80344'
+        'SKIP'
+        '47b48c2ad671e5a2e2f11f8b0c3f52c50118a9a88513245f07125a7481c4e19bb02053c99f5eece7c2672a63c545936cce56e301635244bf2af6e5ccf87edb24')

 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -36,7 +61,6 @@ prepare() {
  cd $_srcname

  echo "Setting version..."
-  scripts/setlocalversion --save-scmversion
  echo "-$pkgrel" > localversion.10-pkgrel
  echo "${pkgbase#linux}" > localversion.20-pkgname

@@ -44,6 +68,7 @@ prepare() {
  for src in "${source[@]}"; do
    src="${src%%::*}"
    src="${src##*/}"
+    src="${src%.zst}"
    [[ $src = *.patch ]] || continue
    echo "Applying patch $src..."
    patch -Np1 < "../$src"
@@ -60,20 +85,34 @@ prepare() {

 build() {
  cd $_srcname
-  make htmldocs all
+  make all
+  make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
+  make htmldocs
 }

 _package() {
  pkgdesc="The $pkgdesc kernel and modules"
-  depends=(coreutils kmod initramfs)
-  optdepends=('wireless-regdb: to set the correct wireless channels of your country'
-              'linux-firmware: firmware images needed for some devices')
-  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
-  replaces=(virtualbox-guest-modules-arch wireguard-arch)
+  depends=(
+    coreutils
+    initramfs
+    kmod
+  )
+  optdepends=(
+    'wireless-regdb: to set the correct wireless channels of your country'
+    'linux-firmware: firmware images needed for some devices'
+  )
+  provides=(
+    KSMBD-MODULE
+    VIRTUALBOX-GUEST-MODULES
+    WIREGUARD-MODULE
+  )
+  replaces=(
+    virtualbox-guest-modules-arch
+    wireguard-arch
+  )

  cd $_srcname
-  local kernver="$(<version)"
-  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
+  local modulesdir="$pkgdir/usr/lib/modules/$(<version)"

  echo "Installing boot image..."
  # systemd expects to find the kernel here to allow hibernation
@@ -84,11 +123,11 @@ _package() {
  echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"

  echo "Installing modules..."
-  make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+  ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
    DEPMOD=/doesnt/exist modules_install  # Suppress depmod

-  # remove build and source links
-  rm "$modulesdir"/{source,build}
+  # remove build link
+  rm "$modulesdir"/build
 }

 _package-headers() {
@@ -100,7 +139,7 @@ _package-headers() {

  echo "Installing build files..."
  install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
-    localversion.* version vmlinux
+    localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
  install -Dt "$builddir/kernel" -m644 kernel/Makefile
  install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
  cp -t "$builddir" -a scripts
@@ -192,7 +231,11 @@ _package-docs() {
  ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
 }

-pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
+pkgname=(
+  "$pkgbase"
+  "$pkgbase-headers"
+  "$pkgbase-docs"
+)
 for _p in "${pkgname[@]}"; do
  eval "package_$_p() {
    $(declare -f "_package${_p#$pkgbase}")
--- a/linux/config
+++ b/linux/config
--- a/nconfig.sh
+++ b/nconfig.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd src/archlinux-linux
-make nconfig
-cp .config ../../config
-cd ../..
Author	SHA1	Message	Date
Nikolaos Karaolidis	1df8e31d40	Bump to 6.8.2.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2024-03-27 14:34:28 +00:00
Nikolaos Karaolidis	9317935415	Bump to 6.7-arch3 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2024-01-19 12:13:28 +00:00
Nikolaos Karaolidis	0f365f3e36	Revert to 6.5.9.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-11-21 09:11:34 +00:00
Nikolaos Karaolidis	410f5eceda	Bump to 6.6.1.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-11-21 08:55:45 +00:00
Nikolaos Karaolidis	21b0fce3cc	Bump to 6.5.5.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-11-21 08:55:40 +00:00
Nikolaos Karaolidis	e4f10324b8	Bump to 6.4.8.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-08-07 09:28:35 +03:00
Nikolaos Karaolidis	bd66571d33	Bump to 6.4.3-arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-07-19 10:31:21 +03:00
Nikolaos Karaolidis	8c0e8ef0a7	Bump to 6.3.8.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-06-15 09:28:24 +03:00
Nikolaos Karaolidis	e2b09cb5e5	Update README Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-06-14 14:41:42 +03:00
Nikolaos Karaolidis	609dd2c9b9	Bump to 6.3.7.arch1 Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>	2023-06-14 13:39:02 +03:00