summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Natalenko2023-12-09 22:17:00 +0100
committerOleksandr Natalenko2023-12-09 22:17:16 +0100
commitce5832fbd4492baf5999f8f09491b73f562ed0e2 (patch)
treea7c3d5b1535ea3366145be8e7b53d19f9c9d2c34
parentaa89ad18cc1eec3abc4b7265840308aaa7747ec3 (diff)
downloadaur-ce5832fbd4492baf5999f8f09491b73f562ed0e2.tar.gz
bump to v6.6.3
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD54
2 files changed, 31 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ce7f19747a7..7e1350882a53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-pf
pkgdesc = pf-kernel
- pkgver = 6.6.2
- pkgrel = 2
+ pkgver = 6.6.3
+ pkgrel = 1
url = https://pfkernel.natalenko.name
arch = x86_64
license = GPL2
@@ -15,7 +15,7 @@ pkgbase = linux-pf
makedepends = tar
makedepends = xz
options = !strip
- source = https://codeberg.org/pf-kernel/linux/archive/cfbb79a8053b59d9f9cc7371e34d70f9c11fdf3f.tar.gz
+ source = https://codeberg.org/pf-kernel/linux/archive/626a1ff2d9b2c12357dafac5d8f25faa218f3ef8.tar.gz
source = config
b2sums = SKIP
b2sums = cae5b156dbb84b3ba97d8cd5620e3b228f24fe8d9a16e78872e4dfdb537e88852f76e53ff249203c717199038b13c012fb83cda61d051dc7be73a446df0866d1
@@ -31,6 +31,7 @@ pkgname = linux-pf
optdepends = uksmd: userspace KSM helper daemon
optdepends = v4l2loopback-utils: v4l2-loopback device utilities
provides = linux-pf
+ provides = DDCCI-MODULE
provides = KSMBD-MODULE
provides = NTFS3-MODULE
provides = UKSMD-BUILTIN
diff --git a/PKGBUILD b/PKGBUILD
index 1e594d419cfb..361aa1805372 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@ _suffix=""
pkgname=(
"${pkgbase}${_suffix}" "${pkgbase}-headers${_suffix}"
)
-_rev=cfbb79a8053b59d9f9cc7371e34d70f9c11fdf3f
-pkgver=6.6.2
-pkgrel=2
+_rev=626a1ff2d9b2c12357dafac5d8f25faa218f3ef8
+pkgver=6.6.3
+pkgrel=1
pkgdesc="pf-kernel"
arch=(x86_64)
url="https://pfkernel.natalenko.name"
@@ -28,7 +28,7 @@ prepare() {
cd linux
echo "Setting config..."
- cp "../config" .config
+ cp ../config .config
if [[ -n ${KBUILD_CPUTYPE} && ${KBUILD_CPUTYPE} != GENERIC_CPU ]]; then
echo "CPU optimisation to be used: ${KBUILD_CPUTYPE}"
@@ -37,7 +37,7 @@ prepare() {
fi
make olddefconfig
- diff -u "../config" .config || :
+ diff -u ../config .config || :
make -s kernelrelease >version
echo "Prepared ${pkgdesc} version $(<version)"
@@ -58,22 +58,22 @@ _package() {
'linux-firmware: firmware images needed for some devices'
'uksmd: userspace KSM helper daemon'
'v4l2loopback-utils: v4l2-loopback device utilities')
- provides=(linux-pf KSMBD-MODULE NTFS3-MODULE UKSMD-BUILTIN V4L2LOOPBACK-MODULE VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
+ provides=(linux-pf DDCCI-MODULE KSMBD-MODULE NTFS3-MODULE UKSMD-BUILTIN V4L2LOOPBACK-MODULE VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
replaces=(virtualbox-guest-modules-arch wireguard-arch)
cd linux
- local modulesdir="${pkgdir}/usr/lib/modules/$(<version)"
+ local modulesdir="${pkgdir}"/usr/lib/modules/$(<version)
echo "Installing boot image..."
# systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
- install -Dm644 "$(make -s image_name)" "${modulesdir}/vmlinuz"
+ install -Dm644 "$(make -s image_name)" "${modulesdir}"/vmlinuz
# Used by mkinitcpio to name the kernel
- echo "${pkgbase}" | install -Dm644 /dev/stdin "${modulesdir}/pkgbase"
+ echo ${pkgbase} | install -Dm644 /dev/stdin "${modulesdir}"/pkgbase
echo "Installing modules..."
- ZSTD_CLEVEL=19 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 link
@@ -86,39 +86,39 @@ _package-headers() {
provides=(linux-pf-headers)
cd linux
- local builddir="${pkgdir}/usr/lib/modules/$(<version)/build"
+ local builddir="${pkgdir}"/usr/lib/modules/$(<version)/build
echo "Installing build files..."
install -Dt "${builddir}" -m644 .config Makefile Module.symvers System.map \
version vmlinux
- install -Dt "${builddir}/kernel" -m644 kernel/Makefile
- install -Dt "${builddir}/arch/x86" -m644 arch/x86/Makefile
+ install -Dt "${builddir}"/kernel -m644 kernel/Makefile
+ install -Dt "${builddir}"/arch/x86 -m644 arch/x86/Makefile
cp -t "${builddir}" -a scripts
# required when STACK_VALIDATION is enabled
- install -Dt "${builddir}/tools/objtool" tools/objtool/objtool
+ install -Dt "${builddir}"/tools/objtool tools/objtool/objtool
# required when DEBUG_INFO_BTF_MODULES is enabled
- 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
echo "Installing headers..."
cp -t "${builddir}" -a include
- cp -t "${builddir}/arch/x86" -a arch/x86/include
- install -Dt "${builddir}/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
+ cp -t "${builddir}"/arch/x86 -a arch/x86/include
+ install -Dt "${builddir}"/arch/x86/kernel -m644 arch/x86/kernel/asm-offsets.s
- install -Dt "${builddir}/drivers/md" -m644 drivers/md/*.h
- install -Dt "${builddir}/net/mac80211" -m644 net/mac80211/*.h
+ install -Dt "${builddir}"/drivers/md -m644 drivers/md/*.h
+ install -Dt "${builddir}"/net/mac80211 -m644 net/mac80211/*.h
# https://bugs.archlinux.org/task/13146
- install -Dt "${builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
+ install -Dt "${builddir}"/drivers/media/i2c -m644 drivers/media/i2c/msp3400-driver.h
# https://bugs.archlinux.org/task/20402
- install -Dt "${builddir}/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
- install -Dt "${builddir}/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
- install -Dt "${builddir}/drivers/media/tuners" -m644 drivers/media/tuners/*.h
+ install -Dt "${builddir}"/drivers/media/usb/dvb-usb -m644 drivers/media/usb/dvb-usb/*.h
+ install -Dt "${builddir}"/drivers/media/dvb-frontends -m644 drivers/media/dvb-frontends/*.h
+ install -Dt "${builddir}"/drivers/media/tuners -m644 drivers/media/tuners/*.h
# https://bugs.archlinux.org/task/71392
- install -Dt "${builddir}/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
+ install -Dt "${builddir}"/drivers/iio/common/hid-sensors -m644 drivers/iio/common/hid-sensors/*.h
echo "Installing Kconfig files..."
find . -name 'Kconfig*' -exec install -Dm644 {} "${builddir}/{}" \;
@@ -132,7 +132,7 @@ _package-headers() {
done
echo "Removing documentation..."
- rm -r "${builddir}/Documentation"
+ rm -r "${builddir}"/Documentation
echo "Removing broken symlinks..."
find -L "${builddir}" -type l -printf 'Removing %P\n' -delete
@@ -156,8 +156,8 @@ _package-headers() {
done < <(find "${builddir}" -type f -perm -u+x ! -name vmlinux -print0)
echo "Adding symlink..."
- mkdir -p "${pkgdir}/usr/src"
- ln -sr "${builddir}" "$pkgdir/usr/src/${pkgbase}"
+ mkdir -p "${pkgdir}"/usr/src
+ ln -sr "${builddir}" "${pkgdir}"/usr/src/${pkgbase}
}
for _p in ${pkgname[@]}; do