From 886e4c966eac5a245a7aea625dfefc90efb9f62b Mon Sep 17 00:00:00 2001
From: Stoiko Ivanov <s.ivanov@proxmox.com>
Date: Thu, 23 May 2019 23:11:41 +0200
Subject: [PATCH] Move zfs to top-level directory

With the merge of spl and zfs the extra level of directories is not needed
anymore.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 .gitmodules                                                   | 2 +-
 Makefile                                                      | 4 ++--
 {zfs/debian => debian}/changelog                              | 0
 {zfs/debian => debian}/compat                                 | 0
 {zfs/debian => debian}/control                                | 0
 {zfs/debian => debian}/copyright                              | 0
 {zfs/debian => debian}/copyright.cme                          | 0
 {zfs/debian => debian}/libnvpair1linux.docs                   | 0
 {zfs/debian => debian}/libnvpair1linux.install                | 0
 {zfs/debian => debian}/libnvpair1linux.lintian-overrides      | 0
 {zfs/debian => debian}/libuutil1linux.docs                    | 0
 {zfs/debian => debian}/libuutil1linux.install                 | 0
 {zfs/debian => debian}/libuutil1linux.lintian-overrides       | 0
 {zfs/debian => debian}/libzfs2linux.docs                      | 0
 {zfs/debian => debian}/libzfs2linux.install                   | 0
 {zfs/debian => debian}/libzfs2linux.lintian-overrides         | 0
 {zfs/debian => debian}/libzfslinux-dev.docs                   | 0
 {zfs/debian => debian}/libzfslinux-dev.install                | 0
 {zfs/debian => debian}/libzpool2linux.docs                    | 0
 {zfs/debian => debian}/libzpool2linux.install                 | 0
 {zfs/debian => debian}/libzpool2linux.lintian-overrides       | 0
 {zfs/debian => debian}/not-installed                          | 0
 .../0001-Check-for-META-and-DCH-consistency-in-autoconf.patch | 0
 .../patches/0002-always-load-ZFS-module-on-boot.patch         | 0
 ...3-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch | 0
 .../0004-increase-default-zcmd-allocation-to-256K.patch       | 0
 .../0005-import-with-d-dev-disk-by-id-in-scan-service.patch   | 0
 {zfs/debian => debian}/patches/0006-Enable-zed-emails.patch   | 0
 .../0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch    | 0
 .../0008-test-runner.py-change-shebang-to-python3.patch       | 0
 ...tests-fix-cosmetic-permission-issues-during-make-ins.patch | 0
 {zfs/debian => debian}/patches/series                         | 0
 {zfs/debian => debian}/python3-pyzfs.install                  | 0
 {zfs/debian => debian}/rules                                  | 0
 {zfs/debian => debian}/source/format                          | 0
 .../tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs   | 0
 .../tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev   | 0
 {zfs/debian => debian}/tree/zfsutils-linux/etc/sudoers.d/zfs  | 0
 .../tree/zfsutils-linux/usr/lib/os-probes/10zvol-test         | 0
 .../tree/zfsutils-linux/usr/lib/zfs-linux/scrub               | 0
 {zfs/debian => debian}/watch                                  | 0
 {zfs/debian => debian}/zfs-initramfs.install                  | 0
 {zfs/debian => debian}/zfs-initramfs.triggers                 | 0
 {zfs/debian => debian}/zfs-test.install                       | 0
 {zfs/debian => debian}/zfs-test.lintian-overrides             | 0
 {zfs/debian => debian}/zfs-zed.install                        | 0
 {zfs/debian => debian}/zfsutils-linux.cron.d                  | 0
 {zfs/debian => debian}/zfsutils-linux.docs                    | 0
 {zfs/debian => debian}/zfsutils-linux.examples                | 0
 {zfs/debian => debian}/zfsutils-linux.install                 | 0
 {zfs/debian => debian}/zfsutils-linux.lintian-overrides       | 0
 {zfs/debian => debian}/zfsutils-linux.postinst                | 0
 zfs/upstream => upstream                                      | 0
 53 files changed, 3 insertions(+), 3 deletions(-)
 rename {zfs/debian => debian}/changelog (100%)
 rename {zfs/debian => debian}/compat (100%)
 rename {zfs/debian => debian}/control (100%)
 rename {zfs/debian => debian}/copyright (100%)
 rename {zfs/debian => debian}/copyright.cme (100%)
 rename {zfs/debian => debian}/libnvpair1linux.docs (100%)
 rename {zfs/debian => debian}/libnvpair1linux.install (100%)
 rename {zfs/debian => debian}/libnvpair1linux.lintian-overrides (100%)
 rename {zfs/debian => debian}/libuutil1linux.docs (100%)
 rename {zfs/debian => debian}/libuutil1linux.install (100%)
 rename {zfs/debian => debian}/libuutil1linux.lintian-overrides (100%)
 rename {zfs/debian => debian}/libzfs2linux.docs (100%)
 rename {zfs/debian => debian}/libzfs2linux.install (100%)
 rename {zfs/debian => debian}/libzfs2linux.lintian-overrides (100%)
 rename {zfs/debian => debian}/libzfslinux-dev.docs (100%)
 rename {zfs/debian => debian}/libzfslinux-dev.install (100%)
 rename {zfs/debian => debian}/libzpool2linux.docs (100%)
 rename {zfs/debian => debian}/libzpool2linux.install (100%)
 rename {zfs/debian => debian}/libzpool2linux.lintian-overrides (100%)
 rename {zfs/debian => debian}/not-installed (100%)
 rename {zfs/debian => debian}/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch (100%)
 rename {zfs/debian => debian}/patches/0002-always-load-ZFS-module-on-boot.patch (100%)
 rename {zfs/debian => debian}/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch (100%)
 rename {zfs/debian => debian}/patches/0004-increase-default-zcmd-allocation-to-256K.patch (100%)
 rename {zfs/debian => debian}/patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch (100%)
 rename {zfs/debian => debian}/patches/0006-Enable-zed-emails.patch (100%)
 rename {zfs/debian => debian}/patches/0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch (100%)
 rename {zfs/debian => debian}/patches/0008-test-runner.py-change-shebang-to-python3.patch (100%)
 rename {zfs/debian => debian}/patches/0009-tests-fix-cosmetic-permission-issues-during-make-ins.patch (100%)
 rename {zfs/debian => debian}/patches/series (100%)
 rename {zfs/debian => debian}/python3-pyzfs.install (100%)
 rename {zfs/debian => debian}/rules (100%)
 rename {zfs/debian => debian}/source/format (100%)
 rename {zfs/debian => debian}/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs (100%)
 rename {zfs/debian => debian}/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev (100%)
 rename {zfs/debian => debian}/tree/zfsutils-linux/etc/sudoers.d/zfs (100%)
 rename {zfs/debian => debian}/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test (100%)
 rename {zfs/debian => debian}/tree/zfsutils-linux/usr/lib/zfs-linux/scrub (100%)
 rename {zfs/debian => debian}/watch (100%)
 rename {zfs/debian => debian}/zfs-initramfs.install (100%)
 rename {zfs/debian => debian}/zfs-initramfs.triggers (100%)
 rename {zfs/debian => debian}/zfs-test.install (100%)
 rename {zfs/debian => debian}/zfs-test.lintian-overrides (100%)
 rename {zfs/debian => debian}/zfs-zed.install (100%)
 rename {zfs/debian => debian}/zfsutils-linux.cron.d (100%)
 rename {zfs/debian => debian}/zfsutils-linux.docs (100%)
 rename {zfs/debian => debian}/zfsutils-linux.examples (100%)
 rename {zfs/debian => debian}/zfsutils-linux.install (100%)
 rename {zfs/debian => debian}/zfsutils-linux.lintian-overrides (100%)
 rename {zfs/debian => debian}/zfsutils-linux.postinst (100%)
 rename zfs/upstream => upstream (100%)

diff --git a/.gitmodules b/.gitmodules
index a277676..4532be1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "zfs/upstream"]
-	path = zfs/upstream
+	path = upstream
 	url = ../mirror_zfs
diff --git a/Makefile b/Makefile
index b070797..11c981f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ RELEASE=5.1
 # source form https://github.com/zfsonlinux/
 
 ZFSDIR=zfs-linux_${ZFSVER}
-ZFSSRC=zfs/upstream
-ZFSPKG=zfs/debian
+ZFSSRC=upstream
+ZFSPKG=debian
 
 ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
 
diff --git a/zfs/debian/changelog b/debian/changelog
similarity index 100%
rename from zfs/debian/changelog
rename to debian/changelog
diff --git a/zfs/debian/compat b/debian/compat
similarity index 100%
rename from zfs/debian/compat
rename to debian/compat
diff --git a/zfs/debian/control b/debian/control
similarity index 100%
rename from zfs/debian/control
rename to debian/control
diff --git a/zfs/debian/copyright b/debian/copyright
similarity index 100%
rename from zfs/debian/copyright
rename to debian/copyright
diff --git a/zfs/debian/copyright.cme b/debian/copyright.cme
similarity index 100%
rename from zfs/debian/copyright.cme
rename to debian/copyright.cme
diff --git a/zfs/debian/libnvpair1linux.docs b/debian/libnvpair1linux.docs
similarity index 100%
rename from zfs/debian/libnvpair1linux.docs
rename to debian/libnvpair1linux.docs
diff --git a/zfs/debian/libnvpair1linux.install b/debian/libnvpair1linux.install
similarity index 100%
rename from zfs/debian/libnvpair1linux.install
rename to debian/libnvpair1linux.install
diff --git a/zfs/debian/libnvpair1linux.lintian-overrides b/debian/libnvpair1linux.lintian-overrides
similarity index 100%
rename from zfs/debian/libnvpair1linux.lintian-overrides
rename to debian/libnvpair1linux.lintian-overrides
diff --git a/zfs/debian/libuutil1linux.docs b/debian/libuutil1linux.docs
similarity index 100%
rename from zfs/debian/libuutil1linux.docs
rename to debian/libuutil1linux.docs
diff --git a/zfs/debian/libuutil1linux.install b/debian/libuutil1linux.install
similarity index 100%
rename from zfs/debian/libuutil1linux.install
rename to debian/libuutil1linux.install
diff --git a/zfs/debian/libuutil1linux.lintian-overrides b/debian/libuutil1linux.lintian-overrides
similarity index 100%
rename from zfs/debian/libuutil1linux.lintian-overrides
rename to debian/libuutil1linux.lintian-overrides
diff --git a/zfs/debian/libzfs2linux.docs b/debian/libzfs2linux.docs
similarity index 100%
rename from zfs/debian/libzfs2linux.docs
rename to debian/libzfs2linux.docs
diff --git a/zfs/debian/libzfs2linux.install b/debian/libzfs2linux.install
similarity index 100%
rename from zfs/debian/libzfs2linux.install
rename to debian/libzfs2linux.install
diff --git a/zfs/debian/libzfs2linux.lintian-overrides b/debian/libzfs2linux.lintian-overrides
similarity index 100%
rename from zfs/debian/libzfs2linux.lintian-overrides
rename to debian/libzfs2linux.lintian-overrides
diff --git a/zfs/debian/libzfslinux-dev.docs b/debian/libzfslinux-dev.docs
similarity index 100%
rename from zfs/debian/libzfslinux-dev.docs
rename to debian/libzfslinux-dev.docs
diff --git a/zfs/debian/libzfslinux-dev.install b/debian/libzfslinux-dev.install
similarity index 100%
rename from zfs/debian/libzfslinux-dev.install
rename to debian/libzfslinux-dev.install
diff --git a/zfs/debian/libzpool2linux.docs b/debian/libzpool2linux.docs
similarity index 100%
rename from zfs/debian/libzpool2linux.docs
rename to debian/libzpool2linux.docs
diff --git a/zfs/debian/libzpool2linux.install b/debian/libzpool2linux.install
similarity index 100%
rename from zfs/debian/libzpool2linux.install
rename to debian/libzpool2linux.install
diff --git a/zfs/debian/libzpool2linux.lintian-overrides b/debian/libzpool2linux.lintian-overrides
similarity index 100%
rename from zfs/debian/libzpool2linux.lintian-overrides
rename to debian/libzpool2linux.lintian-overrides
diff --git a/zfs/debian/not-installed b/debian/not-installed
similarity index 100%
rename from zfs/debian/not-installed
rename to debian/not-installed
diff --git a/zfs/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch b/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
similarity index 100%
rename from zfs/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
rename to debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
diff --git a/zfs/debian/patches/0002-always-load-ZFS-module-on-boot.patch b/debian/patches/0002-always-load-ZFS-module-on-boot.patch
similarity index 100%
rename from zfs/debian/patches/0002-always-load-ZFS-module-on-boot.patch
rename to debian/patches/0002-always-load-ZFS-module-on-boot.patch
diff --git a/zfs/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
similarity index 100%
rename from zfs/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
rename to debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
diff --git a/zfs/debian/patches/0004-increase-default-zcmd-allocation-to-256K.patch b/debian/patches/0004-increase-default-zcmd-allocation-to-256K.patch
similarity index 100%
rename from zfs/debian/patches/0004-increase-default-zcmd-allocation-to-256K.patch
rename to debian/patches/0004-increase-default-zcmd-allocation-to-256K.patch
diff --git a/zfs/debian/patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch
similarity index 100%
rename from zfs/debian/patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch
rename to debian/patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch
diff --git a/zfs/debian/patches/0006-Enable-zed-emails.patch b/debian/patches/0006-Enable-zed-emails.patch
similarity index 100%
rename from zfs/debian/patches/0006-Enable-zed-emails.patch
rename to debian/patches/0006-Enable-zed-emails.patch
diff --git a/zfs/debian/patches/0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch b/debian/patches/0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch
similarity index 100%
rename from zfs/debian/patches/0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch
rename to debian/patches/0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch
diff --git a/zfs/debian/patches/0008-test-runner.py-change-shebang-to-python3.patch b/debian/patches/0008-test-runner.py-change-shebang-to-python3.patch
similarity index 100%
rename from zfs/debian/patches/0008-test-runner.py-change-shebang-to-python3.patch
rename to debian/patches/0008-test-runner.py-change-shebang-to-python3.patch
diff --git a/zfs/debian/patches/0009-tests-fix-cosmetic-permission-issues-during-make-ins.patch b/debian/patches/0009-tests-fix-cosmetic-permission-issues-during-make-ins.patch
similarity index 100%
rename from zfs/debian/patches/0009-tests-fix-cosmetic-permission-issues-during-make-ins.patch
rename to debian/patches/0009-tests-fix-cosmetic-permission-issues-during-make-ins.patch
diff --git a/zfs/debian/patches/series b/debian/patches/series
similarity index 100%
rename from zfs/debian/patches/series
rename to debian/patches/series
diff --git a/zfs/debian/python3-pyzfs.install b/debian/python3-pyzfs.install
similarity index 100%
rename from zfs/debian/python3-pyzfs.install
rename to debian/python3-pyzfs.install
diff --git a/zfs/debian/rules b/debian/rules
similarity index 100%
rename from zfs/debian/rules
rename to debian/rules
diff --git a/zfs/debian/source/format b/debian/source/format
similarity index 100%
rename from zfs/debian/source/format
rename to debian/source/format
diff --git a/zfs/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs
similarity index 100%
rename from zfs/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs
rename to debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs
diff --git a/zfs/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
similarity index 100%
rename from zfs/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
rename to debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
diff --git a/zfs/debian/tree/zfsutils-linux/etc/sudoers.d/zfs b/debian/tree/zfsutils-linux/etc/sudoers.d/zfs
similarity index 100%
rename from zfs/debian/tree/zfsutils-linux/etc/sudoers.d/zfs
rename to debian/tree/zfsutils-linux/etc/sudoers.d/zfs
diff --git a/zfs/debian/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test b/debian/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test
similarity index 100%
rename from zfs/debian/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test
rename to debian/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test
diff --git a/zfs/debian/tree/zfsutils-linux/usr/lib/zfs-linux/scrub b/debian/tree/zfsutils-linux/usr/lib/zfs-linux/scrub
similarity index 100%
rename from zfs/debian/tree/zfsutils-linux/usr/lib/zfs-linux/scrub
rename to debian/tree/zfsutils-linux/usr/lib/zfs-linux/scrub
diff --git a/zfs/debian/watch b/debian/watch
similarity index 100%
rename from zfs/debian/watch
rename to debian/watch
diff --git a/zfs/debian/zfs-initramfs.install b/debian/zfs-initramfs.install
similarity index 100%
rename from zfs/debian/zfs-initramfs.install
rename to debian/zfs-initramfs.install
diff --git a/zfs/debian/zfs-initramfs.triggers b/debian/zfs-initramfs.triggers
similarity index 100%
rename from zfs/debian/zfs-initramfs.triggers
rename to debian/zfs-initramfs.triggers
diff --git a/zfs/debian/zfs-test.install b/debian/zfs-test.install
similarity index 100%
rename from zfs/debian/zfs-test.install
rename to debian/zfs-test.install
diff --git a/zfs/debian/zfs-test.lintian-overrides b/debian/zfs-test.lintian-overrides
similarity index 100%
rename from zfs/debian/zfs-test.lintian-overrides
rename to debian/zfs-test.lintian-overrides
diff --git a/zfs/debian/zfs-zed.install b/debian/zfs-zed.install
similarity index 100%
rename from zfs/debian/zfs-zed.install
rename to debian/zfs-zed.install
diff --git a/zfs/debian/zfsutils-linux.cron.d b/debian/zfsutils-linux.cron.d
similarity index 100%
rename from zfs/debian/zfsutils-linux.cron.d
rename to debian/zfsutils-linux.cron.d
diff --git a/zfs/debian/zfsutils-linux.docs b/debian/zfsutils-linux.docs
similarity index 100%
rename from zfs/debian/zfsutils-linux.docs
rename to debian/zfsutils-linux.docs
diff --git a/zfs/debian/zfsutils-linux.examples b/debian/zfsutils-linux.examples
similarity index 100%
rename from zfs/debian/zfsutils-linux.examples
rename to debian/zfsutils-linux.examples
diff --git a/zfs/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
similarity index 100%
rename from zfs/debian/zfsutils-linux.install
rename to debian/zfsutils-linux.install
diff --git a/zfs/debian/zfsutils-linux.lintian-overrides b/debian/zfsutils-linux.lintian-overrides
similarity index 100%
rename from zfs/debian/zfsutils-linux.lintian-overrides
rename to debian/zfsutils-linux.lintian-overrides
diff --git a/zfs/debian/zfsutils-linux.postinst b/debian/zfsutils-linux.postinst
similarity index 100%
rename from zfs/debian/zfsutils-linux.postinst
rename to debian/zfsutils-linux.postinst
diff --git a/zfs/upstream b/upstream
similarity index 100%
rename from zfs/upstream
rename to upstream