5.3.8-3 (clr 5.3.7-853) Changes for new kmod and mkinitcpio hooks
This commit is contained in:
Josip Ponjavic
parent
37d888a410
commit
aa7b39afbe
6 changed files with 4 additions and 88 deletions
9
.SRCINFO
9
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = linux-clear
|
||||
pkgver = 5.3.8
|
||||
pkgrel = 2
|
||||
pkgrel = 3
|
||||
url = https://github.com/clearlinux-pkgs/linux
|
||||
arch = x86_64
|
||||
license = GPL2
|
||||
|
|
@ -18,9 +18,6 @@ pkgbase = linux-clear
|
|||
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.3.7-853
|
||||
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
|
||||
source = add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio
|
||||
source = 60-linux.hook
|
||||
source = 90-linux.hook
|
||||
source = linux.preset
|
||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||
sha256sums = 78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2
|
||||
|
|
@ -29,9 +26,6 @@ pkgbase = linux-clear
|
|||
sha256sums = SKIP
|
||||
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
|
||||
sha256sums = dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1
|
||||
sha256sums = 452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c
|
||||
sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
|
||||
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
|
||||
|
||||
pkgname = linux-clear
|
||||
pkgdesc = Clearlinux kernel and modules
|
||||
|
|
@ -43,7 +37,6 @@ pkgname = linux-clear
|
|||
optdepends = linux-firmware: firmware images needed for some devices
|
||||
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
|
||||
provides = WIREGUARD-MODULE
|
||||
backup = etc/mkinitcpio.d/linux-clear.preset
|
||||
|
||||
pkgname = linux-clear-headers
|
||||
pkgdesc = Header files and scripts for building modules for linux-clear
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
[Trigger]
|
||||
Type = File
|
||||
Operation = Install
|
||||
Operation = Upgrade
|
||||
Operation = Remove
|
||||
Target = usr/lib/modules/%KERNVER%/*
|
||||
|
||||
[Action]
|
||||
Description = Updating %PKGBASE% module dependencies...
|
||||
When = PostTransaction
|
||||
Exec = /usr/bin/depmod %KERNVER%
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[Trigger]
|
||||
Type = File
|
||||
Operation = Install
|
||||
Operation = Upgrade
|
||||
Target = usr/lib/modules/%KERNVER%/vmlinuz
|
||||
Target = usr/lib/initcpio/*
|
||||
|
||||
[Action]
|
||||
Description = Updating %PKGBASE% initcpios...
|
||||
When = PostTransaction
|
||||
Exec = /usr/bin/mkinitcpio -p %PKGBASE%
|
||||
38
PKGBUILD
38
PKGBUILD
|
|
@ -68,7 +68,7 @@ _srcname=linux-${_major}
|
|||
_clr=${_major}.7-853
|
||||
pkgbase=linux-clear
|
||||
pkgver=${_major}.${_minor}
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
arch=('x86_64')
|
||||
url="https://github.com/clearlinux-pkgs/linux"
|
||||
license=('GPL2')
|
||||
|
|
@ -82,14 +82,8 @@ source=(
|
|||
"clearlinux::git+https://github.com/clearlinux-pkgs/linux.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"
|
||||
'add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio'
|
||||
'60-linux.hook' # pacman hook for depmod
|
||||
'90-linux.hook' # pacman hook for initramfs regeneration
|
||||
'linux.preset' # standard config files for mkinitcpio ramdisk
|
||||
)
|
||||
|
||||
_kernelname=${pkgbase#linux}
|
||||
: ${_kernelname:=-clear}
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}"
|
||||
|
|
@ -105,7 +99,7 @@ prepare() {
|
|||
msg2 "Setting version..."
|
||||
scripts/setlocalversion --save-scmversion
|
||||
echo "-$pkgrel" > localversion.10-pkgrel
|
||||
echo "$_kernelname" > localversion.20-pkgname
|
||||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||
|
||||
### Add Clearlinux patches
|
||||
for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0123' | sed -n 's/.*: //p'); do
|
||||
|
|
@ -211,7 +205,6 @@ prepare() {
|
|||
|
||||
build() {
|
||||
cd ${_srcname}
|
||||
|
||||
make bzImage modules
|
||||
}
|
||||
|
||||
|
|
@ -222,7 +215,6 @@ _package() {
|
|||
'linux-firmware: firmware images needed for some devices'
|
||||
'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
|
||||
provides=('WIREGUARD-MODULE')
|
||||
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
|
||||
install=linux.install
|
||||
|
||||
cd $_srcname
|
||||
|
|
@ -234,7 +226,6 @@ _package() {
|
|||
# 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 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase"
|
||||
|
||||
# Used by mkinitcpio to name the kernel
|
||||
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
|
||||
|
|
@ -245,26 +236,6 @@ _package() {
|
|||
# remove build and source links
|
||||
rm "$modulesdir"/{source,build}
|
||||
|
||||
msg2 "Installing hooks..."
|
||||
|
||||
# sed expression for following substitutions
|
||||
local subst="
|
||||
s|%PKGBASE%|$pkgbase|g
|
||||
s|%KERNVER%|$kernver|g
|
||||
"
|
||||
|
||||
# hack to allow specifying an initially nonexisting install file
|
||||
sed "$subst" "$startdir/$install" > "$startdir/$install.pkg"
|
||||
true && install=$install.pkg
|
||||
|
||||
# fill in mkinitcpio preset and pacman hooks
|
||||
sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \
|
||||
"$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
|
||||
sed "$subst" ../60-linux.hook | install -Dm644 /dev/stdin \
|
||||
"$pkgdir/usr/share/libalpm/hooks/60-${pkgbase}.hook"
|
||||
sed "$subst" ../90-linux.hook | install -Dm644 /dev/stdin \
|
||||
"$pkgdir/usr/share/libalpm/hooks/90-${pkgbase}.hook"
|
||||
|
||||
msg2 "Fixing permissions..."
|
||||
chmod -Rc u=rwX,go=rX "$pkgdir"
|
||||
}
|
||||
|
|
@ -360,10 +331,7 @@ sha256sums=('78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2'
|
|||
'7225bd200069c7dd4fbae5cfe1c24f4f73939ea5bd213e20ac62771bdc9e7578'
|
||||
'SKIP'
|
||||
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
|
||||
'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1'
|
||||
'452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
|
||||
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
|
||||
'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1')
|
||||
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
|
|
|
|||
|
|
@ -17,10 +17,6 @@ post_install() {
|
|||
}
|
||||
|
||||
post_upgrade() {
|
||||
if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
|
||||
echo "WARNING: /boot appears to be a separate partition but is not mounted."
|
||||
fi
|
||||
|
||||
local v upgrades=(
|
||||
5.2.2-2
|
||||
5.2.9-6
|
||||
|
|
@ -32,8 +28,3 @@ post_upgrade() {
|
|||
fi
|
||||
done
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
rm -f boot/initramfs-%PKGBASE%.img
|
||||
rm -f boot/initramfs-%PKGBASE%-fallback.img
|
||||
}
|
||||
|
|
|
|||
14
linux.preset
14
linux.preset
|
|
@ -1,14 +0,0 @@
|
|||
# mkinitcpio preset file for the '%PKGBASE%' package
|
||||
|
||||
ALL_config="/etc/mkinitcpio.conf"
|
||||
ALL_kver="/boot/vmlinuz-%PKGBASE%"
|
||||
|
||||
PRESETS=('default' 'fallback')
|
||||
|
||||
#default_config="/etc/mkinitcpio.conf"
|
||||
default_image="/boot/initramfs-%PKGBASE%.img"
|
||||
#default_options=""
|
||||
|
||||
#fallback_config="/etc/mkinitcpio.conf"
|
||||
fallback_image="/boot/initramfs-%PKGBASE%-fallback.img"
|
||||
fallback_options="-S autodetect"
|
||||
Reference in a new issue