From: Darik Horn Date: Thu, 19 Jan 2012 01:15:15 +0000 (-0600) Subject: Refresh debian/patches after upstream merge. X-Git-Tag: debian/0.7.9-2~511 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8acb1ede58046ed09c16fdcd0357bd0df1399f67;p=mirror_zfs-debian.git Refresh debian/patches after upstream merge. --- diff --git a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch index bfc14b2a..852dbd4a 100644 --- a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch +++ b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch @@ -1,7 +1,7 @@ -From 4cdadd9bb09dbbaea7236d1becf3016c4fae0294 Mon Sep 17 00:00:00 2001 +From 76135e7115a7635488e6201fcfe6328ac747165c Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Tue, 17 Jan 2012 19:45:07 -0600 -Subject: [PATCH 1/6] Prevent manual builds in the DKMS source. +Subject: [PATCH 1/5] Prevent manual builds in the DKMS source. Print an instructive error messsage and exit if the `dkms.conf` file exists when the userland is configured. (ie: `--with-config=user`) diff --git a/debian/patches/0002-Remove-the-COPYING-file.patch b/debian/patches/0002-Remove-the-COPYING-file.patch index 1a4552ba..c30e2ff4 100644 --- a/debian/patches/0002-Remove-the-COPYING-file.patch +++ b/debian/patches/0002-Remove-the-COPYING-file.patch @@ -1,7 +1,7 @@ -From 1bd76d57fe733cf77f95fe7c90e790adde4611b6 Mon Sep 17 00:00:00 2001 +From ad68cce0fd392df2709c414cb84a460a3b7e8494 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Tue, 17 Jan 2012 22:18:47 -0600 -Subject: [PATCH 2/6] Remove the COPYING file. +Subject: [PATCH 2/5] Remove the COPYING file. Resolve this lintian warning by removing the COPYING file: diff --git a/debian/patches/0003-Remove-all-upstream-init.d-components.patch b/debian/patches/0003-Remove-all-upstream-init.d-components.patch index 4308e57f..eac2cb77 100644 --- a/debian/patches/0003-Remove-all-upstream-init.d-components.patch +++ b/debian/patches/0003-Remove-all-upstream-init.d-components.patch @@ -1,7 +1,7 @@ -From c91297480756485c603328d5ed529343feb41bfb Mon Sep 17 00:00:00 2001 +From 24225921ed1f9a3c03c25cce5772aa1c5b2f1f21 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Tue, 17 Jan 2012 11:54:21 -0600 -Subject: [PATCH 3/6] Remove all upstream init.d components. +Subject: [PATCH 3/5] Remove all upstream init.d components. The etc/init.d/ components are redundant because the debian/ overlay bundles init files according to Debian packaging policy. diff --git a/debian/patches/0004-Remove-the-upstream-dracut-component.patch b/debian/patches/0004-Remove-the-upstream-dracut-component.patch index 45412e70..5f278308 100644 --- a/debian/patches/0004-Remove-the-upstream-dracut-component.patch +++ b/debian/patches/0004-Remove-the-upstream-dracut-component.patch @@ -1,7 +1,7 @@ -From 5f451a636a56fdec948e0541032adfd37ecd667b Mon Sep 17 00:00:00 2001 +From 53fda2a56a4756ed4d64133766e8029aec1c39ef Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Tue, 17 Jan 2012 20:27:32 -0600 -Subject: [PATCH 4/6] Remove the upstream dracut component. +Subject: [PATCH 4/5] Remove the upstream dracut component. The dracut/ component broke deb systems when it first added to the upstream ZoL repository, had a near-zero download count when it was @@ -31,7 +31,7 @@ dracut-005 package that is currently published in Debian and Ubuntu. delete mode 100644 dracut/README.dracut.markdown diff --git a/Makefile.am b/Makefile.am -index 3ab5cb3..b8f64ba 100644 +index 17a6a26..aa5c01a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/config/tgz.am diff --git a/debian/patches/0005-Remove-userland-dist-rules.patch b/debian/patches/0005-Remove-userland-dist-rules.patch index b1e3f842..cfe9977d 100644 --- a/debian/patches/0005-Remove-userland-dist-rules.patch +++ b/debian/patches/0005-Remove-userland-dist-rules.patch @@ -1,7 +1,7 @@ -From 0c200ed806388d6a70538e703f75aafc7a1335a8 Mon Sep 17 00:00:00 2001 +From f71f498e6bc2a91219f5303a5091c7c79f876027 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Tue, 17 Jan 2012 22:23:16 -0600 -Subject: [PATCH 5/6] Remove userland dist rules. +Subject: [PATCH 5/5] Remove userland dist rules. The `make dist` rule is used to create the DKMS source package, which does not contain the userland. (eg: Dist --with-config=kernel only.) @@ -24,7 +24,7 @@ instances of EXTRA_DIST and change dist_ to nodist_. 12 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am -index b8f64ba..583f81f 100644 +index aa5c01a..14900bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,8 +12,7 @@ endif diff --git a/debian/patches/0006-Allow-GPT-EFI-vdev-replacement-in-boot-pools.patch b/debian/patches/0006-Allow-GPT-EFI-vdev-replacement-in-boot-pools.patch deleted file mode 100644 index a63c65b8..00000000 --- a/debian/patches/0006-Allow-GPT-EFI-vdev-replacement-in-boot-pools.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8dc0e4aa2be339f78db11bed9e341d7f46469bde Mon Sep 17 00:00:00 2001 -From: Darik Horn -Date: Wed, 18 Jan 2012 12:28:11 -0600 -Subject: [PATCH 6/6] Allow GPT+EFI vdev replacement in boot pools. - -Commit zfsonlinux/zfs@57a4eddc4d5e1e6c10d8d7dcf87a9fc27398adcd -allows the bootfs property to be set on any pool, but does not -accommodate subsequent vdev changes. For example: - - # zpool replace rpool /dev/sda /dev/sdb - operation not supported on this type of pool - property 'bootfs' is not supported on EFI labeled devices - -For non-Solaris builds, disable the check that emits this error. ---- - lib/libzfs/libzfs_pool.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c -index 9213101..1c8286f 100644 ---- a/lib/libzfs/libzfs_pool.c -+++ b/lib/libzfs/libzfs_pool.c -@@ -490,6 +490,7 @@ zpool_valid_proplist(libzfs_handle_t *hdl, const char *poolname, - verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL), - ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0); - -+#if defined(__sun__) || defined(__sun) - /* - * bootfs property cannot be set on a disk which has - * been EFI labeled. -@@ -502,6 +503,7 @@ zpool_valid_proplist(libzfs_handle_t *hdl, const char *poolname, - zpool_close(zhp); - goto error; - } -+#endif - zpool_close(zhp); - break; - --- -1.7.5.4 - diff --git a/debian/patches/README b/debian/patches/README index a807b96d..ccc7b65d 100644 --- a/debian/patches/README +++ b/debian/patches/README @@ -18,6 +18,9 @@ To reorder the series: To refresh the series for release: + $ git checkout debian-patches + $ git rebase -i upstream + : Notice how commits accepted upstream will disappear. $ git checkout master $ cd debian/patches $ rm 0*.patch diff --git a/debian/patches/series b/debian/patches/series index 9209b827..f469c0fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,4 @@ 0003-Remove-all-upstream-init.d-components.patch 0004-Remove-the-upstream-dracut-component.patch 0005-Remove-userland-dist-rules.patch -0006-Allow-GPT-EFI-vdev-replacement-in-boot-pools.patch volatile-version.patch