summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Heß2016-11-08 10:57:27 +0100
committerJanne Heß2016-11-08 10:57:27 +0100
commit64fe9e8822e7c11939f857e549f3471c1eca08a8 (patch)
tree56fcec1b9be9feaa1743e7b49f40cb566547f3da
parentf7419517e424524b7b990b65fe9de36271bd68ba (diff)
downloadaur-64fe9e8822e7c11939f857e549f3471c1eca08a8.tar.gz
Bump to 1.0.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD24
-rw-r--r--preset1
3 files changed, 20 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 31cbec3c191..94a3e2f8db8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Aug 4 21:10:51 UTC 2016
+# Tue Nov 8 09:57:14 UTC 2016
pkgbase = mkinitcpio-sd-zfs
pkgdesc = Compatibility between systemd and ZFS roots
- pkgver = 0.1.0
+ pkgver = 1.0.0
pkgrel = 1
url = https://github.com/dasJ/sd-zfs
arch = i686
@@ -11,8 +11,10 @@ pkgbase = mkinitcpio-sd-zfs
depends = mkinitcpio
depends = systemd
conflicts = mkinitcpio-sd-zfs-git
- source = https://github.com/dasJ/sd-zfs/archive/v0.1.0.tar.gz
- sha512sums = b5e533d6b082f8759b90ea9ab80fc04290abff62e75144e02bca11f6b208c1df9fb42fc17266b71263c752298eb62ec9cc06883bed5b3df2bcdeb59dd08ee874
+ source = https://github.com/dasJ/sd-zfs/archive/v1.0.0.tar.gz
+ source = preset
+ sha512sums = f3f33f81f6993de128d257734257635bc5956d4161de94685893ee91f4794e4631b47ff66e3cc3966d0ae4e313d29966dbc6d7a1e41fa9676940fd991c32cc4f
+ sha512sums = 4c112c138b36cfd5c4b16d043da0410b06d2f1ac485a69bcde469701e6d52a0ca30f0071d51875b0de27e847aecc192c9485aabc20fcf53801b1ffe8c06c7d30
pkgname = mkinitcpio-sd-zfs
diff --git a/PKGBUILD b/PKGBUILD
index 92d36c3a33c..39fd165c665 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,17 @@
# Maintainer: Janne Heß <jannehess@gmail.com>
pkgname=mkinitcpio-sd-zfs
-pkgver=0.1.0
+pkgver=1.0.0
pkgrel=1
pkgdesc='Compatibility between systemd and ZFS roots'
license=('GPL3')
url='https://github.com/dasJ/sd-zfs'
conflicts=('mkinitcpio-sd-zfs-git')
depends=('mkinitcpio' 'systemd')
-source=("https://github.com/dasJ/sd-zfs/archive/v${pkgver}.tar.gz")
-sha512sums=('b5e533d6b082f8759b90ea9ab80fc04290abff62e75144e02bca11f6b208c1df9fb42fc17266b71263c752298eb62ec9cc06883bed5b3df2bcdeb59dd08ee874')
+source=("https://github.com/dasJ/sd-zfs/archive/v${pkgver}.tar.gz"
+ 'preset')
+sha512sums=('f3f33f81f6993de128d257734257635bc5956d4161de94685893ee91f4794e4631b47ff66e3cc3966d0ae4e313d29966dbc6d7a1e41fa9676940fd991c32cc4f'
+ '4c112c138b36cfd5c4b16d043da0410b06d2f1ac485a69bcde469701e6d52a0ca30f0071d51875b0de27e847aecc192c9485aabc20fcf53801b1ffe8c06c7d30')
arch=('i686' 'x86_64')
build() {
@@ -19,21 +21,21 @@ build() {
}
package() {
+ local install bin
cd "sd-zfs-${pkgver}"
# mkinitcpio
- install -Dm644 mkinitcpio-sd-zfs.install "${pkgdir}/usr/lib/initcpio/install/sd-zfs"
+ for install in sd-zfs{,-shutdown}; do
+ install -Dm644 "mkinitcpio-install/${install}" "${pkgdir}/usr/lib/initcpio/install/${install}"
+ done
# binaries
- for bin in mount.zfs_member zfs-getforce; do
+ install -Dm755 zfs-shutdown "${pkgdir}/usr/lib/systemd/system-shutdown/zfs-shutdown"
+ for bin in initrd-zfs-generator mount.initrd_zfs; do
install -Dm755 "${bin}" "${pkgdir}/usr/lib/mkinitcpio-sd-zfs/${bin}"
done
# systemd unit
- install -Dm644 units/zfs-getforce.service "${pkgdir}/usr/lib/mkinitcpio-sd-zfs/units/zfs-getforce.service"
-
- # systemd overrides
- for override in sysroot.mount zfs-import-{scan,cache}.service; do
- install -Dm644 "overrides/${override}" "${pkgdir}/usr/lib/mkinitcpio-sd-zfs/overrides/${override}"
- done
+ install -Dm644 units/sd-zfs-generate-shutdown-ramfs.service "${pkgdir}/usr/lib/systemd/system/sd-zfs-generate-shutdown-ramfs.service"
+ install -Dm644 "${srcdir}/preset" "${pkgdir}/usr/lib/systemd/system-preset/51-sd-zfs.preset"
}
diff --git a/preset b/preset
new file mode 100644
index 00000000000..e88aac1b728
--- /dev/null
+++ b/preset
@@ -0,0 +1 @@
+enable sd-zfs-generate-shutdown-ramfs.service