From baa7c6e1e15fb598210315d5ce3a406c2fcb0c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Baltaz=C3=A1r=20Radics?= Date: Fri, 25 Nov 2022 20:14:15 +0100 Subject: [PATCH] linux-*: various fixes (initramfs, hooks, presets) - Depend on initramfs instead of mkinitcpio specifically - Remove unnecessary hook to run depmod (superseded by 60-depmod.hook) - Remove unnecessary hook to generate initcpios (superseded by 90-mkinitcpio-install.hook) - Remove mkinitcpio presets (now generated by 90-mkinitcpio-install.hook) --- core/linux-aarch64-rc/60-linux.hook | 11 ---------- core/linux-aarch64-rc/90-linux.hook | 11 ---------- core/linux-aarch64-rc/PKGBUILD | 31 ++++----------------------- core/linux-aarch64-rc/linux.preset | 14 ------------ core/linux-aarch64/60-linux.hook | 11 ---------- core/linux-aarch64/90-linux.hook | 11 ---------- core/linux-aarch64/PKGBUILD | 31 ++++----------------------- core/linux-aarch64/linux.preset | 14 ------------ core/linux-am33x/99-linux.hook | 11 ---------- core/linux-am33x/PKGBUILD | 24 ++++----------------- core/linux-am33x/linux.preset | 10 --------- core/linux-armv7-rc/99-linux.hook | 11 ---------- core/linux-armv7-rc/PKGBUILD | 24 ++++----------------- core/linux-armv7-rc/linux.preset | 10 --------- core/linux-armv7/60-linux.hook | 12 ----------- core/linux-armv7/90-linux.hook | 11 ---------- core/linux-armv7/PKGBUILD | 32 ++++------------------------ core/linux-armv7/linux.preset | 10 --------- core/linux-clearfog/PKGBUILD | 4 ++-- core/linux-espressobin/60-linux.hook | 12 ----------- core/linux-espressobin/90-linux.hook | 11 ---------- core/linux-espressobin/PKGBUILD | 20 ++--------------- core/linux-espressobin/linux.preset | 10 --------- core/linux-imx6/PKGBUILD | 4 ++-- core/linux-odroid-c1/PKGBUILD | 4 ++-- core/linux-odroid-c2/60-linux.hook | 12 ----------- core/linux-odroid-c2/90-linux.hook | 11 ---------- core/linux-odroid-c2/PKGBUILD | 32 ++++------------------------ core/linux-odroid-c2/linux.preset | 10 --------- core/linux-odroid-n2/60-linux.hook | 12 ----------- core/linux-odroid-n2/90-linux.hook | 11 ---------- core/linux-odroid-n2/PKGBUILD | 32 ++++------------------------ core/linux-odroid-n2/linux.preset | 10 --------- core/linux-odroid-xu3/99-linux.hook | 11 ---------- core/linux-odroid-xu3/PKGBUILD | 24 ++++----------------- core/linux-odroid-xu3/linux.preset | 10 --------- core/linux-odroid/PKGBUILD | 8 +++---- core/linux-rpi/60-linux.hook | 11 ---------- core/linux-rpi/90-linux.hook | 13 ----------- core/linux-rpi/PKGBUILD | 26 ++-------------------- core/linux-rpi/linux.preset | 10 --------- core/linux-utilite-dt/PKGBUILD | 5 ++--- core/linux-utilite/PKGBUILD | 4 ++-- core/linux-zedboard/PKGBUILD | 4 ++-- 44 files changed, 52 insertions(+), 558 deletions(-) delete mode 100644 core/linux-aarch64-rc/60-linux.hook delete mode 100644 core/linux-aarch64-rc/90-linux.hook delete mode 100644 core/linux-aarch64-rc/linux.preset delete mode 100644 core/linux-aarch64/60-linux.hook delete mode 100644 core/linux-aarch64/90-linux.hook delete mode 100644 core/linux-aarch64/linux.preset delete mode 100644 core/linux-am33x/99-linux.hook delete mode 100644 core/linux-am33x/linux.preset delete mode 100644 core/linux-armv7-rc/99-linux.hook delete mode 100644 core/linux-armv7-rc/linux.preset delete mode 100644 core/linux-armv7/60-linux.hook delete mode 100644 core/linux-armv7/90-linux.hook delete mode 100644 core/linux-armv7/linux.preset delete mode 100644 core/linux-espressobin/60-linux.hook delete mode 100644 core/linux-espressobin/90-linux.hook delete mode 100644 core/linux-espressobin/linux.preset delete mode 100644 core/linux-odroid-c2/60-linux.hook delete mode 100644 core/linux-odroid-c2/90-linux.hook delete mode 100644 core/linux-odroid-c2/linux.preset delete mode 100644 core/linux-odroid-n2/60-linux.hook delete mode 100644 core/linux-odroid-n2/90-linux.hook delete mode 100644 core/linux-odroid-n2/linux.preset delete mode 100644 core/linux-odroid-xu3/99-linux.hook delete mode 100644 core/linux-odroid-xu3/linux.preset delete mode 100644 core/linux-rpi/60-linux.hook delete mode 100644 core/linux-rpi/90-linux.hook delete mode 100644 core/linux-rpi/linux.preset diff --git a/core/linux-aarch64-rc/60-linux.hook b/core/linux-aarch64-rc/60-linux.hook deleted file mode 100644 index 584ce35372..0000000000 --- a/core/linux-aarch64-rc/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/core/linux-aarch64-rc/90-linux.hook b/core/linux-aarch64-rc/90-linux.hook deleted file mode 100644 index ec864d3ff6..0000000000 --- a/core/linux-aarch64-rc/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/Image -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-aarch64-rc/PKGBUILD b/core/linux-aarch64-rc/PKGBUILD index 15244dc567..d1de57a525 100644 --- a/core/linux-aarch64-rc/PKGBUILD +++ b/core/linux-aarch64-rc/PKGBUILD @@ -11,7 +11,7 @@ _srcname=linux-${_rcver}-rc${_rcrel} _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform (release candidate)" pkgver=${_rcver}.rc${_rcrel} -pkgrel=1 +pkgrel=2 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') @@ -23,20 +23,14 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" 'config' 'generate_chromebook_its.sh' 'kernel.keyblock' - 'kernel_data_key.vbprivk' - 'linux.preset' - '60-linux.hook' - '90-linux.hook') + 'kernel_data_key.vbprivk') md5sums=('41d2f438d53dc25c998379d139ff0201' '7b08a199a97e3e2288e5c03d8e8ded2d' 'c9d4e392555b77034e24e9f87c5ff0b3' '6ae4bc41e5a5e8f3d2b831d36f44f673' '7c97cf141750ad810235b1ad06eb9f75' '61c5ff73c136ed07a7aadbf58db3d96a' - '584777ae88bce2c5659960151b64c7d8' - '41cb5fef62715ead2dd109dbea8413d6' - '0a5f16bfec6ad982a2f6782724cca8ba' - '3dc88030a8f2f5a5f97266d99b149f77') + '584777ae88bce2c5659960151b64c7d8') prepare() { cd $_srcname @@ -69,12 +63,11 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=("linux=${pkgver}" "WIREGUARD-MODULE") replaces=('linux-armv8-rc') conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd $_srcname @@ -90,22 +83,6 @@ _package() { # remove build and source links rm "$modulesdir"/{source,build} - - # sed expression for following substitutions - local _subst=" - s|%PKGBASE%|${pkgbase}|g - s|%KERNVER%|${kernver}|g - " - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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" } _package-headers() { diff --git a/core/linux-aarch64-rc/linux.preset b/core/linux-aarch64-rc/linux.preset deleted file mode 100644 index f3430fba30..0000000000 --- a/core/linux-aarch64-rc/linux.preset +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-fallback.img" -fallback_options="-S autodetect" diff --git a/core/linux-aarch64/60-linux.hook b/core/linux-aarch64/60-linux.hook deleted file mode 100644 index 584ce35372..0000000000 --- a/core/linux-aarch64/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/core/linux-aarch64/90-linux.hook b/core/linux-aarch64/90-linux.hook deleted file mode 100644 index ec864d3ff6..0000000000 --- a/core/linux-aarch64/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/Image -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD index c559d98524..c49046c396 100644 --- a/core/linux-aarch64/PKGBUILD +++ b/core/linux-aarch64/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.19 _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform" pkgver=5.19.8 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') @@ -21,10 +21,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" 'config' 'generate_chromebook_its.sh' 'kernel.keyblock' - 'kernel_data_key.vbprivk' - 'linux.preset' - '60-linux.hook' - '90-linux.hook') + 'kernel_data_key.vbprivk') md5sums=('f91bfe133d2cb1692f705947282e123a' '702a69746536f24fd5ebde90eed26048' 'e0514a3e8f7383c1304faeff0121dfb5' @@ -32,10 +29,7 @@ md5sums=('f91bfe133d2cb1692f705947282e123a' '417932cd6167ff0b47c6dc297e3eb3fb' '7c97cf141750ad810235b1ad06eb9f75' '61c5ff73c136ed07a7aadbf58db3d96a' - '584777ae88bce2c5659960151b64c7d8' - '41cb5fef62715ead2dd109dbea8413d6' - '0a5f16bfec6ad982a2f6782724cca8ba' - '3dc88030a8f2f5a5f97266d99b149f77') + '584777ae88bce2c5659960151b64c7d8') prepare() { cd $_srcname @@ -71,11 +65,10 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('wireless-regdb: to set the correct wireless channels of your country') provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd $_srcname @@ -91,22 +84,6 @@ _package() { # remove build and source links rm "$modulesdir"/{source,build} - - # sed expression for following substitutions - local _subst=" - s|%PKGBASE%|${pkgbase}|g - s|%KERNVER%|${kernver}|g - " - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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" } _package-headers() { diff --git a/core/linux-aarch64/linux.preset b/core/linux-aarch64/linux.preset deleted file mode 100644 index f3430fba30..0000000000 --- a/core/linux-aarch64/linux.preset +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-fallback.img" -fallback_options="-S autodetect" diff --git a/core/linux-am33x/99-linux.hook b/core/linux-am33x/99-linux.hook deleted file mode 100644 index 365b233038..0000000000 --- a/core/linux-am33x/99-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/zImage -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD index 6ce2affb0a..957f2c8dfc 100644 --- a/core/linux-am33x/PKGBUILD +++ b/core/linux-am33x/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.19 _kernelname=${pkgbase#linux} _desc="TI AM335x Beaglebone (Black)" pkgver=5.19.8 -pkgrel=1 +pkgrel=2 rcnver=5.19.8 rcnrel=bone9 arch=('armv7h') @@ -21,17 +21,13 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" "https://rcn-ee.com/deb/sid-armhf/v${rcnver}-${rcnrel}/patch-${rcnver%.0}-${rcnrel}.diff.gz" "git+https://github.com/RobertCNelson/bb.org-overlays.git" '0001-add-lcd-cape-for-chiliboard.patch' - 'config' - 'linux.preset' - '99-linux.hook') + 'config') md5sums=('f91bfe133d2cb1692f705947282e123a' '702a69746536f24fd5ebde90eed26048' 'b8b6fdc3eb628e0f6dd0e2bb5df4c1af' 'SKIP' 'ee16bcdbbf978e714455933ecd6dd8fe' - 'd1889d23975bff4ea6eeb46741b7c653' - '78ccc998f27eec49a9d5490218b1b1ab' - '79fa396e3f9a09a85156d6d7c2d34b58') + 'd1889d23975bff4ea6eeb46741b7c653') prepare() { cd "${srcdir}/${_srcname}" @@ -90,9 +86,8 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') replaces=('linux-ti') @@ -118,17 +113,6 @@ _package() { -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ -i "${startdir}/${pkgname}.install" - # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - sed \ - -e "1s|'linux.*'|'${pkgbase}'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hook for initramfs regeneration - sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | - install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" - # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware diff --git a/core/linux-am33x/linux.preset b/core/linux-am33x/linux.preset deleted file mode 100644 index ac64f3fa84..0000000000 --- a/core/linux-am33x/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the linux-am33x package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="4.12.7-1-ARCH" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-armv7-rc/99-linux.hook b/core/linux-armv7-rc/99-linux.hook deleted file mode 100644 index 365b233038..0000000000 --- a/core/linux-armv7-rc/99-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/zImage -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index 09a6fcf808..8a5361da06 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -13,7 +13,7 @@ _srcname=linux-${_rcver}-rc${_rcrel} _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform (release candidate)" pkgver=${_rcver}.rc${_rcrel} -pkgrel=1 +pkgrel=2 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -31,9 +31,7 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" 'config' 'kernel.its' 'kernel.keyblock' - 'kernel_data_key.vbprivk' - 'linux.preset' - '99-linux.hook') + 'kernel_data_key.vbprivk') md5sums=('41d2f438d53dc25c998379d139ff0201' 'e4df378f94ef33e365ca47d78a6dafb9' '9e9d3b4cde2e27afd79f8818eb86a493' @@ -46,9 +44,7 @@ md5sums=('41d2f438d53dc25c998379d139ff0201' 'a42391b00a10269df8c80e58a4f69231' '0963ff6490be16935370812fc75fa065' '61c5ff73c136ed07a7aadbf58db3d96a' - '584777ae88bce2c5659960151b64c7d8' - 'ae7ccb81e057c4d81401e725f102ee5f' - '79fa396e3f9a09a85156d6d7c2d34b58') + '584777ae88bce2c5659960151b64c7d8') prepare() { cd "${srcdir}/${_srcname}" @@ -107,9 +103,8 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('wireless-regdb: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') replaces=('linux-mvebu') @@ -135,17 +130,6 @@ _package() { -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ -i "${startdir}/${pkgname}.install" - # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - sed \ - -e "1s|'linux.*'|'${pkgbase}'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hook for initramfs regeneration - sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | - install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" - # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware diff --git a/core/linux-armv7-rc/linux.preset b/core/linux-armv7-rc/linux.preset deleted file mode 100644 index 2a4ca8ad69..0000000000 --- a/core/linux-armv7-rc/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the linux-armv7-rc package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="4.10.0-rc4-1-ARCH" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-armv7/60-linux.hook b/core/linux-armv7/60-linux.hook deleted file mode 100644 index b33873c854..0000000000 --- a/core/linux-armv7/60-linux.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/core/linux-armv7/90-linux.hook b/core/linux-armv7/90-linux.hook deleted file mode 100644 index 6ad74b4564..0000000000 --- a/core/linux-armv7/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/zImage -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index 0468e06567..f36834ed19 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.19 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" pkgver=5.19.8 -pkgrel=1 +pkgrel=2 rcnver=5.19.8 rcnrel=armv7-x9 arch=('armv7h') @@ -29,10 +29,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" 'config' 'kernel.its' 'kernel.keyblock' - 'kernel_data_key.vbprivk' - 'linux.preset' - '60-linux.hook' - '90-linux.hook') + 'kernel_data_key.vbprivk') md5sums=('f91bfe133d2cb1692f705947282e123a' '702a69746536f24fd5ebde90eed26048' '21253b57f2be7bfd950c97eed6d37359' @@ -46,10 +43,7 @@ md5sums=('f91bfe133d2cb1692f705947282e123a' '35c51bd0be14411340aebc9499e8ef56' '0963ff6490be16935370812fc75fa065' '61c5ff73c136ed07a7aadbf58db3d96a' - '584777ae88bce2c5659960151b64c7d8' - '86d4a35722b5410e3b29fc92dae15d4b' - 'ce6c81ad1ad1f8b333fd6077d47abdaf' - '3e2a512f8da5db5fe9f17875405e56a3') + '584777ae88bce2c5659960151b64c7d8') prepare() { cd "${srcdir}/${_srcname}" @@ -110,9 +104,8 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('wireless-regdb: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') replaces=('linux-mvebu' 'linux-udoo' 'linux-sun4i' 'linux-sun5i' 'linux-sun7i' 'linux-usbarmory' 'linux-wandboard' 'linux-clearfog') @@ -145,23 +138,6 @@ _package() { # now we call depmod... depmod -b "${pkgdir}/usr" -F System.map "${_kernver}" - - # sed expression for following substitutions - local _subst=" - s|%PKGBASE%|${pkgbase}|g - s|%KERNVER%|${_kernver}|g - s|%EXTRAMODULES%|${_extramodules}|g - " - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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" } _package-headers() { diff --git a/core/linux-armv7/linux.preset b/core/linux-armv7/linux.preset deleted file mode 100644 index 8d7f379c9e..0000000000 --- a/core/linux-armv7/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-clearfog/PKGBUILD b/core/linux-clearfog/PKGBUILD index a08b85c7ac..4421274458 100644 --- a/core/linux-clearfog/PKGBUILD +++ b/core/linux-clearfog/PKGBUILD @@ -9,7 +9,7 @@ _commit=a45051aa9e8b3bfeb9f73b1ad20c1c9474753084 _srcname=linux-stable-${_commit} _kernelname=${pkgname#linux} pkgver=4.4.64 -pkgrel=1 +pkgrel=2 bfqver=v7r11 arch=('armv7h') @@ -79,7 +79,7 @@ build() { package_linux-clearfog() { pkgdesc="The Linux Kernel and modules - SolidRun ClearFog boards" - depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}" 'aufs_friendly') install=${pkgname}.install diff --git a/core/linux-espressobin/60-linux.hook b/core/linux-espressobin/60-linux.hook deleted file mode 100644 index b33873c854..0000000000 --- a/core/linux-espressobin/60-linux.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/core/linux-espressobin/90-linux.hook b/core/linux-espressobin/90-linux.hook deleted file mode 100644 index ec864d3ff6..0000000000 --- a/core/linux-espressobin/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/Image -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-espressobin/PKGBUILD b/core/linux-espressobin/PKGBUILD index ba3653b732..8d6cda127b 100644 --- a/core/linux-espressobin/PKGBUILD +++ b/core/linux-espressobin/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="Globalscale ESPRESSOBin" pkgver=5.10.16 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') @@ -17,16 +17,10 @@ options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz" 'config' - 'linux.preset' - '60-linux.hook' - '90-linux.hook' '91-linux.hook') md5sums=('753adc474bf799d569dec4f165ed92c3' '6eb3cfa9872f7c0cbc59e5c17eca854c' '91db2c2612382a535c851169c5873612' - '86d4a35722b5410e3b29fc92dae15d4b' - 'ce6c81ad1ad1f8b333fd6077d47abdaf' - '3dc88030a8f2f5a5f97266d99b149f77' '9d68f10566962252c5190b386cd1584a') prepare() { @@ -77,11 +71,10 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'uboot-tools') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs' 'uboot-tools') optdepends=('crda: to set the correct wireless channels of your country') provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd ${_srcname} @@ -122,15 +115,6 @@ _package() { s|%EXTRAMODULES%|${_extramodules}|g " - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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}" ../91-linux.hook | install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/91-${pkgbase}.hook" } diff --git a/core/linux-espressobin/linux.preset b/core/linux-espressobin/linux.preset deleted file mode 100644 index 8d7f379c9e..0000000000 --- a/core/linux-espressobin/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-imx6/PKGBUILD b/core/linux-imx6/PKGBUILD index 3383fe4c68..42e1b4d0b8 100644 --- a/core/linux-imx6/PKGBUILD +++ b/core/linux-imx6/PKGBUILD @@ -12,7 +12,7 @@ _srcname=linux-fslc-sr-${_commit} _kernelname=${pkgname#linux} _basekernel=3.14 pkgver=${_basekernel}.79 -pkgrel=3 +pkgrel=4 cryptodev_commit=f116a93224fc7b85f83d2c53f565f8fd86165ecc arch=('armv7h') @@ -120,7 +120,7 @@ build() { package_linux-imx6() { pkgdesc="The Linux Kernel and modules - i.MX6 processors" - depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}" 'aufs_friendly' 'cryptodev_friendly') conflicts=('linux-trimslice' 'linux-omap') diff --git a/core/linux-odroid-c1/PKGBUILD b/core/linux-odroid-c1/PKGBUILD index 0d228421a1..431d1210c4 100644 --- a/core/linux-odroid-c1/PKGBUILD +++ b/core/linux-odroid-c1/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-C1" pkgver=3.10.107 -pkgrel=5 +pkgrel=6 arch=('armv7h') url="https://github.com/hardkernel/linux" license=('GPL2') @@ -81,7 +81,7 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux') diff --git a/core/linux-odroid-c2/60-linux.hook b/core/linux-odroid-c2/60-linux.hook deleted file mode 100644 index b33873c854..0000000000 --- a/core/linux-odroid-c2/60-linux.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/core/linux-odroid-c2/90-linux.hook b/core/linux-odroid-c2/90-linux.hook deleted file mode 100644 index ec864d3ff6..0000000000 --- a/core/linux-odroid-c2/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/Image -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-odroid-c2/PKGBUILD b/core/linux-odroid-c2/PKGBUILD index 363e514074..6031097991 100644 --- a/core/linux-odroid-c2/PKGBUILD +++ b/core/linux-odroid-c2/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-C2" pkgver=3.16.85 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="https://github.com/hardkernel/linux/tree/odroidc2-v3.16.y" license=('GPL2') @@ -30,10 +30,7 @@ source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz" '0011-arm64-add-SIGSYS-siginfo-for-compat-task.patch' '0012-arm64-add-seccomp-support.patch' 'config' - 'linux.preset' - 'amlogic.service' - '60-linux.hook' - '90-linux.hook') + 'amlogic.service') md5sums=('594c5a6c9d16afff5504f83ccc886c37' 'SKIP' 'adbecf48248cd62a5bd322750720b88b' @@ -49,10 +46,7 @@ md5sums=('594c5a6c9d16afff5504f83ccc886c37' '8c22925423abc152c24c8e120b9a9fb1' 'e1449557cf7ff2d17398e8d36708cf61' 'a4671795064a0ce28408584dd60520ac' - '86d4a35722b5410e3b29fc92dae15d4b' - 'b8956789318f49cec5b8bb0b41654a9b' - 'ce6c81ad1ad1f8b333fd6077d47abdaf' - '3dc88030a8f2f5a5f97266d99b149f77') + 'b8956789318f49cec5b8bb0b41654a9b') prepare() { cd "${srcdir}/${_srcname}" @@ -112,11 +106,10 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'fbset') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs' 'fbset') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd "${srcdir}/${_srcname}" @@ -157,23 +150,6 @@ _package() { # add vmlinux install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux - # sed expression for following substitutions - local _subst=" - s|%PKGBASE%|${pkgbase}|g - s|%KERNVER%|${_kernver}|g - s|%EXTRAMODULES%|${_extramodules}|g - " - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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" - # install amlogic hdmi init script/service install -Dm644 "${srcdir}/amlogic.service" "${pkgdir}/usr/lib/systemd/system/amlogic.service" install -Dm755 "${srcdir}/c2_bootini/c2_init.sh" "${pkgdir}/usr/bin/amlogic.sh" diff --git a/core/linux-odroid-c2/linux.preset b/core/linux-odroid-c2/linux.preset deleted file mode 100644 index 8d7f379c9e..0000000000 --- a/core/linux-odroid-c2/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-odroid-n2/60-linux.hook b/core/linux-odroid-n2/60-linux.hook deleted file mode 100644 index b33873c854..0000000000 --- a/core/linux-odroid-n2/60-linux.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/core/linux-odroid-n2/90-linux.hook b/core/linux-odroid-n2/90-linux.hook deleted file mode 100644 index ec864d3ff6..0000000000 --- a/core/linux-odroid-n2/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/Image -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-odroid-n2/PKGBUILD b/core/linux-odroid-n2/PKGBUILD index 25c785eb44..c73dc90c23 100644 --- a/core/linux-odroid-n2/PKGBUILD +++ b/core/linux-odroid-n2/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-N2" pkgver=4.9.219 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="https://github.com/hardkernel/linux/tree/odroidn2-4.9.y" license=('GPL2') @@ -17,16 +17,10 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' ' options=('!strip') source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz" '0001-rtl8812au-fix-maybe-uninitialized-error.patch' - 'config' - 'linux.preset' - '60-linux.hook' - '90-linux.hook') + 'config') md5sums=('6201373509cc03ea705da2d0d6856f7e' '0260cbce6933ed5f95ede70d90aad03a' - '97bc0593f313c84218958379fc4aa100' - '86d4a35722b5410e3b29fc92dae15d4b' - 'ce6c81ad1ad1f8b333fd6077d47abdaf' - '3dc88030a8f2f5a5f97266d99b149f77') + '97bc0593f313c84218958379fc4aa100') prepare() { cd "${srcdir}/${_srcname}" @@ -77,11 +71,10 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd "${srcdir}/${_srcname}" @@ -117,23 +110,6 @@ _package() { # add vmlinux install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux - - # sed expression for following substitutions - local _subst=" - s|%PKGBASE%|${pkgbase}|g - s|%KERNVER%|${_kernver}|g - s|%EXTRAMODULES%|${_extramodules}|g - " - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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" } _package-headers() { diff --git a/core/linux-odroid-n2/linux.preset b/core/linux-odroid-n2/linux.preset deleted file mode 100644 index 8d7f379c9e..0000000000 --- a/core/linux-odroid-n2/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-odroid-xu3/99-linux.hook b/core/linux-odroid-xu3/99-linux.hook deleted file mode 100644 index 365b233038..0000000000 --- a/core/linux-odroid-xu3/99-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/zImage -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-odroid-xu3/PKGBUILD b/core/linux-odroid-xu3/PKGBUILD index 60496f93d4..db9ee6dbce 100644 --- a/core/linux-odroid-xu3/PKGBUILD +++ b/core/linux-odroid-xu3/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-XU3/XU4/HC1" pkgver=4.14.180 -pkgrel=3 +pkgrel=4 arch=('armv7h') url="https://github.com/hardkernel/linux" license=('GPL2') @@ -17,14 +17,10 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz" '0001-rtl8812au-sprintf-fix-gcc10.patch' - 'config' - 'linux.preset' - '99-linux.hook') + 'config') md5sums=('249d4767373ab56ae16a0a23a69c61a2' '20bf3136f2725be5b6a2eb7a5a8682bf' - '170cdff5ddd12492e205c61261e9ff74' - 'a84976d500db50cee07177eccfe2f455' - '79fa396e3f9a09a85156d6d7c2d34b58') + '170cdff5ddd12492e205c61261e9ff74') prepare() { cd "${srcdir}/${_srcname}" @@ -72,9 +68,8 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") provides=('kernel26' "linux=${pkgver}") conflicts=('linux') install=${pkgname}.install @@ -99,17 +94,6 @@ _package() { -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ -i "${startdir}/${pkgname}.install" - # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - sed \ - -e "1s|'linux.*'|'${pkgbase}'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hook for initramfs regeneration - sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | - install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" - # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware diff --git a/core/linux-odroid-xu3/linux.preset b/core/linux-odroid-xu3/linux.preset deleted file mode 100644 index bf9fe2d450..0000000000 --- a/core/linux-odroid-xu3/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the linux-odroid-xu3 package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="4.9.13-1-ARCH" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-odroid/PKGBUILD b/core/linux-odroid/PKGBUILD index 45f28aa209..9f37627ed3 100644 --- a/core/linux-odroid/PKGBUILD +++ b/core/linux-odroid/PKGBUILD @@ -8,7 +8,7 @@ pkgname=('linux-odroid-x' 'linux-odroid-x2' 'linux-odroid-u2' 'linux-headers-odr _kernelname=${pkgname#linux} _basekernel=3.8 pkgver=${_basekernel}.13.30 -pkgrel=5 +pkgrel=6 arch=('armv7h') url="http://github.com/hardkernel/linux/" license=('GPL2') @@ -54,7 +54,7 @@ prepare() { package_linux-odroid-x() { pkgdesc="The Linux Kernel and modules - ODROID-X kernel and modules" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux-odroidx' 'linux-odroid-x-mali' 'linux-odroid-u2' 'linux-odroid-u2-mali' 'linux-odroid-x2') @@ -102,7 +102,7 @@ package_linux-odroid-x() { package_linux-odroid-x2() { pkgdesc="The Linux Kernel and modules - ODROID-X2 kernel and modules" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux-odroidx' 'linux-odroid-x-mali' 'linux-odroid-u2' 'linux-odroid-u2-mali' 'linux-odroid-x') @@ -150,7 +150,7 @@ package_linux-odroid-x2() { package_linux-odroid-u2() { pkgdesc="The Linux Kernel and modules - ODROID-U2 kernel and modules" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux-odroidx' 'linux-odroid-x' 'linux-odroid-x-mali' 'linux-odroid-u2-mali' 'linux-odroid-x2') diff --git a/core/linux-rpi/60-linux.hook b/core/linux-rpi/60-linux.hook deleted file mode 100644 index 584ce35372..0000000000 --- a/core/linux-rpi/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/core/linux-rpi/90-linux.hook b/core/linux-rpi/90-linux.hook deleted file mode 100644 index 4e62c1676d..0000000000 --- a/core/linux-rpi/90-linux.hook +++ /dev/null @@ -1,13 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/kernel.img -Target = boot/kernel7.img -Target = boot/kernel8.img -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-rpi/PKGBUILD b/core/linux-rpi/PKGBUILD index 3685f8448b..67218e10a3 100644 --- a/core/linux-rpi/PKGBUILD +++ b/core/linux-rpi/PKGBUILD @@ -23,16 +23,10 @@ source_aarch64=('config8' 'config8.txt') source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz" cmdline.txt 0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch - linux.preset - 60-linux.hook - 90-linux.hook ) md5sums=('d41ba50632ff09d353750cf00f7aaafc' '3bab7426d8c8818dda8353da3892a41f' - 'f66a7ea3feb708d398ef57e4da4815e9' - '86d4a35722b5410e3b29fc92dae15d4b' - '0a5f16bfec6ad982a2f6782724cca8ba' - '441ec084c47cddc53e592fb0cbce4edf') + 'f66a7ea3feb708d398ef57e4da4815e9') md5sums_armv7h=('09d431a67f7dfaa46a365513463fe8c8' 'aedda0148db2692971671e6aa90ad9ff') md5sums_aarch64=('f69bdefd12483afb039c07008cab90a8' @@ -72,7 +66,7 @@ build() { _package() { pkgdesc="RPi Foundation patched Linux kernel and modules" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'firmware-raspberrypi') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs' 'firmware-raspberrypi') optdepends=('wireless-regdb: to set the correct wireless channels of your country') provides=("linux=${pkgver}" 'WIREGUARD-MODULE') conflicts=('linux' 'uboot-raspberrypi') @@ -110,22 +104,6 @@ _package() { cp arch/$KARCH/boot/dts/overlays/README "${pkgdir}/boot/overlays" install -m644 ../$_bconfig "${pkgdir}/boot/config.txt" install -m644 ../cmdline.txt "${pkgdir}/boot" - - # sed expression for following substitutions - local _subst=" - s|%PKGBASE%|${pkgbase}|g - s|%KERNVER%|${kernver}|g - " - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - 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" } _package-headers() { diff --git a/core/linux-rpi/linux.preset b/core/linux-rpi/linux.preset deleted file mode 100644 index 8d7f379c9e..0000000000 --- a/core/linux-rpi/linux.preset +++ /dev/null @@ -1,10 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="%KERNVER%" - -PRESETS=('default') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" diff --git a/core/linux-utilite-dt/PKGBUILD b/core/linux-utilite-dt/PKGBUILD index d7d5761363..5c8941c840 100644 --- a/core/linux-utilite-dt/PKGBUILD +++ b/core/linux-utilite-dt/PKGBUILD @@ -15,7 +15,7 @@ _srcname=linux-kernel-${_commit} _kernelname=${pkgname#linux} _basekernel=3.10 pkgver=${_basekernel}.70 -pkgrel=2 +pkgrel=3 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -89,11 +89,10 @@ build() { package_linux-utilite-dt() { pkgdesc="The Linux Kernel and modules - i.MX6 processors for all utilite-i" - depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux-trimslice' 'linux-omap' 'linux-utilite' 'linux-imx6-cubox-dt' 'linux-imx6-cubox') - backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install cd "${srcdir}/${_srcname}" diff --git a/core/linux-utilite/PKGBUILD b/core/linux-utilite/PKGBUILD index 465c8682c8..879a3b37cc 100644 --- a/core/linux-utilite/PKGBUILD +++ b/core/linux-utilite/PKGBUILD @@ -9,7 +9,7 @@ _srcname=utilite-${_commit} _kernelname=${pkgbase#linux} _desc="CompuLab Utilite alternate kernel" pkgver=3.0.35 -pkgrel=18 +pkgrel=19 arch=('armv7h') url="https://github.com/wolfgar/utilite/tree/devel" license=('GPL2') @@ -78,7 +78,7 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux') diff --git a/core/linux-zedboard/PKGBUILD b/core/linux-zedboard/PKGBUILD index 24b814b030..87e18613fa 100644 --- a/core/linux-zedboard/PKGBUILD +++ b/core/linux-zedboard/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-xlnx-${_commit} _kernelname=${pkgbase#linux} _desc="ZedBoard" pkgver=3.19.0 -pkgrel=3 +pkgrel=4 arch=('armv7h') url="https://github.com/Xilinx/linux-xlnx" license=('GPL2') @@ -82,7 +82,7 @@ build() { _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}" 'aufs_friendly') conflicts=('linux')