[arch-commits] Commit in dracut/repos/extra-x86_64 (3 files)
Giancarlo Razzolini
grazzolini at archlinux.org
Tue May 21 02:21:13 UTC 2019
Date: Tuesday, May 21, 2019 @ 02:21:13
Author: grazzolini
Revision: 353708
archrelease: copy trunk to extra-x86_64
Added:
dracut/repos/extra-x86_64/0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch
(from rev 353707, dracut/trunk/0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch)
dracut/repos/extra-x86_64/PKGBUILD
(from rev 353707, dracut/trunk/PKGBUILD)
Deleted:
dracut/repos/extra-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch | 27 ++
PKGBUILD | 95 +++++-----
2 files changed, 79 insertions(+), 43 deletions(-)
Copied: dracut/repos/extra-x86_64/0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch (from rev 353707, 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 (rev 0)
+++ 0001-90crypt-Change-the-module-setup.sh-to-use-uname-r-in.patch 2019-05-21 02:21:13 UTC (rev 353708)
@@ -0,0 +1,27 @@
+From a79fb31261688f6d612f0145c68964956a0a46b4 Mon Sep 17 00:00:00 2001
+From: Giancarlo Razzolini <grazzolini at 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 <grazzolini at 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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-21 02:20:26 UTC (rev 353707)
+++ PKGBUILD 2019-05-21 02:21:13 UTC (rev 353708)
@@ -1,43 +0,0 @@
-# Maintainer: Giancarlo Razzolini <grazzolini at archlinux.org>
-pkgname=dracut
-pkgver=049
-# tag commit of the pkgver
-_tag_blob='1a3447fa9bbf0954d62025957362536a482f1f79'
-pkgrel=1
-pkgdesc="An event driven initramfs infrastructure"
-arch=('x86_64')
-url="https://dracut.wiki.kernel.org"
-license=('GPL')
-groups=()
-depends=('bash' 'coreutils' 'cpio' 'filesystem' 'findutils' 'grep' 'gzip'
- 'kmod' 'procps-ng' 'sed' 'systemd' 'util-linux' 'xz')
-makedepends=('asciidoc' 'bash-completion' 'gcc' 'git' 'pkgconf')
-provides=("${pkgname}")
-# do not conflict on mkinitcpio yet
-conflicts=("${pkgname}")
-backup=('etc/dracut.conf')
-source=("git+https://github.com/dracutdevs/dracut#tag=${_tag_blob}?signed")
-md5sums=('SKIP')
-validpgpkeys=(
- '4C96E1500F9421CCF82D5DCA034EB370014DF270' # Harald Hoyer <harald at redhat.com>
-)
-
-build() {
- local prefix=/usr sysconfdir=/etc
-
- cd "$srcdir/${pkgname}"
-
- ./configure \
- --sysconfdir=${sysconfdir} \
- --prefix=${prefix} \
- --libdir=${prefix}/lib \
- --systemdsystemunitdir=${prefix}/lib/systemd/system \
- --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion)
- make
-}
-
-package() {
- cd "$srcdir/${pkgname}"
-
- DESTDIR="$pkgdir" make install
-}
Copied: dracut/repos/extra-x86_64/PKGBUILD (from rev 353707, dracut/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-21 02:21:13 UTC (rev 353708)
@@ -0,0 +1,52 @@
+# Maintainer: Giancarlo Razzolini <grazzolini at archlinux.org>
+pkgname=dracut
+pkgver=049
+# tag commit of the pkgver
+_tag_blob='1a3447fa9bbf0954d62025957362536a482f1f79'
+pkgrel=2
+pkgdesc="An event driven initramfs infrastructure"
+arch=('x86_64')
+url="https://dracut.wiki.kernel.org"
+license=('GPL')
+groups=()
+depends=('bash' 'coreutils' 'cpio' 'filesystem' 'findutils' 'grep' 'gzip'
+ 'kmod' 'procps-ng' 'sed' 'systemd' 'util-linux' 'xz')
+makedepends=('asciidoc' 'bash-completion' 'gcc' 'git' 'pkgconf')
+provides=("${pkgname}")
+# do not conflict on mkinitcpio
+conflicts=("${pkgname}")
+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')
+validpgpkeys=(
+ '4C96E1500F9421CCF82D5DCA034EB370014DF270' # Harald Hoyer <harald at 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
+
+ cd "$srcdir/${pkgname}"
+
+ ./configure \
+ --sysconfdir=${sysconfdir} \
+ --prefix=${prefix} \
+ --libdir=${prefix}/lib \
+ --systemdsystemunitdir=${prefix}/lib/systemd/system \
+ --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion)
+ make
+}
+
+package() {
+ cd "$srcdir/${pkgname}"
+
+ DESTDIR="$pkgdir" make install
+}
More information about the arch-commits
mailing list