5.3.8.1-1: Changes for new kmod and mkinitcpio hooks
This commit is contained in:
Jan Alexander Steffens
parent
dcfb5e03cb
commit
88cc595d11
|
|
@ -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%
|
||||
53
PKGBUILD
53
PKGBUILD
|
|
@ -1,27 +1,22 @@
|
|||
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
# Contributor: Thomas Baechler <thomas@archlinux.org>
|
||||
|
||||
pkgbase=linux # Build stock -ARCH kernel
|
||||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcver=5.3.7-arch1
|
||||
pkgver=${_srcver//-/.}
|
||||
pkgrel=2
|
||||
arch=(x86_64)
|
||||
pkgbase=linux
|
||||
pkgver=5.3.8.1
|
||||
pkgrel=1
|
||||
_srcver=${pkgver%.*}-arch${pkgver##*.}
|
||||
url="https://git.archlinux.org/linux.git/log/?h=v$_srcver"
|
||||
arch=(x86_64)
|
||||
license=(GPL2)
|
||||
makedepends=(
|
||||
xmlto kmod inetutils bc libelf git python-sphinx python-sphinx_rtd_theme
|
||||
graphviz imagemagick
|
||||
xmlto kmod inetutils bc libelf
|
||||
python-sphinx python-sphinx_rtd_theme graphviz imagemagick
|
||||
git
|
||||
)
|
||||
options=('!strip')
|
||||
_srcname=archlinux-linux
|
||||
source=(
|
||||
"$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=v$_srcver"
|
||||
config # the main kernel config file
|
||||
60-linux.hook # pacman hook for depmod
|
||||
90-linux.hook # pacman hook for initramfs regeneration
|
||||
linux.preset # standard config files for mkinitcpio ramdisk
|
||||
)
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
|
|
@ -29,13 +24,7 @@ validpgpkeys=(
|
|||
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
|
||||
)
|
||||
sha256sums=('SKIP'
|
||||
'e6d2df92f3079c740ca2cafd7e8b34b5dd43832d292284c2dc133d47600d1f29'
|
||||
'452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
|
||||
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
|
||||
|
||||
_kernelname=${pkgbase#linux}
|
||||
: ${_kernelname:=-ARCH}
|
||||
'e6d2df92f3079c740ca2cafd7e8b34b5dd43832d292284c2dc133d47600d1f29')
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
|
|
@ -47,7 +36,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
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
|
|
@ -76,8 +65,6 @@ _package() {
|
|||
depends=(coreutils kmod initramfs)
|
||||
optdepends=('crda: to set the correct wireless channels of your country'
|
||||
'linux-firmware: firmware images needed for some devices')
|
||||
backup=("etc/mkinitcpio.d/$pkgbase.preset")
|
||||
install=linux.install
|
||||
|
||||
cd $_srcname
|
||||
local kernver="$(<version)"
|
||||
|
|
@ -87,7 +74,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"
|
||||
|
|
@ -98,25 +84,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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
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
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
rm -f boot/initramfs-%PKGBASE%.img
|
||||
rm -f boot/initramfs-%PKGBASE%-fallback.img
|
||||
}
|
||||
|
||||
# vim:set ft=sh ts=8 sts=2 sw=2 et:
|
||||
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"
|
||||
Loading…
Reference in New Issue