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

[Dave Reisner]

    Date: Thursday, January 31, 2013 @ 23:02:16
  Author: dreisner
Revision: 176812

upgpkg: mkinitcpio 0.13.0-1

https://projects.archlinux.org/mkinitcpio.git/log/?id=0.12.0..0.13.0

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  mkinitcpio/trunk/0001-consolefont-fix-reference-to-consolefont-variable.patch
  mkinitcpio/trunk/0001-symlink-lib64-usr-lib-in-image.patch

--------------------------------------------------------------+
 0001-consolefont-fix-reference-to-consolefont-variable.patch |   52 ----------
 0001-symlink-lib64-usr-lib-in-image.patch                    |   25 ----
 PKGBUILD                                                     |   20 ---
 3 files changed, 5 insertions(+), 92 deletions(-)

Deleted: 0001-consolefont-fix-reference-to-consolefont-variable.patch
===================================================================
--- 0001-consolefont-fix-reference-to-consolefont-variable.patch	2013-01-31 20:49:29 UTC (rev 176811)
+++ 0001-consolefont-fix-reference-to-consolefont-variable.patch	2013-01-31 22:02:16 UTC (rev 176812)
@@ -1,52 +0,0 @@
-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
-

Deleted: 0001-symlink-lib64-usr-lib-in-image.patch
===================================================================
--- 0001-symlink-lib64-usr-lib-in-image.patch	2013-01-31 20:49:29 UTC (rev 176811)
+++ 0001-symlink-lib64-usr-lib-in-image.patch	2013-01-31 22:02:16 UTC (rev 176812)
@@ -1,25 +0,0 @@
-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-31 20:49:29 UTC (rev 176811)
+++ PKGBUILD	2013-01-31 22:02:16 UTC (rev 176812)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=mkinitcpio
-pkgver=0.12.0
-pkgrel=3
+pkgver=0.13.0
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="http://www.archlinux.org/"
@@ -16,21 +16,11 @@
             '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}
-        0001-consolefont-fix-reference-to-consolefont-variable.patch
-        0001-symlink-lib64-usr-lib-in-image.patch)
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 install=mkinitcpio.install
-sha256sums=('ed9bd16999e75b42c8ad78a62cd744f95aca1d1078bb1ecff94c9d31d6765761'
-            '9db84177b3e976dc732fe24d565c07e0977d809a32cbcaaa5f48364fbe6157d2'
-            '014c2337870338b8635e6e25115a183de0b8936f54cbfd1589f6604dc42c96e0'
-            '5918c7b29d07973a86749646c4a5eb4e477a64feef161c05401f0e6f0d1aca28')
+sha256sums=('e7a37419890b0497aa32ac9e87465bcff65a1a18d17028ea81e3f72565b38859'
+            '108e4e2586a85efe2f46b8b7b9f4262d3ae23cd104d98465542dab2ba6ae00c7')
 
-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() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }