Browse Source

storage/callback: fix the rpm build

3hhh 3 years ago
parent
commit
170e5f5d7a
4 changed files with 7 additions and 2 deletions
  1. 5 0
      Makefile
  2. 0 0
      qubes/storage/callback.json.example
  3. 1 1
      qubes/storage/callback.py
  4. 1 1
      rpm_spec/core-dom0.spec.in

+ 5 - 0
Makefile

@@ -117,11 +117,13 @@ DATADIR ?= /var/lib/qubes
 STATEDIR ?= /var/run/qubes
 LOGDIR ?= /var/log/qubes
 FILESDIR ?= /usr/share/qubes
+DOCDIR ?= /usr/share/doc/qubes
 else ifeq ($(OS),Windows_NT)
 DATADIR ?= c:/qubes
 STATEDIR ?= c:/qubes/state
 LOGDIR ?= c:/qubes/log
 FILESDIR ?= c:/program files/Invisible Things Lab/Qubes
+DOCDIR ?= c:/qubes/doc
 endif
 
 help:
@@ -212,6 +214,9 @@ endif
 	cp -r templates "$(DESTDIR)$(FILESDIR)/templates"
 	rm -f "$(DESTDIR)$(FILESDIR)/templates/README"
 
+	mkdir -p "$(DESTDIR)$(DOCDIR)"
+	cp qubes/storage/callback.json.example "$(DESTDIR)$(DOCDIR)/qubes_callback.json.example"
+
 	mkdir -p $(DESTDIR)$(DATADIR)
 	mkdir -p $(DESTDIR)$(DATADIR)/vm-templates
 	mkdir -p $(DESTDIR)$(DATADIR)/appvms

+ 0 - 0
qubes/storage/qubes_callback.json.example → qubes/storage/callback.json.example


+ 1 - 1
qubes/storage/callback.py

@@ -31,7 +31,7 @@ class CallbackPool(qubes.storage.Pool):
 
     All configuration for this pool driver must be done in `/etc/qubes_callback.json`. Each configuration ID `conf_id` can be used
     to create a callback pool with e.g. `qvm-pool -o conf_id=your_conf_id -a pool_name callback`.
-    Check the `qubes_callback.json.example` for an overview of the available options.
+    Check `/usr/share/doc/qubes/qubes_callback.json.example` for an overview of the available options.
 
     Example applications of this driver:
         - custom pool mounts

+ 1 - 1
rpm_spec/core-dom0.spec.in

@@ -402,7 +402,7 @@ done
 %{python3_sitelib}/qubes/storage/kernels.py
 %{python3_sitelib}/qubes/storage/lvm.py
 %{python3_sitelib}/qubes/storage/callback.py
-%{python3_sitelib}/qubes/storage/qubes_callback.json.example
+%doc /usr/share/doc/qubes/qubes_callback.json.example
 
 %dir %{python3_sitelib}/qubes/tools
 %dir %{python3_sitelib}/qubes/tools/__pycache__