diff options
-rw-r--r-- | .SRCINFO | 25 | ||||
-rwxr-xr-x | 08_linux_linode | 2 | ||||
-rw-r--r-- | 98-linux-linode.hook | 11 | ||||
-rw-r--r-- | PKGBUILD | 42 | ||||
-rw-r--r-- | install | 7 | ||||
-rw-r--r-- | menu.lst | 4 | ||||
-rw-r--r-- | preset | 2 |
7 files changed, 27 insertions, 66 deletions
@@ -1,11 +1,10 @@ # Generated by mksrcinfo v8 -# Tue Oct 22 00:49:39 UTC 2019 +# Fri Nov 8 21:33:49 UTC 2019 pkgbase = linux-linode pkgdesc = Kernel for Linode servers pkgver = 5.2.21.a pkgrel = 1 url = https://github.com/yardenac/linux-linode - install = install arch = x86_64 license = GPL2 makedepends = xmlto @@ -30,7 +29,6 @@ pkgbase = linux-linode source = https://github.com/anthraxx/linux-hardened/releases/download/5.2.21.a/linux-hardened-5.2.21.a.patch.sig source = config source = 08_linux_linode - source = 98-linux-linode.hook source = 99-grub-ll.hook source = menu.lst source = preset @@ -39,31 +37,28 @@ pkgbase = linux-linode md5sums = 3d57c8cb30e455bec8f86a16e1d46208 md5sums = SKIP md5sums = e230badc3f8368c4e0bfe5d3a8807c04 - md5sums = bc30565cf444b710c252675cf65fb46e - md5sums = c52c29a8502f6c75e309208f0afab11f + md5sums = b24775bcf1d7a04c1d489af73c6e74b0 md5sums = 625481f015365febcd65aa136ee555f9 - md5sums = 15fae1e2da901b937d284890fd91cfab - md5sums = e1b5255cfbf5f8ca79b4b4568feec801 + md5sums = 8539e1756666d404e3bbc083b5d43ced + md5sums = 3d6427cc412dbc226b5d058c82ba7c66 sha256sums = 9a8ee3ff75dabffa76141c8dc7529dfbb3ca07888a3708a13f15b412268b3538 sha256sums = SKIP sha256sums = 2792d3c6131129e0200fa19dfc97c567dc40badb0cb7cb66972b96d4428b0642 sha256sums = SKIP sha256sums = b0306c22fa50ef5a4ccf00df08db6aef8624bf243f2498d861edd39cff112479 - sha256sums = 7d56a81083d1468d90ebec97a44ec44f80f8cb87bd506ed1918d6664d6309ad5 - sha256sums = 3efa91fcb4698bde0598678bbf9a4a747c011823af82704eed2c146ed7cd9734 + sha256sums = a2295cee5ae8c8d9c3efb0483e5e842f6bd9753f851c7433465b242264738546 sha256sums = 368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3 - sha256sums = a055b6005a324240b35c416d9d08fba21c5f614eefb46f244035d04bf085224f - sha256sums = 29fa2c1ea75f55a61276496507b788b1a8bde1d7c16bee4f525651db34076e46 + sha256sums = cdb351170b2b3c7b29b397bb9edff6d7c4a9c9e0ef8794b0c081ab5d5a74a9f4 + sha256sums = 33d9f913e4aed9f41bf263ff784921ab7d69597732079cbd06ff05b9adb32f44 sha512sums = 359140f413e95442d7b873a5da17edfade915baf99d71a7a02194f363a1216d0830632622c2c93aba82014d20b20680cd01f018f9c815dea4e28594a396bfb03 sha512sums = SKIP sha512sums = a6b710de2dba9de3a1138e6d3e6affbdac863952bd07e8a66cfc3bd7dee4c2d24097fc3ae7ccb1f1e1e1ee680a6442b180c09d335c0cfe6d8086c45ced06d8a9 sha512sums = SKIP sha512sums = 25beba1972f356e4e5c7e9bb917e0a8ba18288ae6c409f77dfe0a6044a943e28d3a8964a82fcc76ccbe55eab94ee0084d188ef733bb9cc5d98adc00af2c36f5a - sha512sums = 7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d - sha512sums = c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f + sha512sums = 1e901b8894743e9dcb04046a5fa58e14b19095b3295abae679dcbbf309bd79ddf1716dcd07ae8a71e7cdc9361216c0c9da12a76edb45e9388c512b07df7759e7 sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf - sha512sums = 73cb4c064d8942fddaac48158b7e77d19afc1cb61f83936f21832ba7d7266ccfd3021114252edd5cec5542096204f48cf30544fd6bffff79bc94d96fabe74f52 - sha512sums = 62870a08f000abfe8eb1f50271afdf04686af108554f7629dc5e1d7610ad14bdc9cd14d2609270b83f9edb745a520b81fa7bfb92ebcc28a146df040c895b549b + sha512sums = 2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210 + sha512sums = a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f pkgname = linux-linode diff --git a/08_linux_linode b/08_linux_linode index 62a15952092f..1909d61c0c45 100755 --- a/08_linux_linode +++ b/08_linux_linode @@ -13,7 +13,7 @@ menuentry 'Arch Linux for Linode' --class arch --class gnu-linux --class gnu --c insmod gzio $(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab) echo 'Loading Linux linux-linode ...' - linux /boot/vmlinuzll-linux-linode root=${GRUB_DEVICE} loglevel=4 rw rootflags=noatime,nodiratime,data=ordered,barrier=0,commit=5,errors=remount-ro swapaccount=0 kaslr ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} console=ttyS0,19200n8 net.ifnames=0 + linux /boot/vmlinuz-linux-linode root=${GRUB_DEVICE} loglevel=4 rw rootflags=noatime,nodiratime,data=ordered,barrier=0,commit=5,errors=remount-ro swapaccount=0 kaslr ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} console=ttyS0,19200n8 net.ifnames=0 echo 'Loading initial ramdisk ...' initrd /boot/initramfs-linux-linode.img } diff --git a/98-linux-linode.hook b/98-linux-linode.hook deleted file mode 100644 index f1bed0a50515..000000000000 --- a/98-linux-linode.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/vmlinuzll-linux-linode -Target = usr/lib/initcpio/* - -[Action] -Description = Updating linux-linode initramfs image -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p linux-linode @@ -18,34 +18,30 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar."{xz,sign} "https://github.com/anthraxx/${_patchname}/releases/download/${pkgver}/${_patchname}-${pkgver}.patch"{,.sig} 'config' '08_linux_linode' - '98-linux-linode.hook' '99-grub-ll.hook' 'menu.lst' 'preset') sha512sums=('359140f413e95442d7b873a5da17edfade915baf99d71a7a02194f363a1216d0830632622c2c93aba82014d20b20680cd01f018f9c815dea4e28594a396bfb03' 'SKIP' 'a6b710de2dba9de3a1138e6d3e6affbdac863952bd07e8a66cfc3bd7dee4c2d24097fc3ae7ccb1f1e1e1ee680a6442b180c09d335c0cfe6d8086c45ced06d8a9' 'SKIP' '25beba1972f356e4e5c7e9bb917e0a8ba18288ae6c409f77dfe0a6044a943e28d3a8964a82fcc76ccbe55eab94ee0084d188ef733bb9cc5d98adc00af2c36f5a' - '7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d' - 'c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f' + '1e901b8894743e9dcb04046a5fa58e14b19095b3295abae679dcbbf309bd79ddf1716dcd07ae8a71e7cdc9361216c0c9da12a76edb45e9388c512b07df7759e7' 'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf' - '73cb4c064d8942fddaac48158b7e77d19afc1cb61f83936f21832ba7d7266ccfd3021114252edd5cec5542096204f48cf30544fd6bffff79bc94d96fabe74f52' - '62870a08f000abfe8eb1f50271afdf04686af108554f7629dc5e1d7610ad14bdc9cd14d2609270b83f9edb745a520b81fa7bfb92ebcc28a146df040c895b549b') + '2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210' + 'a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f') sha256sums=('9a8ee3ff75dabffa76141c8dc7529dfbb3ca07888a3708a13f15b412268b3538' 'SKIP' '2792d3c6131129e0200fa19dfc97c567dc40badb0cb7cb66972b96d4428b0642' 'SKIP' 'b0306c22fa50ef5a4ccf00df08db6aef8624bf243f2498d861edd39cff112479' - '7d56a81083d1468d90ebec97a44ec44f80f8cb87bd506ed1918d6664d6309ad5' - '3efa91fcb4698bde0598678bbf9a4a747c011823af82704eed2c146ed7cd9734' + 'a2295cee5ae8c8d9c3efb0483e5e842f6bd9753f851c7433465b242264738546' '368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3' - 'a055b6005a324240b35c416d9d08fba21c5f614eefb46f244035d04bf085224f' - '29fa2c1ea75f55a61276496507b788b1a8bde1d7c16bee4f525651db34076e46') + 'cdb351170b2b3c7b29b397bb9edff6d7c4a9c9e0ef8794b0c081ab5d5a74a9f4' + '33d9f913e4aed9f41bf263ff784921ab7d69597732079cbd06ff05b9adb32f44') md5sums=('5d47ce4d32eac76a6ae02522c0d65218' 'SKIP' '3d57c8cb30e455bec8f86a16e1d46208' 'SKIP' 'e230badc3f8368c4e0bfe5d3a8807c04' - 'bc30565cf444b710c252675cf65fb46e' - 'c52c29a8502f6c75e309208f0afab11f' + 'b24775bcf1d7a04c1d489af73c6e74b0' '625481f015365febcd65aa136ee555f9' - '15fae1e2da901b937d284890fd91cfab' - 'e1b5255cfbf5f8ca79b4b4568feec801') + '8539e1756666d404e3bbc083b5d43ced' + '3d6427cc412dbc226b5d058c82ba7c66') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -56,7 +52,6 @@ depends=(coreutils linux-firmware kmod mkinitcpio grub) provides=(linux) conflicts=(grub-legacy) backup=(etc/mkinitcpio.d/${pkgname}.preset boot/grub/menu.lst) -install=install prepare() { cd "${srcdir}/${_srcname}" @@ -77,26 +72,15 @@ build() { package() { cd "${srcdir}/${_srcname}" local _kernver="$(<${srcdir}/version)" - emdir="extramodules${_kernelname}" - mkdir -p "${pkgdir}"/{usr/lib/modules/"$emdir",boot/grub} + local modulesdir="$pkgdir"/usr/lib/modules/$kernver + mkdir -p "$modulesdir" "${pkgdir}"/boot/grub make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build} - install -D -m644 "$(make -s image_name)" "${pkgdir}/boot/vmlinuzll-${pkgname}" - install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" + echo "$pkgname" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" + install -D -m644 "$(make -s image_name)" "$modulesdir/vmlinuz" install -D -m644 "${srcdir}/preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" - install -D -m644 "${srcdir}/98-linux-linode.hook" "${pkgdir}/usr/share/libalpm/hooks/98-linux-linode.hook" install -D -m644 "${srcdir}/99-grub-ll.hook" "${pkgdir}/usr/share/libalpm/hooks/99-grub-ll.hook" install -D -m755 "${srcdir}/08_linux_linode" "${pkgdir}/etc/grub.d/08_linux_linode" - install -D -m644 "${srcdir}/version" "${pkgdir}/usr/lib/modules/${emdir}/version" - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ - -i "${startdir}/install" - sed \ - -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuzll-${pkgname}\"|" \ - -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" - ln -s "../${emdir}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" sed "s/%VER%/${pkgver}-${pkgrel}/ig" "${srcdir}/menu.lst" > "${pkgdir}/boot/grub/menu.lst" chmod -Rc u=rwX,go=rX "$pkgdir" } diff --git a/install b/install deleted file mode 100644 index b75893610c4d..000000000000 --- a/install +++ /dev/null @@ -1,7 +0,0 @@ -KERNEL_NAME=-linode - -export PATH='/usr/local/sbin:/usr/local/bin:/usr/bin' - -post_remove() { - rm -f boot/initramfs-linux${KERNEL_NAME}.img -} @@ -3,12 +3,12 @@ timeout 10 title Linux-Linode %VER% root (hd0) -kernel /boot/vmlinuzll-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,errors=remount-ro swapaccount=0 kaslr +kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,errors=remount-ro swapaccount=0 kaslr initrd /boot/initramfs-linux-linode.img title Linux-Linode %VER% - rescue-ish root (hd0) -kernel /boot/vmlinuzll-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,errors=remount-ro swapaccount=0 break=postmount verbose +kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,errors=remount-ro swapaccount=0 break=postmount verbose initrd /boot/initramfs-linux-linode.img title Arch Vanilla %VER% (if installed) @@ -1,4 +1,4 @@ ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuzll-linux-linode" +ALL_kver="/boot/vmlinuz-linux-linode" PRESETS=('default') default_image="/boot/initramfs-linux-linode.img" |