Date: Wednesday, October 2, 2019 @ 12:40:02 Author: grazzolini Revision: 363652
upgpkg: dracut 049-4 Backport #573 (Replace $(arch) by $(uname -m)) and add pkgconf to dependencies Modified: dracut/trunk/PKGBUILD Deleted: dracut/trunk/0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch -----------------------------------------------------------------+ 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch | 27 -------- PKGBUILD | 33 +++++++--- 2 files changed, 24 insertions(+), 36 deletions(-) Deleted: 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch =================================================================== --- 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch 2019-10-02 10:24:13 UTC (rev 363651) +++ 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch 2019-10-02 12:40:02 UTC (rev 363652) @@ -1,27 +0,0 @@ -From a79fb31261688f6d612f0145c68964956a0a46b4 Mon Sep 17 00:00:00 2001 -From: Giancarlo Razzolini <grazzol...@archlinux.org> -Date: Mon, 20 May 2019 22:41:43 -0300 -Subject: [PATCH] 90crypt: Change the module-setup.sh to use uname -r instead - of arch binary. - -Signed-off-by: Giancarlo Razzolini <grazzol...@archlinux.org> ---- - modules.d/90crypt/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index 1ec59096..bd5bb6a0 100755 ---- a/modules.d/90crypt/module-setup.sh -+++ b/modules.d/90crypt/module-setup.sh -@@ -25,7 +25,7 @@ depends() { - # called by dracut - installkernel() { - hostonly="" instmods drbg -- arch=$(arch) -+ arch=$(uname -m) - [[ $arch == x86_64 ]] && arch=x86 - [[ $arch == s390x ]] && arch=s390 - instmods dm_crypt =crypto =drivers/crypto =arch/$arch/crypto --- -2.21.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-02 10:24:13 UTC (rev 363651) +++ PKGBUILD 2019-10-02 12:40:02 UTC (rev 363652) @@ -3,29 +3,44 @@ pkgver=049 # tag commit of the pkgver _tag_blob='1a3447fa9bbf0954d62025957362536a482f1f79' -pkgrel=3 +pkgrel=4 pkgdesc="An event driven initramfs infrastructure" arch=('x86_64') url="https://dracut.wiki.kernel.org" license=('GPL') depends=('bash' 'coreutils' 'cpio' 'filesystem' 'findutils' 'grep' 'gzip' - 'kmod' 'procps-ng' 'sed' 'systemd' 'util-linux' 'xz') + 'kmod' 'pkgconf' 'procps-ng' 'sed' 'systemd' 'util-linux' 'xz') makedepends=('asciidoc' 'bash-completion' 'git') provides=('initramfs') backup=('etc/dracut.conf') -source=("git+https://github.com/dracutdevs/dracut#tag=${_tag_blob}?signed" - "0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch") -sha512sums=('SKIP' - 'a4ed8da197fde60cf69803431a61273b0db921fe84589879fdd37697df6e0d95275daf6273eee86077ba93687be6e88da0b26fff60451d5dec2a69fafcf6094d') +source=("git+https://github.com/dracutdevs/dracut#tag=${_tag_blob}?signed") +sha512sums=('SKIP') validpgpkeys=( '4C96E1500F9421CCF82D5DCA034EB370014DF270' # Harald Hoyer <har...@redhat.com> ) -prepare () { +_backports=( + #Replace $(arch) by $(uname -m) + '0585725908c9238e5da6b7768c05bf0ac0a0a015' +) + +_reverts=( +) + +prepare() { cd "$srcdir/${pkgname}" - # patch for arch. we only support x86_64 - patch -Np1 < "$srcdir/0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch" + local _c + + for _c in "${_backports[@]}"; do + git log --oneline -1 "${_c}" + git cherry-pick -n "${_c}" + done + + for _c in "${_reverts[@]}"; do + git log --oneline -1 "${_c}" + git revert -n "${_c}" + done } build() {