diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 60-linux.hook | 11 | ||||
| -rw-r--r-- | 90-linux.hook | 11 | ||||
| -rw-r--r-- | 99-linux.hook | 9 | ||||
| -rw-r--r-- | PKGBUILD | 47 | ||||
| -rw-r--r-- | linux.install | 7 | ||||
| -rw-r--r-- | linux.preset | 14 |
7 files changed, 5 insertions, 106 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-next-git pkgver = 20191031.r0.g49afce6d47fe - pkgrel = 1 + pkgrel = 2 url = http://www.kernel.org/ arch = x86_64 license = GPL2 @@ -17,28 +17,18 @@ pkgbase = linux-next-git source = git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.3/arch-patches-v2/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = config - source = 60-linux.hook - source = 90-linux.hook - source = 99-linux.hook - source = linux.preset sha512sums = SKIP sha512sums = 8aac877c0dfcd6796bc217572c8b8c6473ab6b5b15b7cca0e7c0f4e7cbb7080557d32fd045e6608d8acbf98cf7c16834ed0c5de2ce9d9d5dfa0194d055642276 sha512sums = fde8546c08c6450f92bd1d327084bd81d899915674832cea754a5fb62f677a12b06428149c5beb1bd51582b174f59e2033af438deb22f4d8842e6ac9d7b496f2 - sha512sums = 6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1 - sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 - sha512sums = 8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf - sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf pkgname = linux-next-git pkgdesc = The Linux-next-git kernel and modules - install = linux.install depends = coreutils depends = kmod depends = initramfs optdepends = crda: to set the correct wireless channels of your country 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 - backup = etc/mkinitcpio.d/linux-next-git.preset pkgname = linux-next-git-headers pkgdesc = Header files and scripts for building modules for Linux-next-git kernel diff --git a/60-linux.hook b/60-linux.hook deleted file mode 100644 index 584ce35372b0..000000000000 --- a/60-linux.hook +++ /dev/null @@ -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% diff --git a/90-linux.hook b/90-linux.hook deleted file mode 100644 index fca45abe1a62..000000000000 --- a/90-linux.hook +++ /dev/null @@ -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% diff --git a/99-linux.hook b/99-linux.hook deleted file mode 100644 index 416cb9424d0d..000000000000 --- a/99-linux.hook +++ /dev/null @@ -1,9 +0,0 @@ -[Trigger] -Type = File -Operation = Remove -Target = boot/vmlinuz-%PKGBASE% - -[Action] -Description = Remove %PKGBASE% initramfs files... -When = PreTransaction -Exec = /usr/bin/rm -f /boot/initramfs-%PKGBASE%.img /boot/initramfs-%PKGBASE%-fallback.img @@ -49,7 +49,7 @@ _1k_HZ_ticks= pkgbase=linux-next-git pkgver=20191031.r0.g49afce6d47fe _srcname=linux-next -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://www.kernel.org/" license=('GPL2') @@ -63,18 +63,7 @@ _lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_lucjanver source=("git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" "${_lucjanpath}/arch-patches-v2/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch" # the main kernel config files - 'config' - # pacman hook for depmod - '60-linux.hook' - # pacman hook for initramfs regeneration - '90-linux.hook' - # pacman hook for remove initramfs - '99-linux.hook' - # standard config files for mkinitcpio ramdisk - 'linux.preset') - -_kernelname=${pkgbase#linux} -: ${_kernelname:=-next} + 'config') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -92,7 +81,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 ### Patching sources local src @@ -197,8 +186,6 @@ _package() { optdepends=('crda: to set the correct wireless channels of your country' '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') - backup=("etc/mkinitcpio.d/$pkgbase.preset") - install=linux.install cd $_srcname local kernver="$(<version)" @@ -208,7 +195,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" @@ -219,27 +205,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" - sed "$subst" ../99-linux.hook | install -Dm644 /dev/stdin \ - "$pkgdir/usr/share/libalpm/hooks/99-${pkgbase}.hook" - msg2 "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } @@ -365,8 +330,4 @@ done sha512sums=('SKIP' '8aac877c0dfcd6796bc217572c8b8c6473ab6b5b15b7cca0e7c0f4e7cbb7080557d32fd045e6608d8acbf98cf7c16834ed0c5de2ce9d9d5dfa0194d055642276' - 'fde8546c08c6450f92bd1d327084bd81d899915674832cea754a5fb62f677a12b06428149c5beb1bd51582b174f59e2033af438deb22f4d8842e6ac9d7b496f2' - '6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1' - '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' - '8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf' - '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf') + 'fde8546c08c6450f92bd1d327084bd81d899915674832cea754a5fb62f677a12b06428149c5beb1bd51582b174f59e2033af438deb22f4d8842e6ac9d7b496f2') diff --git a/linux.install b/linux.install deleted file mode 100644 index f7bdeb92e69e..000000000000 --- a/linux.install +++ /dev/null @@ -1,7 +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 -} - -# vim:set ft=sh ts=8 sts=2 sw=2 et: diff --git a/linux.preset b/linux.preset deleted file mode 100644 index 66709a8c1537..000000000000 --- a/linux.preset +++ /dev/null @@ -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" |