Skip to content
Snippets Groups Projects
Commit b0b73593 authored by Guido Günther's avatar Guido Günther
Browse files

Don't pretend kFreeBSD supports linux only features

So far we worked around missing kFreeBSD features by creating empty dirs
this looks bad on the target systems and makes us maintain things in
debian rules and *.install. Explicitly invoke dh_install in debian/rules
instead.
parent 7a535191
No related branches found
No related tags found
No related merge requests found
......@@ -2,12 +2,8 @@ usr/bin/*
usr/sbin/*
etc/libvirt/*
etc/sasl2/*
etc/apparmor.d
usr/share/polkit-1
usr/lib/libvirt/libvirt*
usr/lib/libvirt/connection-driver
usr/share/augeas/*
usr/share/libvirt/*
usr/share/man/man8/*
usr/lib/systemd/system lib/systemd/
usr/share/systemtap
......@@ -121,19 +121,6 @@ EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
override_dh_auto_configure:
dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
override_dh_auto_install:
dh_auto_install
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
# Only linux has app-armor
dh_install -p libvirt-bin usr/lib/libvirt/virt-aa-helper
endif
# Add empty dirs so dh_install doesn't fail on kFreebsd until we have
# Polkit/Systemd/systemtap/apparmor support
mkdir -p debian/tmp/usr/share/polkit-1 \
debian/tmp/lib/systemd/system \
debian/tmp/usr/share/systemtap \
debian/tmp/etc/apparmor.d/
override_dh_auto_test:
export LD_PRELOAD=""; \
export VIR_TEST_DEBUG=1; \
......@@ -152,8 +139,16 @@ override_dh_install:
cp tools/libvirt-guests.sysconf \
debian/libvirt-bin.libvirt-guests.default
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
# Linux supports more nice things:
dh_install -p libvirt-bin usr/lib/systemd/system lib/systemd/
mv debian/libvirt-bin/lib/systemd/system/libvirtd.service \
debian/libvirt-bin/lib/systemd/system/libvirt-bin.service
dh_install -p libvirt-bin usr/lib/libvirt/virt-aa-helper
dh_install -p libvirt-bin etc/apparmor.d
dh_install -p libvirt-bin usr/share/polkit-1
# Not all linux arches have systemtap yet
mkdir -p debian/tmp/usr/share/systemtap
dh_install -p libvirt-bin usr/share/systemtap
endif
for l in $(LOGROTATE); do \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment