diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 60-linux.hook | 1 | ||||
| -rw-r--r-- | PKGBUILD | 45 |
3 files changed, 19 insertions, 33 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-next-git - pkgver = 20191004.r0.g311ef88adfa3 - pkgrel = 3 + pkgver = 20191011.r0.g8ada228ac7ed + pkgrel = 1 url = http://www.kernel.org/ arch = x86_64 license = GPL2 @@ -24,7 +24,7 @@ pkgbase = linux-next-git sha512sums = SKIP sha512sums = 8aac877c0dfcd6796bc217572c8b8c6473ab6b5b15b7cca0e7c0f4e7cbb7080557d32fd045e6608d8acbf98cf7c16834ed0c5de2ce9d9d5dfa0194d055642276 sha512sums = d967516cfdc72e1f996a2e2c1b8a7a60f87ebc0211cd849c3ec740152a45a42da9f51b340edc225eb59a9f75b338ae3bc69eb17177fb90e29dd5c4b2073ee767 - sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a + sha512sums = 6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1 sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 sha512sums = 8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf diff --git a/60-linux.hook b/60-linux.hook index b33873c854fb..584ce35372b0 100644 --- a/60-linux.hook +++ b/60-linux.hook @@ -4,7 +4,6 @@ Operation = Install Operation = Upgrade Operation = Remove Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* [Action] Description = Updating %PKGBASE% module dependencies... @@ -47,9 +47,9 @@ _1k_HZ_ticks= ### Do not edit below this line unless you know what you're doing pkgbase=linux-next-git -pkgver=20191004.r0.g311ef88adfa3 +pkgver=20191011.r0.g8ada228ac7ed _srcname=linux-next -pkgrel=3 +pkgrel=1 arch=('x86_64') url="http://www.kernel.org/" license=('GPL2') @@ -77,12 +77,12 @@ _kernelname=${pkgbase#linux} : ${_kernelname:=-next} pkgver() { - cd "${_srcname}" + cd $_srcname git describe --long --tags | sed 's/next.//;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd ${_srcname} + cd $_srcname ### Setting version msg2 "Setting version..." @@ -106,8 +106,8 @@ prepare() { make olddefconfig ### Prepared version - make -s kernelrelease > ../version - msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" + make -s kernelrelease > version + msg2 "Prepared %s version %s" "$pkgbase" "$(<version)" ### Optionally use running kernel's config # code originally by nous; http://aur.archlinux.org/packages.php?ID=40191 @@ -182,7 +182,7 @@ prepare() { } build() { - cd ${_srcname} + cd $_srcname make bzImage modules make htmldocs @@ -197,11 +197,10 @@ _package() { backup=("etc/mkinitcpio.d/$pkgbase.preset") install=linux.install + cd $_srcname local kernver="$(<version)" local modulesdir="$pkgdir/usr/lib/modules/$kernver" - cd $_srcname - msg2 "Installing boot image..." # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 @@ -210,27 +209,18 @@ _package() { # Used by mkinitcpio to name the kernel echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" - + msg2 "Installing modules..." 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 rm "$modulesdir"/{source,build} msg2 "Installing hooks..." - # sed expression for following substitutions local subst=" s|%PKGBASE%|$pkgbase|g s|%KERNVER%|$kernver|g - s|%EXTRAMODULES%|$extramodules|g " # hack to allow specifying an initially nonexisting install file @@ -251,17 +241,16 @@ _package() { chmod -Rc u=rwX,go=rX "$pkgdir" } - _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" depends=('linux-next-git') - local builddir="$pkgdir/usr/lib/modules/$(<version)/build" - cd $_srcname + local builddir="$pkgdir/usr/lib/modules/$(<version)/build" 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/arch/x86" -m644 arch/x86/Makefile cp -t "$builddir" -a scripts @@ -325,7 +314,7 @@ _package-headers() { msg2 "Adding symlink..." mkdir -p "$pkgdir/usr/src" - ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver" + ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" msg2 "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" @@ -336,9 +325,8 @@ _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" depends=('linux-next-git') - local builddir="$pkgdir/usr/lib/modules/$(<version)/build" - cd $_srcname + local builddir="$pkgdir/usr/lib/modules/$(<version)/build" msg2 "Installing documentation..." mkdir -p "$builddir" @@ -355,7 +343,7 @@ _package-docs() { mv "$src" "$dst" rmdir -p --ignore-fail-on-non-empty "${src%/*}" done < <(find "$builddir/Documentation/output" -type f -print0) - + msg2 "Adding symlink..." mkdir -p "$pkgdir/usr/share/doc" ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase" @@ -364,7 +352,6 @@ _package-docs() { chmod -Rc u=rwX,go=rX "$pkgdir" } - pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs") for _p in "${pkgname[@]}"; do eval "package_$_p() { @@ -376,7 +363,7 @@ done sha512sums=('SKIP' '8aac877c0dfcd6796bc217572c8b8c6473ab6b5b15b7cca0e7c0f4e7cbb7080557d32fd045e6608d8acbf98cf7c16834ed0c5de2ce9d9d5dfa0194d055642276' 'd967516cfdc72e1f996a2e2c1b8a7a60f87ebc0211cd849c3ec740152a45a42da9f51b340edc225eb59a9f75b338ae3bc69eb17177fb90e29dd5c4b2073ee767' - '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' + '6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1' '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' '8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf') |