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

2020-07-16 Thread Giancarlo Razzolini via arch-commits 
Date: Thursday, July 16, 2020 @ 14:16:57
  Author: grazzolini
Revision: 391963

upgpkg: mkinitcpio 28-1

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  mkinitcpio/trunk/0001-mkinitcpio-remove-preset-pacsave.patch

-+
 0001-mkinitcpio-remove-preset-pacsave.patch |   59 --
 PKGBUILD|   20 +++-
 2 files changed, 8 insertions(+), 71 deletions(-)

Deleted: 0001-mkinitcpio-remove-preset-pacsave.patch
===
--- 0001-mkinitcpio-remove-preset-pacsave.patch 2020-07-16 13:18:23 UTC (rev 
391962)
+++ 0001-mkinitcpio-remove-preset-pacsave.patch 2020-07-16 14:16:57 UTC (rev 
391963)
@@ -1,59 +0,0 @@
-diff --git a/libalpm/scripts/mkinitcpio-remove 
b/libalpm/scripts/mkinitcpio-remove
-index 86838e4..17b4b31 100644
 a/libalpm/scripts/mkinitcpio-remove
-+++ b/libalpm/scripts/mkinitcpio-remove
-@@ -2,6 +2,20 @@
- 
- package=0
- 
-+process_preset() {
-+if [[ -n "${pkgbase}" && -e $preset ]]; then
-+if ! cmp $preset > /dev/null 2>&1 <(sed "s|%PKGBASE%|${pkgbase}|g" 
/usr/share/mkinitcpio/hook.preset); then
-+if [[ ! -e $preset.pacsave ]]; then
-+# save the preset as pacsave
-+mv $preset $preset.pacsave && return 0
-+fi
-+else
-+# remove the preset
-+rm $preset && return 0
-+fi
-+fi
-+}
-+
- while read -r line; do
- if [[ $line != */vmlinuz ]]; then
- # triggers when it's a change to usr/lib/initcpio/*
-@@ -23,17 +37,25 @@ while read -r line; do
- # remove the installed kernel
- rm $kernel
- fi
--if [[ -e $preset ]]; then
--# remove the preset
--rm $preset
-+
-+process_preset "${pkgbase}" $preset
-+
-+if [[ -e $initramfs ]]; then
-+# remove the main image
-+rm $initramfs
- fi
--if [[ -e $initramfs && -e $fallback_initramfs ]]; then
--# remove the images
--rm $initramfs $fallback_initramfs
-+if [[ -e $fallback_initramfs ]]; then
-+# remove the fallback image
-+rm $fallback_initramfs
- fi
- done
- 
- if (( package )) && compgen -G /etc/mkinitcpio.d/"*.preset" > /dev/null; then
--# remove all presets
--rm /etc/mkinitcpio.d/*.preset
-+shopt -s nullglob
-+for preset in /etc/mkinitcpio.d/*.preset; do
-+pkgbase=${preset##*/}
-+pkgbase=${pkgbase%.preset}
-+process_preset "${pkgbase}" $preset
-+done
-+shopt -u nullglob
- fi

Modified: PKGBUILD
===
--- PKGBUILD2020-07-16 13:18:23 UTC (rev 391962)
+++ PKGBUILD2020-07-16 14:16:57 UTC (rev 391963)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler 
 
 pkgname=mkinitcpio
-pkgver=27
-pkgrel=4
+pkgver=28
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/;
@@ -18,21 +18,17 @@
 'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 provides=('initramfs')
 backup=('etc/mkinitcpio.conf')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-"0001-mkinitcpio-remove-preset-pacsave.patch")
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 install=mkinitcpio.install
-sha256sums=('e6bff1cb78b677538eb9aace900b715fd59de8fc210b74fb9d899dfaa32bc354'
-'SKIP'
-'845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51')
+sha256sums=('bf83a158786d272d8046a4dd48bfcc343ec37de2cae0ae65c59132a45744808c'
+'SKIP')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
   '86CFFCA918CF3AF47147588051E8B148AC34'   # Evangelos Foutras
   'ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB')  # Giancarlo 
Razzolini
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Apply 0001-mkinitcpio-remove-preset-pacsave.patch
-  patch -Np1 < $srcdir/0001-mkinitcpio-remove-preset-pacsave.patch
-}
+# prepare() {
+#   cd $pkgname-$pkgver
+# }
 
 check() {
   make -C "$pkgname-$pkgver" check

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

2019-11-06 Thread Giancarlo Razzolini via arch-commits 
Date: Wednesday, November 6, 2019 @ 20:33:27
  Author: grazzolini
Revision: 366885

upgpkg: mkinitcpio 27-2

Added a hotfix for saving presets that were changed.

Added:
  mkinitcpio/trunk/0001-mkinitcpio-remove-preset-pacsave.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-+
 0001-mkinitcpio-remove-preset-pacsave.patch |   59 ++
 PKGBUILD|   18 +--
 2 files changed, 72 insertions(+), 5 deletions(-)

Added: 0001-mkinitcpio-remove-preset-pacsave.patch
===
--- 0001-mkinitcpio-remove-preset-pacsave.patch (rev 0)
+++ 0001-mkinitcpio-remove-preset-pacsave.patch 2019-11-06 20:33:27 UTC (rev 
366885)
@@ -0,0 +1,59 @@
+diff --git a/libalpm/scripts/mkinitcpio-remove 
b/libalpm/scripts/mkinitcpio-remove
+index 86838e4..17b4b31 100644
+--- a/libalpm/scripts/mkinitcpio-remove
 b/libalpm/scripts/mkinitcpio-remove
+@@ -2,6 +2,20 @@
+ 
+ package=0
+ 
++process_preset() {
++if [[ -n "${pkgbase}" && -e $preset ]]; then
++if ! cmp $preset > /dev/null 2>&1 <(sed "s|%PKGBASE%|${pkgbase}|g" 
/usr/share/mkinitcpio/hook.preset); then
++if [[ ! -e $preset.pacsave ]]; then
++# save the preset as pacsave
++mv $preset $preset.pacsave && return 0
++fi
++else
++# remove the preset
++rm $preset && return 0
++fi
++fi
++}
++
+ while read -r line; do
+ if [[ $line != */vmlinuz ]]; then
+ # triggers when it's a change to usr/lib/initcpio/*
+@@ -23,17 +37,25 @@ while read -r line; do
+ # remove the installed kernel
+ rm $kernel
+ fi
+-if [[ -e $preset ]]; then
+-# remove the preset
+-rm $preset
++
++process_preset "${pkgbase}" $preset
++
++if [[ -e $initramfs ]]; then
++# remove the main image
++rm $initramfs
+ fi
+-if [[ -e $initramfs && -e $fallback_initramfs ]]; then
+-# remove the images
+-rm $initramfs $fallback_initramfs
++if [[ -e $fallback_initramfs ]]; then
++# remove the fallback image
++rm $fallback_initramfs
+ fi
+ done
+ 
+ if (( package )) && compgen -G /etc/mkinitcpio.d/"*.preset" > /dev/null; then
+-# remove all presets
+-rm /etc/mkinitcpio.d/*.preset
++shopt -s nullglob
++for preset in /etc/mkinitcpio.d/*.preset; do
++pkgbase=${preset##*/}
++pkgbase=${pkgbase%.preset}
++process_preset "${pkgbase}" $preset
++done
++shopt -u nullglob
+ fi

Modified: PKGBUILD
===
--- PKGBUILD2019-11-06 19:53:37 UTC (rev 366884)
+++ PKGBUILD2019-11-06 20:33:27 UTC (rev 366885)
@@ -4,13 +4,13 @@
 
 pkgname=mkinitcpio
 pkgver=27
-pkgrel=1
+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')
+depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 
'libarchive' 'coreutils'
+ 'bash' 'diffutils' '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'
@@ -18,14 +18,22 @@
 'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 provides=('initramfs')
 backup=('etc/mkinitcpio.conf')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+"0001-mkinitcpio-remove-preset-pacsave.patch")
 install=mkinitcpio.install
 sha256sums=('e6bff1cb78b677538eb9aace900b715fd59de8fc210b74fb9d899dfaa32bc354'
-'SKIP')
+'SKIP'
+'845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
   '86CFFCA918CF3AF47147588051E8B148AC34'   # Evangelos Foutras
   'ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB')  # Giancarlo 
Razzolini
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Apply 0001-mkinitcpio-remove-preset-pacsave.patch
+  patch -Np1 < $srcdir/0001-mkinitcpio-remove-preset-pacsave.patch
+}
+
 check() {
   make -C "$pkgname-$pkgver" check
 }

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

2018-10-09 Thread Dave Reisner via arch-commits 
Date: Tuesday, October 9, 2018 @ 14:18:46
  Author: dreisner
Revision: 336057

upgpkg: mkinitcpio 24-3

- backport fix for https://bugs.archlinux.org/task/60272

Added:
  
mkinitcpio/trunk/0001-install-block-avoid-conditional-addition-of-drivers.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

+
 0001-install-block-avoid-conditional-addition-of-drivers.patch |   65 
++
 PKGBUILD   |9 -
 2 files changed, 71 insertions(+), 3 deletions(-)

Added: 0001-install-block-avoid-conditional-addition-of-drivers.patch
===
--- 0001-install-block-avoid-conditional-addition-of-drivers.patch  
(rev 0)
+++ 0001-install-block-avoid-conditional-addition-of-drivers.patch  
2018-10-09 14:18:46 UTC (rev 336057)
@@ -0,0 +1,65 @@
+From a3cb799a8f63186b843db6a57da12d74a9320686 Mon Sep 17 00:00:00 2001
+From: Dave Reisner 
+Date: Mon, 8 Oct 2018 19:45:11 -0400
+Subject: [subjectprefix = mkinitcpio] [PATCH] install/block: avoid conditional
+ addition of drivers
+
+Avoid over-optimizing autodetect and always add these. This allows
+storage drivers to be builtins and still trigger addition of the block
+node driver.
+---
+ install/block | 25 -
+ 1 file changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/install/block b/install/block
+index d9c627f..11c4665 100644
+--- a/install/block
 b/install/block
+@@ -2,36 +2,27 @@
+ 
+ build() {
+ local filter
+-local -A blockdevs
++
++map add_module sd_mod? sr_mod? usb_storage? mmc_block? firewire-sbp2? 
virtio_blk?
+ 
+ # pata, sata, scsi, nvme
+ for filter in 'scsi/.*ata' '/(block|scsi|fusion|nvme)/' 'ata/[ps]ata_' \
+ 'ata/(ahci|pdc_adma|ata_piix|ata_generic)'; do
+-add_checked_modules "$filter" && blockdevs['sd_mod']=1
++add_checked_modules "$filter"
+ done
+ 
+ # usb
+-if add_checked_modules -f '(_cs|sl811_hcd|isp116x_hcd)' '/usb/host'; then
+-blockdevs+=(['usb_storage?']=1 ['sd_mod?']=1 ['sr_mod?']=1)
+-add_checked_modules '/drivers/usb/storage/'
+-fi
++add_checked_modules -f '(_cs|sl811_hcd|isp116x_hcd)' '/usb/host'
++add_checked_modules '/drivers/usb/storage/'
+ 
+ # firewire
+-if add_checked_modules '/drivers/firewire/'; then
+-blockdevs+=(['firewire-sbp2?']=1 ['sd_mod?']=1 ['sr_mod?']=1)
+-fi
++add_checked_modules '/drivers/firewire/'
+ 
+ # mmc
+-if add_checked_modules '/(mmc|tifm_)'; then
+-blockdevs+=(['mmc_block?']=1)
+-fi
++add_checked_modules '/(mmc|tifm_)'
+ 
+ # virtio
+-if add_checked_modules 'virtio'; then
+-blockdevs['virtio_blk?']=1
+-fi
+-
+-map add_module "${!blockdevs[@]}"
++add_checked_modules 'virtio'
+ }
+ 
+ help() {
+-- 
+2.19.0
+

Modified: PKGBUILD
===
--- PKGBUILD2018-10-09 12:45:42 UTC (rev 336056)
+++ PKGBUILD2018-10-09 14:18:46 UTC (rev 336057)
@@ -3,7 +3,7 @@
 
 pkgname=mkinitcpio
 pkgver=24
-pkgrel=2
+pkgrel=3
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,11 +17,13 @@
 '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-Restore-addition-of-modules-from-config-file.patch)
+0001-Restore-addition-of-modules-from-config-file.patch
+0001-install-block-avoid-conditional-addition-of-drivers.patch)
 install=mkinitcpio.install
 sha256sums=('ec0ecbc518c14ecacf5a8ece2f068fe86fcaf3aed09ee6b82737e773e5d7d02b'
 'SKIP'
-'d4cbbf7b05f5dcaf23139469376ff6c29e948ce77a8c51ad4867413b4bddc4db')
+'d4cbbf7b05f5dcaf23139469376ff6c29e948ce77a8c51ad4867413b4bddc4db'
+'2ef47f6068323494bfc3181d8d34a732f8947775f6ff6e595e6f3eb4190df76e')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
   '86CFFCA918CF3AF47147588051E8B148AC34')  # Evangelos Foutras
 
@@ -29,6 +31,7 @@
   cd "$pkgname-$pkgver"
 
   patch -Np1 <"$srcdir"/0001-Restore-addition-of-modules-from-config-file.patch
+  patch -Np1 
<"$srcdir"/0001-install-block-avoid-conditional-addition-of-drivers.patch
 }
 
 check() {

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

2017-10-06 Thread Dave Reisner 
Date: Friday, October 6, 2017 @ 19:29:31
  Author: dreisner
Revision: 307063

upgpkg: mkinitcpio 24-2

- fix handling of MODULES in early config (FS#55870)

Added:
  mkinitcpio/trunk/0001-Restore-addition-of-modules-from-config-file.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-+
 0001-Restore-addition-of-modules-from-config-file.patch |   39 ++
 PKGBUILD|   14 +++--
 2 files changed, 50 insertions(+), 3 deletions(-)

Added: 0001-Restore-addition-of-modules-from-config-file.patch
===
--- 0001-Restore-addition-of-modules-from-config-file.patch 
(rev 0)
+++ 0001-Restore-addition-of-modules-from-config-file.patch 2017-10-06 
19:29:31 UTC (rev 307063)
@@ -0,0 +1,39 @@
+From 5bba09cb1c661627fde76b977cfe9f937b1264a3 Mon Sep 17 00:00:00 2001
+From: Dave Reisner 
+Date: Fri, 6 Oct 2017 08:15:43 -0400
+Subject: [mkinitcpio] [PATCH] Restore addition of modules from config file
+
+Broken by c5ad00c2.
+
+ref: https://bugs.archlinux.org/task/55870
+---
+ functions | 11 ++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 1486f2f..ba95e80 100644
+--- a/functions
 b/functions
+@@ -627,9 +627,18 @@ parse_config() {
+ map add_file "${FILES[@]}"
+ 
+ tee "$BUILDROOT/buildconfig" < "$1" | {
++# When MODULES is not an array (but instead implicitly converted at
++# startup), sourcing the config causes the string value of MODULES
++# to be assigned as MODULES[0]. Avoid this by explicitly unsetting
++# MODULES before re-sourcing the config.
++unset MODULES
++
+ . /dev/stdin
+ 
+-for mod in "${modules[@]%\?}"; do
++# arrayize MODULES if necessary.
++[[ ${MODULES@a} != *a* ]] && read -ra MODULES <<<"${MODULES//-/_}"
++
++for mod in "${MODULES[@]%\?}"; do
+ mod=${mod//-/_}
+ # only add real modules (2 == builtin)
+ (( _addedmodules["$mod"] == 1 )) && add+=("$mod")
+-- 
+2.14.2
+

Modified: PKGBUILD
===
--- PKGBUILD2017-10-06 19:20:31 UTC (rev 307062)
+++ PKGBUILD2017-10-06 19:29:31 UTC (rev 307063)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=24
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,13 +17,21 @@
 '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})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+0001-Restore-addition-of-modules-from-config-file.patch)
 install=mkinitcpio.install
 sha256sums=('ec0ecbc518c14ecacf5a8ece2f068fe86fcaf3aed09ee6b82737e773e5d7d02b'
-'SKIP')
+'SKIP'
+'d4cbbf7b05f5dcaf23139469376ff6c29e948ce77a8c51ad4867413b4bddc4db')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
   '86CFFCA918CF3AF47147588051E8B148AC34')  # Evangelos Foutras
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir"/0001-Restore-addition-of-modules-from-config-file.patch
+}
+
 check() {
   make -C "$pkgname-$pkgver" check
 }

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

2017-09-04 Thread Bartłomiej Piotrowski 
Date: Monday, September 4, 2017 @ 08:49:11
  Author: bpiotrowski
Revision: 304643

23-2: make ldd parsing compatible with upstream glibc changes

Added:
  
mkinitcpio/trunk/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-+
 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch |   31 
++
 PKGBUILD|   13 +++-
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
===
--- 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch 
(rev 0)
+++ 0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch 
2017-09-04 08:49:11 UTC (rev 304643)
@@ -0,0 +1,31 @@
+From 32dbf895d07f07e32d2b3bb4afb132eea1919749 Mon Sep 17 00:00:00 2001
+From: Dave Reisner 
+Date: Mon, 21 Aug 2017 21:33:22 -0400
+Subject: [PATCH] make ldd parsing compatible with upstream glibc changes
+
+https://sourceware.org/git/?p=glibc.git;a=commit;h=eedca9772e99c72ab4c3c34e43cc764250aa3e3c
+---
+ functions | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/functions b/functions
+index 0e1fe0f..941312f 100644
+--- a/functions
 b/functions
+@@ -598,10 +598,10 @@ add_binary() {
+ ! lddout=$(ldd "$binary" 2>/dev/null) && return 0
+ 
+ # resolve sodeps
+-regex='(/.+) \(0x[a-fA-F0-9]+\)'
+-while read line; do
++regex='^(|.+ )(/.+) \(0x[a-fA-F0-9]+\)'
++while read -r line; do
+ if [[ $line =~ $regex ]]; then
+-sodep=${BASH_REMATCH[1]}
++sodep=${BASH_REMATCH[2]}
+ elif [[ $line = *'not found' ]]; then
+ error "binary dependency \`%s' not found for \`%s'" "${line%% *}" 
"$1"
+ (( ++_builderrors ))
+-- 
+2.14.1
+

Modified: PKGBUILD
===
--- PKGBUILD2017-09-04 07:38:24 UTC (rev 304642)
+++ PKGBUILD2017-09-04 08:49:11 UTC (rev 304643)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=23
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,13 +17,20 @@
 '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})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+'0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch')
 install=mkinitcpio.install
 sha256sums=('80f12a07f0dceef81dfe87200f099bd2149e0990391dda6defebaa5697f8a35a'
-'SKIP')
+'SKIP'
+'f534892af930abf8164eead271dc012e42a552362fbb459e55e04d4a68b52a66')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
   '86CFFCA918CF3AF47147588051E8B148AC34')  # Evangelos Foutras
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 -i 
../0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
+}
+
 check() {
   make -C "$pkgname-$pkgver" check
 }

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

2016-01-19 Thread Evangelos Foutras 
Date: Wednesday, January 20, 2016 @ 08:55:11
  Author: foutrelis
Revision: 258437

upgpkg: mkinitcpio 19-1

New upstream release.

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  
mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch

-+
 0001-avoid-compound-conditional-leading-to-spurious-error.patch |   39 
--
 PKGBUILD|   19 +---
 2 files changed, 7 insertions(+), 51 deletions(-)

Deleted: 0001-avoid-compound-conditional-leading-to-spurious-error.patch
===
--- 0001-avoid-compound-conditional-leading-to-spurious-error.patch 
2016-01-20 06:57:33 UTC (rev 258436)
+++ 0001-avoid-compound-conditional-leading-to-spurious-error.patch 
2016-01-20 07:55:11 UTC (rev 258437)
@@ -1,39 +0,0 @@
-From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001
-From: Dave Reisner 
-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
-

Modified: PKGBUILD
===
--- PKGBUILD2016-01-20 06:57:33 UTC (rev 258436)
+++ PKGBUILD2016-01-20 07:55:11 UTC (rev 258437)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler 
 
 pkgname=mkinitcpio
-pkgver=18
-pkgrel=2
+pkgver=19
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,18 +17,13 @@
 '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')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 install=mkinitcpio.install
-sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22'
-'SKIP'
-'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341')
-validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53')  # Dave Reisner
+sha256sums=('7170e7a3d1b9ed21b0961941a327886febe80e62e2dfee6b88359ed72d0da620'
+'SKIP')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'   # Dave Reisner
+  '86CFFCA918CF3AF47147588051E8B148AC34')  # Evangelos Foutras
 
-prepare() {
-  patch -d "$pkgname-$pkgver" -Np1 
<0001-avoid-compound-conditional-leading-to-spurious-error.patch
-}
-
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }

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

2014-09-05 Thread Dave Reisner 
Date: Friday, September 5, 2014 @ 14:56:09
  Author: dreisner
Revision: 220998

upgpkg: mkinitcpio 18-2

- backport fix for FS#41468

Added:
  
mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-+
 0001-avoid-compound-conditional-leading-to-spurious-error.patch |   39 
++
 PKGBUILD|   12 ++-
 2 files changed, 48 insertions(+), 3 deletions(-)

Added: 0001-avoid-compound-conditional-leading-to-spurious-error.patch
===
--- 0001-avoid-compound-conditional-leading-to-spurious-error.patch 
(rev 0)
+++ 0001-avoid-compound-conditional-leading-to-spurious-error.patch 
2014-09-05 12:56:09 UTC (rev 220998)
@@ -0,0 +1,39 @@
+From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@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
+

Modified: PKGBUILD
===
--- PKGBUILD2014-09-05 09:01:12 UTC (rev 220997)
+++ PKGBUILD2014-09-05 12:56:09 UTC (rev 220998)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=18
-pkgrel=1
+pkgrel=2
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,11 +17,17 @@
 'lz4: Use lz4 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-avoid-compound-conditional-leading-to-spurious-error.patch')
 install=mkinitcpio.install
 sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22'
-'SKIP')
+'SKIP'
+'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341')
 
+prepare() {
+  patch -d $pkgname-$pkgver -Np1 
0001-avoid-compound-conditional-leading-to-spurious-error.patch
+}
+
 package() {
   make -C $pkgname-$pkgver DESTDIR=$pkgdir install
 }

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

2014-03-08 Thread Dave Reisner 
Date: Saturday, March 8, 2014 @ 20:13:06
  Author: dreisner
Revision: 207419

upgpkg: mkinitcpio 17-1

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  mkinitcpio/trunk/0001-Add-l-flag-when-using-lz4-compression.patch

--+
 0001-Add-l-flag-when-using-lz4-compression.patch |   61 -
 PKGBUILD |   16 +
 2 files changed, 5 insertions(+), 72 deletions(-)

Deleted: 0001-Add-l-flag-when-using-lz4-compression.patch
===
--- 0001-Add-l-flag-when-using-lz4-compression.patch2014-03-08 18:51:10 UTC 
(rev 207418)
+++ 0001-Add-l-flag-when-using-lz4-compression.patch2014-03-08 19:13:06 UTC 
(rev 207419)
@@ -1,61 +0,0 @@
-From 2ce3a416c8714adedc3117e5247e6da364ddebc9 Mon Sep 17 00:00:00 2001
-From: Dave Reisner dreis...@archlinux.org
-Date: Sun, 22 Dec 2013 14:11:37 -0500
-Subject: [mkinitcpio] [PATCH] Add -l flag when using lz4 compression
-
-This isn't documented, but it's needed since the kernel lz4 support is
-based on the original streaming format and not the newer default. Use
--l to force the legacy codec.
-
-Fixup lsinitcpio to support the older format, and, add a warning when
-the newer format is detected. Who knows when this will be resolved ...
-
-Upstream discussion: https://code.google.com/p/lz4/issues/detail?id=102

- lsinitcpio | 15 +++
- mkinitcpio |  3 +++
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/lsinitcpio b/lsinitcpio
-index 10cd663..9d98d57 100755
 a/lsinitcpio
-+++ b/lsinitcpio
-@@ -91,10 +91,17 @@ detect_filetype() {
- return
- fi
- 
--if [[ $(hexdump -n 4 -e '%x' $1) == '184d2204' ]]; then
--echo 'lz4'
--return
--fi
-+case $(hexdump -n 4 -e '%x' $1) in
-+184d2204)
-+error 'Newer lz4 stream format detected! This may not boot!'
-+echo 'lz4'
-+return
-+;;
-+184c2102)
-+echo 'lz4 -l'
-+return
-+;;
-+esac
- 
- if [[ $(hexdump -n 3 -e '%c' $1) == 'BZh' ]]; then
- echo 'bzip2'
-diff --git a/mkinitcpio b/mkinitcpio
-index cb94d62..42abde7 100755
 a/mkinitcpio
-+++ b/mkinitcpio
-@@ -202,6 +202,9 @@ build_image() {
- xz)
- COMPRESSION_OPTIONS+=' --check=crc32'
- ;;
-+lz4)
-+COMPRESSION_OPTIONS+=' -l'
-+;;
- esac
- 
- cpio_opts=('-0' '-o' '-H' 'newc')
--- 
-1.8.5.2
-

Modified: PKGBUILD
===
--- PKGBUILD2014-03-08 18:51:10 UTC (rev 207418)
+++ PKGBUILD2014-03-08 19:13:06 UTC (rev 207419)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler tho...@archlinux.org
 
 pkgname=mkinitcpio
-pkgver=16
-pkgrel=2
+pkgver=17
+pkgrel=1
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,17 +17,11 @@
 'lz4: Use lz4 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-Add-l-flag-when-using-lz4-compression.patch)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
 install=mkinitcpio.install
-sha256sums=('10821e533eb1ca51a9d3c1d06d8999c08a6151910a9a6029a45ff1638e9228a2'
-'SKIP'
-'e8dd2d3fb29e6c41bed53be2f8659a7e5daeae3c9495d8527b6b938787c54703')
+sha256sums=('904821a027fdda26bb7150887680f3b751351ff37dc5e409dcb839e4733906ce'
+'SKIP')
 
-prepare() {
-  patch -d $pkgname-$pkgver -Np1 
$srcdir/0001-Add-l-flag-when-using-lz4-compression.patch
-}
-
 package() {
   make -C $pkgname-$pkgver DESTDIR=$pkgdir install
 }

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

2013-12-22 Thread Dave Reisner 
Date: Sunday, December 22, 2013 @ 20:37:03
  Author: dreisner
Revision: 202622

upgpkg: mkinitcpio 16-2

- backport fix lz4 support

Added:
  mkinitcpio/trunk/0001-Add-l-flag-when-using-lz4-compression.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

--+
 0001-Add-l-flag-when-using-lz4-compression.patch |   61 +
 PKGBUILD |   12 +++-
 2 files changed, 70 insertions(+), 3 deletions(-)

Added: 0001-Add-l-flag-when-using-lz4-compression.patch
===
--- 0001-Add-l-flag-when-using-lz4-compression.patch
(rev 0)
+++ 0001-Add-l-flag-when-using-lz4-compression.patch2013-12-22 19:37:03 UTC 
(rev 202622)
@@ -0,0 +1,61 @@
+From 2ce3a416c8714adedc3117e5247e6da364ddebc9 Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Sun, 22 Dec 2013 14:11:37 -0500
+Subject: [mkinitcpio] [PATCH] Add -l flag when using lz4 compression
+
+This isn't documented, but it's needed since the kernel lz4 support is
+based on the original streaming format and not the newer default. Use
+-l to force the legacy codec.
+
+Fixup lsinitcpio to support the older format, and, add a warning when
+the newer format is detected. Who knows when this will be resolved ...
+
+Upstream discussion: https://code.google.com/p/lz4/issues/detail?id=102
+---
+ lsinitcpio | 15 +++
+ mkinitcpio |  3 +++
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/lsinitcpio b/lsinitcpio
+index 10cd663..9d98d57 100755
+--- a/lsinitcpio
 b/lsinitcpio
+@@ -91,10 +91,17 @@ detect_filetype() {
+ return
+ fi
+ 
+-if [[ $(hexdump -n 4 -e '%x' $1) == '184d2204' ]]; then
+-echo 'lz4'
+-return
+-fi
++case $(hexdump -n 4 -e '%x' $1) in
++184d2204)
++error 'Newer lz4 stream format detected! This may not boot!'
++echo 'lz4'
++return
++;;
++184c2102)
++echo 'lz4 -l'
++return
++;;
++esac
+ 
+ if [[ $(hexdump -n 3 -e '%c' $1) == 'BZh' ]]; then
+ echo 'bzip2'
+diff --git a/mkinitcpio b/mkinitcpio
+index cb94d62..42abde7 100755
+--- a/mkinitcpio
 b/mkinitcpio
+@@ -202,6 +202,9 @@ build_image() {
+ xz)
+ COMPRESSION_OPTIONS+=' --check=crc32'
+ ;;
++lz4)
++COMPRESSION_OPTIONS+=' -l'
++;;
+ esac
+ 
+ cpio_opts=('-0' '-o' '-H' 'newc')
+-- 
+1.8.5.2
+

Modified: PKGBUILD
===
--- PKGBUILD2013-12-22 17:27:11 UTC (rev 202621)
+++ PKGBUILD2013-12-22 19:37:03 UTC (rev 202622)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=16
-pkgrel=1
+pkgrel=2
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=https://projects.archlinux.org/mkinitcpio.git/;
@@ -17,11 +17,17 @@
 'lz4: Use lz4 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-Add-l-flag-when-using-lz4-compression.patch)
 install=mkinitcpio.install
 sha256sums=('10821e533eb1ca51a9d3c1d06d8999c08a6151910a9a6029a45ff1638e9228a2'
-'SKIP')
+'SKIP'
+'e8dd2d3fb29e6c41bed53be2f8659a7e5daeae3c9495d8527b6b938787c54703')
 
+prepare() {
+  patch -d $pkgname-$pkgver -Np1 
$srcdir/0001-Add-l-flag-when-using-lz4-compression.patch
+}
+
 package() {
   make -C $pkgname-$pkgver DESTDIR=$pkgdir install
 }

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

2013-01-25 Thread 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 dreis...@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 dreis...@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
===
--- PKGBUILD2013-01-25 12:48:04 UTC (rev 175961)
+++ PKGBUILD2013-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() {

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

2012-12-07 Thread 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 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
+

Modified: PKGBUILD
===
--- PKGBUILD2012-12-07 21:31:34 UTC (rev 172975)
+++ PKGBUILD2012-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
 }

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

2012-02-24 Thread Dave Reisner 
Date: Friday, February 24, 2012 @ 08:49:14
  Author: dreisner
Revision: 151035

upgpkg: mkinitcpio 0.8.3-1

Dave Reisner (22):
  fsck: add helper for usr if different fs from root
  man: replace refs to kernel26 with linux, et al
  shutdown: make reboot the default action
  mkinitcpio: obsolete install as a buildhook function
  install/base: drop support for m-i-t
  mkinitcpio.conf: add note about separate /usr, fsck as default
  avoid absolute paths in add_binary calls
  autodetect: remove hack to exclude {ata,ide}-generic
  function: avoid applying --try to all modules
  init_functions: avoid using fsck_ret to check 0
  init: use fastboot, not skip to avoid fsck
  fsck: fix copypasta error in picking /usr fsck helper
  memdisk: use blkid builtin
  udev: remove hooks
  autodetect: refactor raid device detection
  mkinitcpio: catch more buildtime errors
  mkinitcpio: install all modules to a single dir
  lsinitcpio: detect kver separate from modules
  lsinitcpio: trim binaries during discovery
  autodetect: resolve guessed filesystem modules
  use --tab-file flag for findmnt -s
  README: fix email address

Tom Gundersen (1):
  mkinitcpio: unzip modules before image compression

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  mkinitcpio/trunk/0001-autodetect-resolve-guessed-filesystem-modules.patch

--+
 0001-autodetect-resolve-guessed-filesystem-modules.patch |   45 -
 PKGBUILD |   23 +-
 2 files changed, 6 insertions(+), 62 deletions(-)

Deleted: 0001-autodetect-resolve-guessed-filesystem-modules.patch
===
--- 0001-autodetect-resolve-guessed-filesystem-modules.patch2012-02-24 
13:48:50 UTC (rev 151034)
+++ 0001-autodetect-resolve-guessed-filesystem-modules.patch2012-02-24 
13:49:14 UTC (rev 151035)
@@ -1,45 +0,0 @@
-From be9a42675f3ea125c9daa45986a3b58ba8bae226 Mon Sep 17 00:00:00 2001
-From: Dave Reisner dreis...@archlinux.org
-Date: Tue, 21 Feb 2012 16:47:56 -0500
-Subject: [PATCH] autodetect: resolve guessed filesystem modules
-
-Trading out modinfo for modprobe allows us to detect filesystems like
-ext2 and ext3 which might be aliased to ext4 in the case of Kconfig
-CONFIG_EXT4_USE_FOR_EXT23 being enabled. Maybe this catches other insane
-corner cases, too.
-
-Since we now treat this as possible aliases, we also need to be mindful
-of the fact that it could resolve to multiple module names. Assign the
-output as an array to respect this.
-
-Fixes FS#28569.
-
-Signed-off-by: Dave Reisner dreis...@archlinux.org

- install/autodetect |   10 --
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/install/autodetect b/install/autodetect
-index 5cc908c..cc12124 100644
 a/install/autodetect
-+++ b/install/autodetect
-@@ -7,8 +7,14 @@ build() {
- MODULE_FILE=$workdir/autodetect_modules
- 
- add_if_avail() {
--if modinfo -k $KERNELVERSION $1 /dev/null; then
--printf '%s\n' $1 $MODULE_FILE
-+local resolved
-+
-+# treat this as an alias, since ext3 might be aliased to ext4.
-+IFS=$'\n' read -rd '' -a resolved  \
-+(modprobe -S $KERNELVERSION -R $1 2/dev/null)
-+
-+if (( ${#resolved[*]} )); then
-+printf '%s\n' ${resolved[@]} $MODULE_FILE
- fi
- }
- 
--- 
-1.7.9.1
-

Modified: PKGBUILD
===
--- PKGBUILD2012-02-24 13:48:50 UTC (rev 151034)
+++ PKGBUILD2012-02-24 13:49:14 UTC (rev 151035)
@@ -3,39 +3,28 @@
 # Maintainer: Thomas Bächler tho...@archlinux.org
 
 pkgname=mkinitcpio
-pkgver=0.8.2
-pkgrel=3
+pkgver=0.8.3
+pkgrel=1
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=http://www.archlinux.org/;
 license=('GPL')
-depends=('mkinitcpio-busybox=1.16.1-2' 'kmod=3' 'util-linux=2.20.1-2' 
'libarchive' 'coreutils'
+depends=('mkinitcpio-busybox=1.16.1-2' 'kmod=3' 'util-linux=2.21' 
'libarchive' 'coreutils'
  'bash' 'findutils' 'sed' 'grep' 'filesystem=2011.10-1' 'file' 'gzip')
 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;
-'0001-autodetect-resolve-guessed-filesystem-modules.patch')
-md5sums=('2e0ac0c657ca7a78aa0583b3368c0e44'
- '9a5f9cf5e9ca429824e927662a5095ea')
-sha256sums=('9a951f9e2a158b65840f476c1b9e1e45c7b06383a90f182f76eab64bd3a398cb'
-'769e7a5eabb9b77802b1b55f4d123566e13c26dc4966189e4101a38069b6fe8f')

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

2012-02-21 Thread Dave Reisner 
Date: Tuesday, February 21, 2012 @ 21:06:44
  Author: dreisner
Revision: 150779

upgpkg: mkinitcpio 0.8.2-3

- backport patch to fix FS#28569

Added:
  mkinitcpio/trunk/0001-autodetect-resolve-guessed-filesystem-modules.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

--+
 0001-autodetect-resolve-guessed-filesystem-modules.patch |   45 +
 PKGBUILD |   16 +++-
 2 files changed, 57 insertions(+), 4 deletions(-)

Added: 0001-autodetect-resolve-guessed-filesystem-modules.patch
===
--- 0001-autodetect-resolve-guessed-filesystem-modules.patch
(rev 0)
+++ 0001-autodetect-resolve-guessed-filesystem-modules.patch2012-02-22 
02:06:44 UTC (rev 150779)
@@ -0,0 +1,45 @@
+From be9a42675f3ea125c9daa45986a3b58ba8bae226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Tue, 21 Feb 2012 16:47:56 -0500
+Subject: [PATCH] autodetect: resolve guessed filesystem modules
+
+Trading out modinfo for modprobe allows us to detect filesystems like
+ext2 and ext3 which might be aliased to ext4 in the case of Kconfig
+CONFIG_EXT4_USE_FOR_EXT23 being enabled. Maybe this catches other insane
+corner cases, too.
+
+Since we now treat this as possible aliases, we also need to be mindful
+of the fact that it could resolve to multiple module names. Assign the
+output as an array to respect this.
+
+Fixes FS#28569.
+
+Signed-off-by: Dave Reisner dreis...@archlinux.org
+---
+ install/autodetect |   10 --
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/install/autodetect b/install/autodetect
+index 5cc908c..cc12124 100644
+--- a/install/autodetect
 b/install/autodetect
+@@ -7,8 +7,14 @@ build() {
+ MODULE_FILE=$workdir/autodetect_modules
+ 
+ add_if_avail() {
+-if modinfo -k $KERNELVERSION $1 /dev/null; then
+-printf '%s\n' $1 $MODULE_FILE
++local resolved
++
++# treat this as an alias, since ext3 might be aliased to ext4.
++IFS=$'\n' read -rd '' -a resolved  \
++(modprobe -S $KERNELVERSION -R $1 2/dev/null)
++
++if (( ${#resolved[*]} )); then
++printf '%s\n' ${resolved[@]} $MODULE_FILE
+ fi
+ }
+ 
+-- 
+1.7.9.1
+

Modified: PKGBUILD
===
--- PKGBUILD2012-02-21 23:58:05 UTC (rev 150778)
+++ PKGBUILD2012-02-22 02:06:44 UTC (rev 150779)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=http://www.archlinux.org/;
@@ -16,10 +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;)
-md5sums=('2e0ac0c657ca7a78aa0583b3368c0e44')
-sha256sums=('9a951f9e2a158b65840f476c1b9e1e45c7b06383a90f182f76eab64bd3a398cb')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz;
+'0001-autodetect-resolve-guessed-filesystem-modules.patch')
+md5sums=('2e0ac0c657ca7a78aa0583b3368c0e44'
+ '9a5f9cf5e9ca429824e927662a5095ea')
+sha256sums=('9a951f9e2a158b65840f476c1b9e1e45c7b06383a90f182f76eab64bd3a398cb'
+'769e7a5eabb9b77802b1b55f4d123566e13c26dc4966189e4101a38069b6fe8f')
 
+build() {
+  cd $pkgname-$pkgver
+  patch -Np1 
$srcdir/0001-autodetect-resolve-guessed-filesystem-modules.patch
+}
+
 package() {
   make -C $pkgname-$pkgver DESTDIR=$pkgdir install

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

2012-01-05 Thread Dave Reisner 
Date: Thursday, January 5, 2012 @ 19:36:44
  Author: dreisner
Revision: 146197

upgpkg: mkinitcpio 0.8.1-1

Dave Reisner (22):
  init: remove size limitations from API filesystems
  init_functions: rephrase bailout message
  mkinitcpio: warn when no modules are added to the image
  functions: add verbose output for overwriting files
  functions: don't allow add_binary to re-add deps
  lsinitcpio: columnize binaries output
  mkinitcpio: parse vars from config file last
  init_functions: redirect poll_device output to stderr
  mkinitcpio: add VERSION stamp to image
  lsinitcpio: read VERSION stamp out of image file
  functions: don't fail on add_binary adding a non-binary
  init: create /run/initramfs as mode 755
  lsinitcpio: cleanup binary display
  ensure MODULEDIR is declared with a trailing slash
  functions: display proper name on file not found
  lsinitcpio: remove duplicate in_array function
  mkinitcpio: avoid color when stdout isn't a tty
  mkinitcpio: remove hardcoded paths
  autodetect: check for rootfs module existance
  function: suppress errors from modprobe
  mkinitcpio: include modules.{builtin,order} for depmod call
  shutdown: add new hook

Gerardo Exequiel Pozzi (4):
  hooks/net: Refactor and remove sed cmd usage.
  hooks/net: Add BOOTIF support
  hooks/resume: Remove cut cmd usage
  install/base: Add an empty fstab

Tom Gundersen (3):
  add_{file,symlink}: overwrite existing file
  move all binaries to /usr/bin
  busybox: create symlinks manually

Modified:
  mkinitcpio/trunk/PKGBUILD
Deleted:
  
mkinitcpio/trunk/0001-init_functions-redirect-poll_device-output-to-stderr.patch

-+
 0001-init_functions-redirect-poll_device-output-to-stderr.patch |   28 
--
 PKGBUILD|   26 
++---
 2 files changed, 8 insertions(+), 46 deletions(-)

Deleted: 0001-init_functions-redirect-poll_device-output-to-stderr.patch
===
--- 0001-init_functions-redirect-poll_device-output-to-stderr.patch 
2012-01-05 21:53:59 UTC (rev 146196)
+++ 0001-init_functions-redirect-poll_device-output-to-stderr.patch 
2012-01-06 00:36:44 UTC (rev 146197)
@@ -1,28 +0,0 @@
-From 7effc762a2de2029ccedb659f25426c80b04cf4d Mon Sep 17 00:00:00 2001
-From: Dave Reisner dreis...@archlinux.org
-Date: Thu, 1 Dec 2011 11:58:40 -0500
-Subject: [PATCH] init_functions: redirect poll_device output to stderr
-
-Fixes FS#27385
-
-Signed-off-by: Dave Reisner dreis...@archlinux.org

- init_functions |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/init_functions b/init_functions
-index 69cd8fb..787b925 100644
 a/init_functions
-+++ b/init_functions
-@@ -15,7 +15,7 @@ poll_device() {
- [ -b $device ]  return 0
- 
- if [ $udevd_running -eq 1 ]; then
--msg Waiting $seconds seconds for device $device ...
-+msg Waiting $seconds seconds for device $device ... 2
- while [ ! -b $device -a $seconds -gt 0 ]; do
- sleep 1
- seconds=$(( $seconds - 1 ))
--- 
-1.7.8
-

Modified: PKGBUILD
===
--- PKGBUILD2012-01-05 21:53:59 UTC (rev 146196)
+++ PKGBUILD2012-01-06 00:36:44 UTC (rev 146197)
@@ -3,13 +3,13 @@
 # Maintainer: Thomas Bächler tho...@archlinux.org
 
 pkgname=mkinitcpio
-pkgver=0.8.0
-pkgrel=3
+pkgver=0.8.1
+pkgrel=1
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=http://www.archlinux.org/;
 license=('GPL')
-depends=('mkinitcpio-busybox=1.16.1-2' 'module-init-tools' 'util-linux=2.19' 
'libarchive' 'coreutils'
+depends=('mkinitcpio-busybox=1.16.1-2' 'kmod=3' 'util-linux=2.19' 
'libarchive' 'coreutils'
  'bash' 'findutils' 'sed' 'grep' 'filesystem=2011.10-1' 'udev=174-1' 
'file' 'gzip')
 optdepends=('xz: Use lzma or xz compression for the initramfs image'
 'bzip2: Use bzip2 compression for the initramfs image'
@@ -18,23 +18,13 @@
 replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
   'klibc-module-init-tools' 'klibc-udev')
 backup=(etc/mkinitcpio.conf)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz;
-'0001-init_functions-redirect-poll_device-output-to-stderr.patch')
-sha256sums=('097faaf23aaa6d442e7cc6add7238698abfea4185e7d125dcffd74d0ea159246'
-'00248a66c5a2964e3a5e4e344f5679e5866857aa53b645cc5308ab8af8152e57')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz;)
+sha256sums=('09b209bb4a759580b33001e5f3aca0228b285f0ffe1ef43192ce98f5ce995350')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # backport fix for FS#27385
-  patch -Np1  
$srcdir/0001-init_functions-redirect-poll_device-output-to-stderr.patch
-}
-
 package() {
-  cd

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

2011-12-03 Thread Dave Reisner 
Date: Saturday, December 3, 2011 @ 20:20:57
  Author: dreisner
Revision: 144104

upgpkg: mkinitcpio 0.8.0-3

- backport fix for FS#27385

Added:
  
mkinitcpio/trunk/0001-init_functions-redirect-poll_device-output-to-stderr.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-+
 0001-init_functions-redirect-poll_device-output-to-stderr.patch |   28 
++
 PKGBUILD|   16 -
 2 files changed, 40 insertions(+), 4 deletions(-)

Added: 0001-init_functions-redirect-poll_device-output-to-stderr.patch
===
--- 0001-init_functions-redirect-poll_device-output-to-stderr.patch 
(rev 0)
+++ 0001-init_functions-redirect-poll_device-output-to-stderr.patch 
2011-12-04 01:20:57 UTC (rev 144104)
@@ -0,0 +1,28 @@
+From 7effc762a2de2029ccedb659f25426c80b04cf4d Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Thu, 1 Dec 2011 11:58:40 -0500
+Subject: [PATCH] init_functions: redirect poll_device output to stderr
+
+Fixes FS#27385
+
+Signed-off-by: Dave Reisner dreis...@archlinux.org
+---
+ init_functions |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/init_functions b/init_functions
+index 69cd8fb..787b925 100644
+--- a/init_functions
 b/init_functions
+@@ -15,7 +15,7 @@ poll_device() {
+ [ -b $device ]  return 0
+ 
+ if [ $udevd_running -eq 1 ]; then
+-msg Waiting $seconds seconds for device $device ...
++msg Waiting $seconds seconds for device $device ... 2
+ while [ ! -b $device -a $seconds -gt 0 ]; do
+ sleep 1
+ seconds=$(( $seconds - 1 ))
+-- 
+1.7.8
+

Modified: PKGBUILD
===
--- PKGBUILD2011-12-04 01:16:49 UTC (rev 144103)
+++ PKGBUILD2011-12-04 01:20:57 UTC (rev 144104)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Modular initramfs image creation utility
 arch=('any')
 url=http://www.archlinux.org/;
@@ -18,15 +18,23 @@
 replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
   'klibc-module-init-tools' 'klibc-udev')
 backup=(etc/mkinitcpio.conf)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('097faaf23aaa6d442e7cc6add7238698abfea4185e7d125dcffd74d0ea159246')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz;
+'0001-init_functions-redirect-poll_device-output-to-stderr.patch')
+sha256sums=('097faaf23aaa6d442e7cc6add7238698abfea4185e7d125dcffd74d0ea159246'
+'00248a66c5a2964e3a5e4e344f5679e5866857aa53b645cc5308ab8af8152e57')
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # backport fix for FS#27385
+  patch -Np1  
$srcdir/0001-init_functions-redirect-poll_device-output-to-stderr.patch
+}
+
 package() {
   cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
 
-  # add compat symlink until people stop hardcoding paths !$%(*!#$
   mkdir $pkgdir/sbin
   ln -s /usr/bin/mkinitcpio $pkgdir/sbin/mkinitcpio
 }