[arch-commits] Commit in mkinitcpio/trunk (2 files)

[Dave Reisner]

    Date: Saturday, March 8, 2014 @ 20:13:06
  Author: dreisner
Revision: 207419

upgpkg: mkinitcpio 17-1

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  mkinitcpio/trunk/0001-Add-l-flag-when-using-lz4-compression.patch

--------------------------------------------------+
 0001-Add-l-flag-when-using-lz4-compression.patch |   61 ---------------------
 PKGBUILD                                         |   16 +----
 2 files changed, 5 insertions(+), 72 deletions(-)

Deleted: 0001-Add-l-flag-when-using-lz4-compression.patch
===================================================================
--- 0001-Add-l-flag-when-using-lz4-compression.patch	2014-03-08 18:51:10 UTC (rev 207418)
+++ 0001-Add-l-flag-when-using-lz4-compression.patch	2014-03-08 19:13:06 UTC (rev 207419)
@@ -1,61 +0,0 @@
-From 2ce3a416c8714adedc3117e5247e6da364ddebc9 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at archlinux.org>
-Date: Sun, 22 Dec 2013 14:11:37 -0500
-Subject: [mkinitcpio] [PATCH] Add -l flag when using lz4 compression
-
-This isn't documented, but it's needed since the kernel lz4 support is
-based on the original streaming format and not the newer default. Use
--l to force the legacy codec.
-
-Fixup lsinitcpio to support the older format, and, add a warning when
-the newer format is detected. Who knows when this will be "resolved" ...
-
-Upstream discussion: https://code.google.com/p/lz4/issues/detail?id=102
----
- lsinitcpio | 15 +++++++++++----
- mkinitcpio |  3 +++
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/lsinitcpio b/lsinitcpio
-index 10cd663..9d98d57 100755
---- a/lsinitcpio
-+++ b/lsinitcpio
-@@ -91,10 +91,17 @@ detect_filetype() {
-         return
-     fi
- 
--    if [[ $(hexdump -n 4 -e '"%x"' "$1") == '184d2204' ]]; then
--        echo 'lz4'
--        return
--    fi
-+    case $(hexdump -n 4 -e '"%x"' "$1") in
-+        184d2204)
-+            error 'Newer lz4 stream format detected! This may not boot!'
-+            echo 'lz4'
-+            return
-+            ;;
-+        184c2102)
-+            echo 'lz4 -l'
-+            return
-+            ;;
-+    esac
- 
-     if [[ $(hexdump -n 3 -e '"%c"' "$1") == 'BZh' ]]; then
-         echo 'bzip2'
-diff --git a/mkinitcpio b/mkinitcpio
-index cb94d62..42abde7 100755
---- a/mkinitcpio
-+++ b/mkinitcpio
-@@ -202,6 +202,9 @@ build_image() {
-         xz)
-             COMPRESSION_OPTIONS+=' --check=crc32'
-             ;;
-+        lz4)
-+            COMPRESSION_OPTIONS+=' -l'
-+            ;;
-     esac
- 
-     cpio_opts=('-0' '-o' '-H' 'newc')
--- 
-1.8.5.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-08 18:51:10 UTC (rev 207418)
+++ PKGBUILD	2014-03-08 19:13:06 UTC (rev 207419)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=mkinitcpio
-pkgver=16
-pkgrel=2
+pkgver=17
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/"
@@ -17,17 +17,11 @@
             'lz4: Use lz4 compression for the initramfs image'
             'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 backup=('etc/mkinitcpio.conf')
-source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        0001-Add-l-flag-when-using-lz4-compression.patch)
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 install=mkinitcpio.install
-sha256sums=('10821e533eb1ca51a9d3c1d06d8999c08a6151910a9a6029a45ff1638e9228a2'
-            'SKIP'
-            'e8dd2d3fb29e6c41bed53be2f8659a7e5daeae3c9495d8527b6b938787c54703')
+sha256sums=('904821a027fdda26bb7150887680f3b751351ff37dc5e409dcb839e4733906ce'
+            'SKIP')
 
-prepare() {
-  patch -d "$pkgname-$pkgver" -Np1 <"$srcdir/0001-Add-l-flag-when-using-lz4-compression.patch"
-}
-
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }