Date: Tuesday, May 21, 2019 @ 02:20:26 Author: grazzolini Revision: 353707
upgpkg: dracut 049-2 Added: dracut/trunk/0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch Modified: dracut/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch | 27 ++++++++++ PKGBUILD | 17 ++++-- 2 files changed, 40 insertions(+), 4 deletions(-) Added: 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 (rev 0) +++ 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch 2019-05-21 02:20:26 UTC (rev 353707) @@ -0,0 +1,27 @@ +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-05-21 00:18:54 UTC (rev 353706) +++ PKGBUILD 2019-05-21 02:20:26 UTC (rev 353707) @@ -3,7 +3,7 @@ pkgver=049 # tag commit of the pkgver _tag_blob='1a3447fa9bbf0954d62025957362536a482f1f79' -pkgrel=1 +pkgrel=2 pkgdesc="An event driven initramfs infrastructure" arch=('x86_64') url="https://dracut.wiki.kernel.org" @@ -13,15 +13,24 @@ 'kmod' 'procps-ng' 'sed' 'systemd' 'util-linux' 'xz') makedepends=('asciidoc' 'bash-completion' 'gcc' 'git' 'pkgconf') provides=("${pkgname}") -# do not conflict on mkinitcpio yet +# do not conflict on mkinitcpio conflicts=("${pkgname}") backup=('etc/dracut.conf') -source=("git+https://github.com/dracutdevs/dracut#tag=${_tag_blob}?signed") -md5sums=('SKIP') +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') validpgpkeys=( '4C96E1500F9421CCF82D5DCA034EB370014DF270' # Harald Hoyer <har...@redhat.com> ) +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" +} + build() { local prefix=/usr sysconfdir=/etc