Date: Friday, December 7, 2012 @ 21:34:13 Author: dreisner Revision: 172985
archrelease: copy trunk to testing-i686, testing-x86_64 Added: mkinitcpio/repos/testing-i686/ mkinitcpio/repos/testing-i686/0001-consolefont-fix-reference-to-consolefont-variable.patch (from rev 172984, mkinitcpio/trunk/0001-consolefont-fix-reference-to-consolefont-variable.patch) mkinitcpio/repos/testing-i686/PKGBUILD (from rev 172984, mkinitcpio/trunk/PKGBUILD) mkinitcpio/repos/testing-i686/mkinitcpio.install (from rev 172984, mkinitcpio/trunk/mkinitcpio.install) mkinitcpio/repos/testing-x86_64/ mkinitcpio/repos/testing-x86_64/0001-consolefont-fix-reference-to-consolefont-variable.patch (from rev 172984, mkinitcpio/trunk/0001-consolefont-fix-reference-to-consolefont-variable.patch) mkinitcpio/repos/testing-x86_64/PKGBUILD (from rev 172984, mkinitcpio/trunk/PKGBUILD) mkinitcpio/repos/testing-x86_64/mkinitcpio.install (from rev 172984, mkinitcpio/trunk/mkinitcpio.install) -----------------------------------------------------------------------------+ testing-i686/0001-consolefont-fix-reference-to-consolefont-variable.patch | 52 ++++++++++ testing-i686/PKGBUILD | 34 ++++++ testing-i686/mkinitcpio.install | 15 ++ testing-x86_64/0001-consolefont-fix-reference-to-consolefont-variable.patch | 52 ++++++++++ testing-x86_64/PKGBUILD | 34 ++++++ testing-x86_64/mkinitcpio.install | 15 ++ 6 files changed, 202 insertions(+) Copied: mkinitcpio/repos/testing-i686/0001-consolefont-fix-reference-to-consolefont-variable.patch (from rev 172984, mkinitcpio/trunk/0001-consolefont-fix-reference-to-consolefont-variable.patch) =================================================================== --- testing-i686/0001-consolefont-fix-reference-to-consolefont-variable.patch (rev 0) +++ testing-i686/0001-consolefont-fix-reference-to-consolefont-variable.patch 2012-12-08 02:34:13 UTC (rev 172985) @@ -0,0 +1,52 @@ +From 6be469d5f21309fe80d927d277d37a99db22b511 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreis...@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 <dreis...@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 + Copied: mkinitcpio/repos/testing-i686/PKGBUILD (from rev 172984, mkinitcpio/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-12-08 02:34:13 UTC (rev 172985) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=mkinitcpio +pkgver=0.12.0 +pkgrel=2 +pkgdesc="Modular initramfs image creation utility" +arch=('any') +url="http://www.archlinux.org/" +license=('GPL') +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.21' 'libarchive' 'coreutils' + 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'file' 'gzip' 'systemd-tools') +optdepends=('xz: Use lzma or xz compression for the initramfs image' + 'bzip2: Use bzip2 compression for the initramfs image' + '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) +install=mkinitcpio.install +sha256sums=('ed9bd16999e75b42c8ad78a62cd744f95aca1d1078bb1ecff94c9d31d6765761' + '9db84177b3e976dc732fe24d565c07e0977d809a32cbcaaa5f48364fbe6157d2' + '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 +} + Copied: mkinitcpio/repos/testing-i686/mkinitcpio.install (from rev 172984, mkinitcpio/trunk/mkinitcpio.install) =================================================================== --- testing-i686/mkinitcpio.install (rev 0) +++ testing-i686/mkinitcpio.install 2012-12-08 02:34:13 UTC (rev 172985) @@ -0,0 +1,15 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.9.0 "$2")" -eq 1 ]; then + printf '==> If your /usr is on a separate partition, you must add the "usr" hook\n' + printf ' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n' + fi + + if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then + printf '==> The "block" hook has replaced several hooks:\n' + printf ' fw, sata, pata, scsi, virtio, mmc, usb\n' + printf ' Replace any and all of these in /etc/mkinitcpio.conf with a single\n' + printf ' instance of the "block" hook\n' + fi +} Copied: mkinitcpio/repos/testing-x86_64/0001-consolefont-fix-reference-to-consolefont-variable.patch (from rev 172984, mkinitcpio/trunk/0001-consolefont-fix-reference-to-consolefont-variable.patch) =================================================================== --- testing-x86_64/0001-consolefont-fix-reference-to-consolefont-variable.patch (rev 0) +++ testing-x86_64/0001-consolefont-fix-reference-to-consolefont-variable.patch 2012-12-08 02:34:13 UTC (rev 172985) @@ -0,0 +1,52 @@ +From 6be469d5f21309fe80d927d277d37a99db22b511 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreis...@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 <dreis...@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 + Copied: mkinitcpio/repos/testing-x86_64/PKGBUILD (from rev 172984, mkinitcpio/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-12-08 02:34:13 UTC (rev 172985) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=mkinitcpio +pkgver=0.12.0 +pkgrel=2 +pkgdesc="Modular initramfs image creation utility" +arch=('any') +url="http://www.archlinux.org/" +license=('GPL') +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.21' 'libarchive' 'coreutils' + 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'file' 'gzip' 'systemd-tools') +optdepends=('xz: Use lzma or xz compression for the initramfs image' + 'bzip2: Use bzip2 compression for the initramfs image' + '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) +install=mkinitcpio.install +sha256sums=('ed9bd16999e75b42c8ad78a62cd744f95aca1d1078bb1ecff94c9d31d6765761' + '9db84177b3e976dc732fe24d565c07e0977d809a32cbcaaa5f48364fbe6157d2' + '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 +} + Copied: mkinitcpio/repos/testing-x86_64/mkinitcpio.install (from rev 172984, mkinitcpio/trunk/mkinitcpio.install) =================================================================== --- testing-x86_64/mkinitcpio.install (rev 0) +++ testing-x86_64/mkinitcpio.install 2012-12-08 02:34:13 UTC (rev 172985) @@ -0,0 +1,15 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.9.0 "$2")" -eq 1 ]; then + printf '==> If your /usr is on a separate partition, you must add the "usr" hook\n' + printf ' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n' + fi + + if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then + printf '==> The "block" hook has replaced several hooks:\n' + printf ' fw, sata, pata, scsi, virtio, mmc, usb\n' + printf ' Replace any and all of these in /etc/mkinitcpio.conf with a single\n' + printf ' instance of the "block" hook\n' + fi +}