UBUNTU: [Debian] Ignore spl/zfs symlinks

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index 64900aa74b13d6ecaf64f7552f71ef6bc679b4f0..a0c19460246e67fc58637ca608adae3eff312f87 100644 (file)
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -4,4 +4,20 @@
 [ ! -L ubuntu/vbox/vboxsf/include ] && ln -sf ../include ubuntu/vbox/vboxsf/include
 [ ! -L ubuntu/vbox/vboxsf/r0drv ] && ln -sf ../r0drv ubuntu/vbox/vboxsf/r0drv
 [ ! -L ubuntu/vbox/vboxvideo/include ] && ln -sf ../include ubuntu/vbox/vboxvideo/include
+
+# Reconstruct spl/zfs symlinks
+[ ! -L spl/rpm/redhat/spl-dkms.spec.in ] && ln -sf ../generic/spl-dkms.spec.in
+[ ! -L spl/rpm/redhat/spl.spec.in ] && ln -sf ../generic/spl.spec.in
+
+[ ! -L zfs/rpm/redhat/zfs-dkms.spec.in ] && ln -sf ../generic/zfs-dkms.spec.in
+[ ! -L zfs/rpm/redhat/zfs.spec.in ] && ln -sf ../generic/zfs.spec.in
+[ ! -L zfs/cmd/zed/zed.d/checksum-notify.sh ] && ln -sf io-notify.sh
+[ ! -L zfs/cmd/zed/zed.d/checksum-spare.sh ] && ln -sf io-spare.sh
+[ ! -L zfs/cmd/zed/zed.d/data-notify.sh ] && ln -sf io-notify.sh
+[ ! -L zfs/cmd/zed/zed.d/resilver.finish-notify.sh ] && ln -sf scrub.finish-notify.sh
+[ ! -L zfs/scripts/zpios-test/large-thread-survey.sh ] && ln -sf 1x256th-65536rc-4rs-1cs-4off.sh
+[ ! -L zfs/scripts/zpios-test/large.sh ] && ln -sf 256th-65536rc-4rs-1cs-4off.sh
+[ ! -L zfs/scripts/zpios-test/medium.sh ] && ln -sf 16th-8192rc-4rs-1cs-4off.sh
+[ ! -L zfs/scripts/zpios-test/small.sh ] && ln -sf 4th-1024rc-4rs-1cs-4off.sh
+[ ! -L zfs/scripts/zpios-test/tiny.sh ] && ln -sf 1th-16rc-4rs-1cs-4off.sh
 exit 0

diff --git a/debian/source/options b/debian/source/options
index 90c83e2ab28fd296eb88f825df797de84305c405..628f5f5167f7a734d4126c0ae43efc1ce5b8ebb9 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -5,6 +5,20 @@ extend-diff-ignore=ubuntu/vbox/vboxguest/include
 extend-diff-ignore=ubuntu/vbox/vboxsf/r0drv
 extend-diff-ignore=ubuntu/vbox/vboxsf/include
 
+extend-diff-ignore=spl/rpm/redhat/spl-dkms.spec.in
+extend-diff-ignore=spl/rpm/redhat/spl.spec.in
+extend-diff-ignore=zfs/rpm/redhat/zfs-dkms.spec.in
+extend-diff-ignore=zfs/rpm/redhat/zfs.spec.in
+extend-diff-ignore=zfs/cmd/zed/zed.d/checksum-notify.sh
+extend-diff-ignore=zfs/cmd/zed/zed.d/checksum-spare.sh
+extend-diff-ignore=zfs/cmd/zed/zed.d/data-notify.sh
+extend-diff-ignore=zfs/cmd/zed/zed.d/resilver.finish-notify.sh
+extend-diff-ignore=zfs/scripts/zpios-test/large-thread-survey.sh
+extend-diff-ignore=zfs/scripts/zpios-test/large.sh
+extend-diff-ignore=zfs/scripts/zpios-test/medium.sh
+extend-diff-ignore=zfs/scripts/zpios-test/small.sh
+extend-diff-ignore=zfs/scripts/zpios-test/tiny.sh
+
 # force "dpkg-source -I -i" behavior
 diff-ignore
 tar-ignore