1
0

Merge branch 'master' of ssh://kuschel.at:21861/tom/kernel_dell_tom

Dieser Commit ist enthalten in:
2026-03-25 08:58:47 +01:00
Commit 66707975e6
14 geänderte Dateien mit 52721 neuen und 3091 gelöschten Zeilen
+12
Datei anzeigen
@@ -0,0 +1,12 @@
Copyright Arch Linux Contributors
Permission to use, copy, modify, and/or distribute this software for
any purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+1
Datei anzeigen
@@ -0,0 +1 @@
../LICENSE
+36 -23
Datei anzeigen
@@ -2,11 +2,13 @@
# copied from Jan Alexander Steffens (heftig) <heftig@archlinux.org> # copied from Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-tom pkgbase=linux-tom
pkgver=6.18.8.arch2 pkgver=6.19.6.arch1
pkgrel=1 pkgrel=1
pkgdesc='Linux' pkgdesc='Linux'
url='https://github.com/archlinux/linux' url='https://github.com/archlinux/linux'
arch=(x86_64) arch=(
x86_64
)
license=(GPL-2.0-only) license=(GPL-2.0-only)
makedepends=( makedepends=(
bc bc
@@ -46,21 +48,21 @@ _srctag=v${pkgver%.*}-${pkgver##*.}
source=( source=(
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
$url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig} $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
config # the main kernel config file
) )
source_x86_64=(config.x86_64)
validpgpkeys=( validpgpkeys=(
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman
83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig) 83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig)
) )
# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc b2sums=('SKIP'
sha256sums=('SKIP'
'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP') 'SKIP')
b2sums=('SKIP' b2sums_x86_64=('SKIP')
'SKIP'
# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256sums=('SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP') 'SKIP')
@@ -88,27 +90,27 @@ prepare() {
done done
echo "Setting config..." echo "Setting config..."
# cp ../config .config # cp ../config.$CARCH .config
cfgver=../../config-${pkgver%.*} cfgver=../../config-${pkgver%.*}.$CARCH
if test -f "${cfgver}" if test -f "${cfgver}"
then then
echo "${cfgver} exists." echo "${cfgver} exists."
cp "${cfgver}" .config cp "${cfgver}" .config
echo ".config now has the content of ${cfgver}" echo ".config now has the content of ${cfgver}"
else else
echo "copy original config file, ${cfgver} does not exist." echo "copy original config.$CARCH file, ${cfgver} does _not_ exist!"
cp ../config .config cp ../config.$CARCH .config
fi fi
make olddefconfig make olddefconfig
# diff -u ../config .config || : # diff -u ../config.$CARCH .config || :
# this and next line is added by me, Thomas Kuschel oe3tkt # this and next line is added by me, Thomas Kuschel oe3tkt
read -p "Press enter to continue with nconfig (former menuconfig)" read -p "Press enter to continue with nconfig (former menuconfig)"
make nconfig make nconfig
diff -u ../config .config | tee "../../config-${pkgver%.*}.patch" || : diff -u ../config.$CARCH .config | tee "../../config-${pkgver%.*}.$CARCH.patch" || :
cp .config "../../config-${pkgver%.*}" cp .config "../../config-${pkgver%.*}.$CARCH"
make -s kernelrelease > version make -s kernelrelease > version
echo "Prepared $pkgbase version $(<version)" echo "Prepared $pkgbase version $(<version)"
@@ -117,7 +119,7 @@ prepare() {
build() { build() {
cd $_srcname cd $_srcname
make all make all
make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 # make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
make htmldocs SPHINXOPTS=-QT make htmldocs SPHINXOPTS=-QT
} }
@@ -129,6 +131,7 @@ _package() {
kmod kmod
) )
optdepends=( optdepends=(
"$pkgbase-headers: headers and scripts for building modules"
'linux-firmware: firmware images needed for some devices' 'linux-firmware: firmware images needed for some devices'
'scx-scheds: to use sched-ext schedulers' 'scx-scheds: to use sched-ext schedulers'
'wireless-regdb: to set the correct wireless channels of your country' 'wireless-regdb: to set the correct wireless channels of your country'
@@ -171,24 +174,32 @@ _package-headers() {
cd $_srcname cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build" local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
local karch
case $CARCH in
x86_64) karch=x86 ;;
*) echo "Unknown CARCH $CARCH"; exit 1 ;;
esac
echo "Installing build files..." echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \ install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h localversion.* version vmlinux # tools/bpf/bpftool/vmlinux.h
install -Dt "$builddir/kernel" -m644 kernel/Makefile install -Dt "$builddir/kernel" -m644 kernel/Makefile
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile install -Dt "$builddir/arch/$karch" -m644 arch/$karch/Makefile
cp -t "$builddir" -a scripts cp -t "$builddir" -a scripts
ln -srt "$builddir" "$builddir/scripts/gdb/vmlinux-gdb.py" ln -srt "$builddir" "$builddir/scripts/gdb/vmlinux-gdb.py"
# required when STACK_VALIDATION is enabled if [[ $(scripts/config -s CONFIG_HAVE_STACK_VALIDATION) = y ]]; then
install -Dt "$builddir/tools/objtool" tools/objtool/objtool install -Dt "$builddir/tools/objtool" tools/objtool/objtool
fi
# required when DEBUG_INFO_BTF_MODULES is enabled if [[ $(scripts/config -s CONFIG_DEBUG_INFO_BTF_MODULES) = y ]]; then
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
fi
echo "Installing headers..." echo "Installing headers..."
cp -t "$builddir" -a include cp -t "$builddir" -a include
cp -t "$builddir/arch/x86" -a arch/x86/include cp -t "$builddir/arch/$karch" -a arch/$karch/include
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s install -Dt "$builddir/arch/$karch/kernel" -m644 arch/$karch/kernel/asm-offsets.s
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
@@ -208,8 +219,10 @@ _package-headers() {
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \; find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
echo "Installing Rust files..." echo "Installing Rust files..."
if [[ $(scripts/config -s CONFIG_RUST) = y ]]; then
install -Dt "$builddir/rust" -m644 rust/*.rmeta install -Dt "$builddir/rust" -m644 rust/*.rmeta
install -Dt "$builddir/rust" rust/*.so install -Dt "$builddir/rust" rust/*.so
fi
echo "Installing unstripped VDSO..." echo "Installing unstripped VDSO..."
make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install \ make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install \
@@ -218,7 +231,7 @@ _package-headers() {
echo "Removing unneeded architectures..." echo "Removing unneeded architectures..."
local arch local arch
for arch in "$builddir"/arch/*/; do for arch in "$builddir"/arch/*/; do
[[ $arch = */x86/ ]] && continue [[ $arch = */$karch/ ]] && continue
echo "Removing $(basename "$arch")" echo "Removing $(basename "$arch")"
rm -r "$arch" rm -r "$arch"
done done
+1 -1
Datei anzeigen
@@ -17,8 +17,8 @@ path = [
"*.timer", "*.timer",
"*.desktop", "*.desktop",
"*.hook", "*.hook",
"config",
".gitignore", ".gitignore",
"config.*",
] ]
SPDX-FileCopyrightText = "Arch Linux contributors" SPDX-FileCopyrightText = "Arch Linux contributors"
SPDX-License-Identifier = "0BSD" SPDX-License-Identifier = "0BSD"
Datei-Diff unterdrückt, da er zu groß ist Diff laden
Datei anzeigen
Datei-Diff unterdrückt, da er zu groß ist Diff laden
Datei-Diff unterdrückt, da er zu groß ist Diff laden
Datei-Diff unterdrückt, da er zu groß ist Diff laden
Datei-Diff unterdrückt, da er zu groß ist Diff laden
+12624
Datei anzeigen
Datei-Diff unterdrückt, da er zu groß ist Diff laden
-3
Datei anzeigen
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:278df889ffa70cece4f79b5732deddcd227b1d438737ee22f9d936017724c251
size 18451
-3
Datei anzeigen
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:144b33bd92f132dfd6ae488ac232f5faae493940235aa9521155432419863d58
size 2938626
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf95ceaac898f5792ed8ee41c7999ce3dab97c17827a3856724e304a7ca4e724
size 1684448