Hesham/linux-hwg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5.3.6.arch1-1: removal of extramodules-ARCH

Browse Source
This commit is contained in:
Jan Alexander Steffens 2019-10-11 19:17:40 +00:00
parent 3e302bf52a
commit 63f3e95b8a
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
60-linux.hook
View File

@ -4,7 +4,6 @@ Operation = Install
Operation = Upgrade Operation = Upgrade
Operation = Remove Operation = Remove
Target = usr/lib/modules/%KERNVER%/* Target = usr/lib/modules/%KERNVER%/*
Target = usr/lib/modules/%EXTRAMODULES%/*
[Action] [Action]
Description = Updating %PKGBASE% module dependencies... Description = Updating %PKGBASE% module dependencies...

30
PKGBUILD
View File

@ -4,7 +4,7 @@
pkgbase=linux # Build stock -ARCH kernel pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name #pkgbase=linux-custom # Build kernel with a different name
_srcver=5.3.5-arch1 _srcver=5.3.6-arch1
pkgver=${_srcver//-/.} pkgver=${_srcver//-/.}
pkgrel=1 pkgrel=1
arch=(x86_64) arch=(x86_64)
@ -30,7 +30,7 @@ validpgpkeys=(
) )
sha256sums=('SKIP' sha256sums=('SKIP'
'7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423' '7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636' 'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@ -58,8 +58,8 @@ prepare() {
cp ../config .config cp ../config .config
make olddefconfig make olddefconfig
make -s kernelrelease > ../version make -s kernelrelease > version
msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
} }
build() { build() {
@ -75,11 +75,10 @@ _package() {
backup=("etc/mkinitcpio.d/$pkgbase.preset") backup=("etc/mkinitcpio.d/$pkgbase.preset")
install=linux.install install=linux.install
cd $_srcname
local kernver="$(<version)" local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver" local modulesdir="$pkgdir/usr/lib/modules/$kernver"
cd $_srcname
msg2 "Installing boot image..." msg2 "Installing boot image..."
# systemd expects to find the kernel here to allow hibernation # systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
@ -92,13 +91,6 @@ _package() {
msg2 "Installing modules..." msg2 "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" modules_install make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
# a place for external modules,
# with version file for building modules and running depmod from hook
local extramodules="extramodules$_kernelname"
local extradir="$pkgdir/usr/lib/modules/$extramodules"
install -Dt "$extradir" -m644 ../version
ln -sr "$extradir" "$modulesdir/extramodules"
# remove build and source links # remove build and source links
rm "$modulesdir"/{source,build} rm "$modulesdir"/{source,build}
@ -107,7 +99,6 @@ _package() {
local subst=" local subst="
s|%PKGBASE%|$pkgbase|g s|%PKGBASE%|$pkgbase|g
s|%KERNVER%|$kernver|g s|%KERNVER%|$kernver|g
s|%EXTRAMODULES%|$extramodules|g
" "
# hack to allow specifying an initially nonexisting install file # hack to allow specifying an initially nonexisting install file
@ -129,12 +120,12 @@ _package() {
_package-headers() { _package-headers() {
pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build" local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
cd $_srcname
msg2 "Installing build files..." msg2 "Installing build files..."
install -Dt "$builddir" -m644 Makefile .config Module.symvers System.map vmlinux install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
localversion.* version vmlinux
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/x86" -m644 arch/x86/Makefile
cp -t "$builddir" -a scripts cp -t "$builddir" -a scripts
@ -198,7 +189,7 @@ _package-headers() {
msg2 "Adding symlink..." msg2 "Adding symlink..."
mkdir -p "$pkgdir/usr/src" mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver" ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
msg2 "Fixing permissions..." msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir" chmod -Rc u=rwX,go=rX "$pkgdir"
@ -207,9 +198,8 @@ _package-headers() {
_package-docs() { _package-docs() {
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
cd $_srcname cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
msg2 "Installing documentation..." msg2 "Installing documentation..."
mkdir -p "$builddir" mkdir -p "$builddir"