[arch-commits] Commit in mkinitcpio/repos (8 files)
Allan McRae
allan at archlinux.org
Wed Aug 12 10:12:20 UTC 2015
Date: Wednesday, August 12, 2015 @ 12:12:20
Author: allan
Revision: 243305
archrelease: copy trunk to core-i686, core-x86_64
Added:
mkinitcpio/repos/core-i686/
mkinitcpio/repos/core-i686/0001-avoid-compound-conditional-leading-to-spurious-error.patch
(from rev 243304, mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch)
mkinitcpio/repos/core-i686/PKGBUILD
(from rev 243304, mkinitcpio/trunk/PKGBUILD)
mkinitcpio/repos/core-i686/mkinitcpio.install
(from rev 243304, mkinitcpio/trunk/mkinitcpio.install)
mkinitcpio/repos/core-x86_64/
mkinitcpio/repos/core-x86_64/0001-avoid-compound-conditional-leading-to-spurious-error.patch
(from rev 243304, mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch)
mkinitcpio/repos/core-x86_64/PKGBUILD
(from rev 243304, mkinitcpio/trunk/PKGBUILD)
mkinitcpio/repos/core-x86_64/mkinitcpio.install
(from rev 243304, mkinitcpio/trunk/mkinitcpio.install)
-----------------------------------------------------------------------------+
core-i686/0001-avoid-compound-conditional-leading-to-spurious-error.patch | 39 ++++++++++
core-i686/PKGBUILD | 34 ++++++++
core-i686/mkinitcpio.install | 15 +++
core-x86_64/0001-avoid-compound-conditional-leading-to-spurious-error.patch | 39 ++++++++++
core-x86_64/PKGBUILD | 34 ++++++++
core-x86_64/mkinitcpio.install | 15 +++
6 files changed, 176 insertions(+)
Copied: mkinitcpio/repos/core-i686/0001-avoid-compound-conditional-leading-to-spurious-error.patch (from rev 243304, mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch)
===================================================================
--- core-i686/0001-avoid-compound-conditional-leading-to-spurious-error.patch (rev 0)
+++ core-i686/0001-avoid-compound-conditional-leading-to-spurious-error.patch 2015-08-12 10:12:20 UTC (rev 243305)
@@ -0,0 +1,39 @@
+From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Mon, 4 Aug 2014 08:31:37 -0400
+Subject: [mkinitcpio] [PATCH] avoid compound conditional leading to spurious
+ "errors"
+
+As seen:
+
+https://bbs.archlinux.org/viewtopic.php?id=185204
+https://bbs.archlinux.org/viewtopic.php?id=185265
+---
+ functions | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/functions b/functions
+index 20bbffe..362d07b 100644
+--- a/functions
++++ b/functions
+@@ -423,11 +423,15 @@ add_full_dir() {
+
+ for f in "$1"/*; do
+ if [[ -L $f ]]; then
+- [[ $f = $filter ]] && add_symlink "$f" "$(readlink "$f")"
++ if [[ $f = $filter ]]; then
++ add_symlink "$f" "$(readlink "$f")"
++ fi
+ elif [[ -d $f ]]; then
+ add_full_dir "$f"
+ elif [[ -f $f ]]; then
+- [[ $f = $filter ]] && add_file "$f"
++ if [[ $f = $filter ]]; then
++ add_file "$f"
++ fi
+ fi
+ done
+ fi
+--
+2.1.0
+
Copied: mkinitcpio/repos/core-i686/PKGBUILD (from rev 243304, mkinitcpio/trunk/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2015-08-12 10:12:20 UTC (rev 243305)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=18
+pkgrel=2
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url="https://projects.archlinux.org/mkinitcpio.git/"
+license=('GPL')
+depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive'
+ 'coreutils' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd')
+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'
+ 'lz4: Use lz4 compression for the initramfs image'
+ 'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
+backup=('etc/mkinitcpio.conf')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+ '0001-avoid-compound-conditional-leading-to-spurious-error.patch')
+install=mkinitcpio.install
+sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22'
+ 'SKIP'
+ 'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53') # Dave Reisner
+
+prepare() {
+ patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
Copied: mkinitcpio/repos/core-i686/mkinitcpio.install (from rev 243304, mkinitcpio/trunk/mkinitcpio.install)
===================================================================
--- core-i686/mkinitcpio.install (rev 0)
+++ core-i686/mkinitcpio.install 2015-08-12 10:12:20 UTC (rev 243305)
@@ -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/core-x86_64/0001-avoid-compound-conditional-leading-to-spurious-error.patch (from rev 243304, mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch)
===================================================================
--- core-x86_64/0001-avoid-compound-conditional-leading-to-spurious-error.patch (rev 0)
+++ core-x86_64/0001-avoid-compound-conditional-leading-to-spurious-error.patch 2015-08-12 10:12:20 UTC (rev 243305)
@@ -0,0 +1,39 @@
+From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Mon, 4 Aug 2014 08:31:37 -0400
+Subject: [mkinitcpio] [PATCH] avoid compound conditional leading to spurious
+ "errors"
+
+As seen:
+
+https://bbs.archlinux.org/viewtopic.php?id=185204
+https://bbs.archlinux.org/viewtopic.php?id=185265
+---
+ functions | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/functions b/functions
+index 20bbffe..362d07b 100644
+--- a/functions
++++ b/functions
+@@ -423,11 +423,15 @@ add_full_dir() {
+
+ for f in "$1"/*; do
+ if [[ -L $f ]]; then
+- [[ $f = $filter ]] && add_symlink "$f" "$(readlink "$f")"
++ if [[ $f = $filter ]]; then
++ add_symlink "$f" "$(readlink "$f")"
++ fi
+ elif [[ -d $f ]]; then
+ add_full_dir "$f"
+ elif [[ -f $f ]]; then
+- [[ $f = $filter ]] && add_file "$f"
++ if [[ $f = $filter ]]; then
++ add_file "$f"
++ fi
+ fi
+ done
+ fi
+--
+2.1.0
+
Copied: mkinitcpio/repos/core-x86_64/PKGBUILD (from rev 243304, mkinitcpio/trunk/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2015-08-12 10:12:20 UTC (rev 243305)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=18
+pkgrel=2
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url="https://projects.archlinux.org/mkinitcpio.git/"
+license=('GPL')
+depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive'
+ 'coreutils' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd')
+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'
+ 'lz4: Use lz4 compression for the initramfs image'
+ 'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
+backup=('etc/mkinitcpio.conf')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+ '0001-avoid-compound-conditional-leading-to-spurious-error.patch')
+install=mkinitcpio.install
+sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22'
+ 'SKIP'
+ 'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53') # Dave Reisner
+
+prepare() {
+ patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
Copied: mkinitcpio/repos/core-x86_64/mkinitcpio.install (from rev 243304, mkinitcpio/trunk/mkinitcpio.install)
===================================================================
--- core-x86_64/mkinitcpio.install (rev 0)
+++ core-x86_64/mkinitcpio.install 2015-08-12 10:12:20 UTC (rev 243305)
@@ -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
+}
More information about the arch-commits
mailing list