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

[Dave Reisner]

    Date: Friday, January 25, 2013 @ 14:34:00
  Author: dreisner
Revision: 175962

upgpkg: mkinitcpio 0.12.0-3

- backport fix to symlink lib64 -> usr/lib

Added:
  mkinitcpio/trunk/0001-symlink-lib64-usr-lib-in-image.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-------------------------------------------+
 0001-symlink-lib64-usr-lib-in-image.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                                  |    9 ++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

Added: 0001-symlink-lib64-usr-lib-in-image.patch
===================================================================
--- 0001-symlink-lib64-usr-lib-in-image.patch	                        (rev 0)
+++ 0001-symlink-lib64-usr-lib-in-image.patch	2013-01-25 13:34:00 UTC (rev 175962)
@@ -0,0 +1,25 @@
+From 0ca6cc5cfeb040a2eda486c62195fd4ca935dc99 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Thu, 24 Jan 2013 16:26:43 -0500
+Subject: [mkinitcpio] [PATCH] symlink /lib64 -> usr/lib in image
+
+Signed-off-by: Dave Reisner <dreisner at archlinux.org>
+---
+ functions | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/functions b/functions
+index 2286ac1..19b56ef 100644
+--- a/functions
++++ b/functions
+@@ -608,6 +608,7 @@ initialize_buildroot() {
+     # base directory structure
+     install -dm755 "$workdir/root"/{new_root,proc,sys,dev,run,tmp,etc,usr/{local,lib,bin}}
+     ln -s "usr/lib" "$workdir/root/lib"
++    ln -s "usr/lib" "$workdir/root/lib64"
+     ln -s "../lib"  "$workdir/root/usr/local/lib"
+     ln -s "bin"     "$workdir/root/usr/sbin"
+     ln -s "usr/bin" "$workdir/root/bin"
+-- 
+1.8.1.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-25 12:48:04 UTC (rev 175961)
+++ PKGBUILD	2013-01-25 13:34:00 UTC (rev 175962)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=0.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="http://www.archlinux.org/"
@@ -17,15 +17,18 @@
             '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-consolefont-fix-reference-to-consolefont-variable.patch)
+        0001-consolefont-fix-reference-to-consolefont-variable.patch
+        0001-symlink-lib64-usr-lib-in-image.patch)
 install=mkinitcpio.install
 sha256sums=('ed9bd16999e75b42c8ad78a62cd744f95aca1d1078bb1ecff94c9d31d6765761'
             '9db84177b3e976dc732fe24d565c07e0977d809a32cbcaaa5f48364fbe6157d2'
-            '014c2337870338b8635e6e25115a183de0b8936f54cbfd1589f6604dc42c96e0')
+            '014c2337870338b8635e6e25115a183de0b8936f54cbfd1589f6604dc42c96e0'
+            '5918c7b29d07973a86749646c4a5eb4e477a64feef161c05401f0e6f0d1aca28')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 <"$srcdir/0001-consolefont-fix-reference-to-consolefont-variable.patch"
+  patch -Np1 <"$srcdir/0001-symlink-lib64-usr-lib-in-image.patch"
 }
 
 package() {