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

[Giancarlo Razzolini]

    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
===================================================================
--- PKGBUILD	2020-07-16 13:18:23 UTC (rev 391962)
+++ PKGBUILD	2020-07-16 14:16:57 UTC (rev 391963)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 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
               '86CFFCA918CF3AF47147588051E8B148A9999C34'   # 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