Skip to content

Commit

Permalink
contrib: debian: drop bashcompletion mangling after install
Browse files Browse the repository at this point in the history
tested by running:
```
./configure --with-config=user; cp -a contrib/debian .
dpkg-buildpackage -b -uc -us
```
on a Debian 12 based system.

and checking where the completion file got installed.

Reviewed-by: Umer Saleem <[email protected]>
Signed-off-by: Stoiko Ivanov <[email protected]>
Closes #15304
  • Loading branch information
Stoiko Ivanov authored and behlendorf committed Oct 3, 2023
1 parent e14293a commit eb955f6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion contrib/debian/openzfs-zfsutils.install
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
etc/default/zfs
etc/zfs/zfs-functions
etc/zfs/zpool.d/
etc/bash_completion.d/zfs
lib/systemd/system-generators/
lib/systemd/system-preset/
lib/systemd/system/zfs-import-cache.service
Expand Down
5 changes: 0 additions & 5 deletions contrib/debian/rules.in
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ override_dh_auto_install:
@# Install the utilities.
$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'

# Use upstream's bash completion
install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
'$(CURDIR)/contrib/bash_completion.d/zfs'

# Move from bin_dir to /usr/sbin
# Remove suffix (.py) as per policy 10.4 - Scripts
# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
Expand Down Expand Up @@ -136,7 +132,6 @@ override_dh_auto_install:

chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'

override_dh_python3:
dh_python3 -p openzfs-python3-pyzfs
Expand Down

0 comments on commit eb955f6

Please sign in to comment.