upgpkg: 26-2

version/26-2/0002-remove-systemd.patch

+diff -rc a/init_functions b/init_functions
+*** a/init_functions	2014-07-23 23:45:34.000000000 +0100
+--- b/init_functions	2015-04-29 14:50:18.676775467 +0100
+***************
+*** 239,258 ****
+              err "fatal error invoking fsck"
+          fi
+  
+-         # ensure that root is going to be mounted rw. Otherwise, systemd
+-         # might fsck the device again. Annoy the user so that they fix this.
+-         if [ "${rwopt:-ro}" != 'rw' ]; then
+-             echo "********************** WARNING **********************"
+-             echo "*                                                   *"
+-             echo "*  The root device is not configured to be mounted  *"
+-             echo "*  read-write! It may be fsck'd again later.        *"
+-             echo "*                                                   *"
+-             echo "*****************************************************"
+-         fi
+      fi
+  }
+  
+! # TODO: this really needs to follow the logic of systemd's encode_devnode_name
+  # function more closely.
+  tag_to_udev_path() {
+      awk -v "tag=$1" -v "value=$2" '
+--- 239,248 ----
+              err "fatal error invoking fsck"
+          fi
+  
+      fi
+  }
+  
+! # TODO: this really needs to follow the sd's encode_devnode_name
+  # function more closely.
+  tag_to_udev_path() {
+      awk -v "tag=$1" -v "value=$2" '
+diff -rc a/Makefile b/Makefile
+*** a/Makefile	2014-07-23 23:45:34.000000000 +0100
+--- b/Makefile	2015-04-29 14:50:18.676775467 +0100
+***************
+*** 17,24 ****
+  	/usr/share/man/man5 \
+  	/usr/share/man/man1 \
+  	/usr/share/mkinitcpio \
+- 	/usr/lib/systemd/system/shutdown.target.wants \
+- 	/usr/lib/tmpfiles.d
+  
+  all: doc
+  
+--- 17,22 ----
+***************
+*** 52,62 ****
+  
+  	cp -at $(DESTDIR)/usr/lib/initcpio hooks install
+  	install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/*
+- 	install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
+- 			$(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
+- 	ln -s ../mkinitcpio-generate-shutdown-ramfs.service \
+- 			$(DESTDIR)/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service
+- 	install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf
+  
+  	install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install
+  
+--- 50,55 ----
+diff -rc a/PKGBUILD b/PKGBUILD
+*** a/PKGBUILD	2014-07-23 23:45:34.000000000 +0100
+--- b/PKGBUILD	2015-04-29 14:52:59.584129156 +0100
+***************
+*** 9,15 ****
+  conflicts=('mkinitcpio')
+  provides=("mkinitcpio=$pkgver")
+  depends=('mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
+!          'awk' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'systemd' 'gzip')
+  makedepends=('asciidoc' 'git' 'sed')
+  optdepends=('xz: Use lzma or xz compression for the initramfs image'
+              'bzip2: Use bzip2 compression for the initramfs image'
+--- 9,15 ----
+  conflicts=('mkinitcpio')
+  provides=("mkinitcpio=$pkgver")
+  depends=('mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
+!          'awk' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip')
+  makedepends=('asciidoc' 'git' 'sed')
+  optdepends=('xz: Use lzma or xz compression for the initramfs image'
+              'bzip2: Use bzip2 compression for the initramfs image'

version/26-2/PKGBUILD

+# Maintainer: Eric Vidal <eric@obarun.org>
+# based on the original https://aur.archlinux.org/packages/mkinitcpio-nosystemd/
+# 						Maintainer: Dave Reisner <dreisner@archlinux.org>
+# 						Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=26
+pkgrel=2
+pkgdesc="Modular initramfs image creation utility"
+arch=(x86_64)
+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' 'lz4')
+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')
+makedepends=('asciidoc')
+provides=("mkinitcpio=${pkgver}-${pkgrel}" "initramfs")
+backup=('etc/mkinitcpio.conf')
+source=("https://sources.archlinux.org/other/${pkgname}/${pkgname}-$pkgver.tar.gz"
+ 		'0002-remove-systemd.patch')
+install=mkinitcpio.install
+sha256sums=('e14056a9c460d15652e99620bce4308d4dd9309f82c152c4b52287e697fab599'
+            '4921518d130b73724645b3732ba471005b8755a89a219bb6396e3b082414bb78')
+validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal
+
+prepare() {
+  
+  cd "$pkgname-$pkgver"
+  #start removing systemd related stuff
+  rm -rf install/sd-vconsole install/sd-shutdown systemd tmpfiles
+  patch -p1 -i ../0002-remove-systemd.patch
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "${pkgname}-$pkgver" DESTDIR="$pkgdir" install
+}

version/26-2/mkinitcpio.install

+#!/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
+}