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

[Dave Reisner]

    Date: Friday, December 7, 2012 @ 20:06:00
  Author: dreisner
Revision: 172976

upgpkg: mkinitcpio 0.12.0-2

- backport fix for FS#32935

Added:
  mkinitcpio/trunk/0001-consolefont-fix-reference-to-consolefont-variable.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-consolefont-fix-reference-to-consolefont-variable.patch |   52 ++++++++++
 PKGBUILD                                                     |   13 +-
 2 files changed, 62 insertions(+), 3 deletions(-)

Added: 0001-consolefont-fix-reference-to-consolefont-variable.patch
===================================================================
--- 0001-consolefont-fix-reference-to-consolefont-variable.patch	                        (rev 0)
+++ 0001-consolefont-fix-reference-to-consolefont-variable.patch	2012-12-08 01:06:00 UTC (rev 172976)
@@ -0,0 +1,52 @@
+From 6be469d5f21309fe80d927d277d37a99db22b511 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Sat, 1 Dec 2012 23:28:59 -0500
+Subject: [mkinitcpio] [PATCH] consolefont: fix reference to consolefont
+ variable
+
+Broken by ac8499c08279b05d.
+
+FS#32935.
+https://bbs.archlinux.org/viewtopic.php?id=153982
+
+Signed-off-by: Dave Reisner <dreisner at archlinux.org>
+---
+ install/consolefont | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/install/consolefont b/install/consolefont
+index bbcd7ec..c10b65d 100644
+--- a/install/consolefont
++++ b/install/consolefont
+@@ -5,8 +5,8 @@ build() {
+     (
+         [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf
+ 
+-        if [[ $CONSOLEFONT ]]; then
+-            for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".@(fnt|psf?(u))?(.gz); do
++        if [[ $FONT ]]; then
++            for file in "/usr/share/kbd/consolefonts/$FONT".@(fnt|psf?(u))?(.gz); do
+                 if [[ -e $file ]]; then
+                     [[ $file =~ (\.(fnt|psfu?))(\.gz)?$ ]] && ext=${BASH_REMATCH[2]}
+                     if [[ $file = *.gz ]]; then
+@@ -17,7 +17,7 @@ build() {
+                     exit 0
+                 fi
+             done
+-            error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT"
++            error "consolefont: requested font not found: \`%s'" "$FONT"
+             exit 1
+         else
+             warning "consolefont: no font found in configuration"
+@@ -28,7 +28,7 @@ build() {
+ 
+ help() {
+     cat <<HELPEOF
+-This hook loads consolefont specified in locale.conf during early userspace.
++This hook loads consolefont specified in vconsole.conf during early userspace.
+ HELPEOF
+ }
+ 
+-- 
+1.8.0.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-07 21:31:34 UTC (rev 172975)
+++ PKGBUILD	2012-12-08 01:06:00 UTC (rev 172976)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="http://www.archlinux.org/"
@@ -16,11 +16,18 @@
             'lzop: Use lzo 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})
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        0001-consolefont-fix-reference-to-consolefont-variable.patch)
 install=mkinitcpio.install
 sha256sums=('ed9bd16999e75b42c8ad78a62cd744f95aca1d1078bb1ecff94c9d31d6765761'
-            'SKIP')
+            'SKIP'
+            '014c2337870338b8635e6e25115a183de0b8936f54cbfd1589f6604dc42c96e0')
 
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 <"$srcdir/0001-consolefont-fix-reference-to-consolefont-variable.patch"
+}
+
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }