Update and support for builderv2

.gitlab-ci.yml

@@ -0,0 +1,11 @@
+checks:pylint:
+  before_script:
+  - pip install pylint
+  script:
+  - PYTHONPATH=test-packages python3 -m pylint qubeswhonix
+  stage: checks
+include:
+- file: /r4.2/gitlab-base.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.2/gitlab-host.yml
+  project: QubesOS/qubes-continuous-integration

.qubesbuilder

@@ -0,0 +1,4 @@
+host:
+  rpm:
+    build:
+    - rpm_spec/qubes-core-admin-addon-bridge-device.spec

Makefile

@@ -1,19 +1,9 @@
-ADMIN_API_METHODS_SIMPLE = \
-	admin.vm.device.bridge.Attach \
-	admin.vm.device.bridge.Available \
-	admin.vm.device.bridge.Detach \
-	admin.vm.device.bridge.List \
-	admin.vm.device.bridge.Set.persistent
-
 all:
 	python3 setup.py build
 
 install:
 	# force /usr/bin before /bin to have /usr/bin/python instead of /bin/python
 	PATH="/usr/bin:$$PATH" python3 setup.py install $(PYTHON_PREFIX_ARG) -O1 --skip-build --root $(DESTDIR)
 
-	mkdir -p $(DESTDIR)/etc/qubes-rpc/policy
-	for method in $(ADMIN_API_METHODS_SIMPLE); do \
-		cp qubes-rpc-policy/$$method.policy $(DESTDIR)/etc/qubes-rpc/policy/$$method; \
-		ln -s ../../usr/libexec/qubes/qubesd-query-fast $(DESTDIR)/etc/qubes-rpc/$$method || exit 1; \
-	done
+	# default RPC policy
+	install -D -m 0664 -- qubes-rpc-policy/80-admin-default-bridge.policy $(DESTDIR)/etc/qubes/policy.d/80-admin-default-bridge.policy

qubes-rpc-policy/80-admin-default-bridge.policy

@@ -0,0 +1,8 @@
+## Do not modify this file, create a new policy file with a lower number in the
+## filename instead. For example `30-bridge.policy`.
+
+!include-service admin.vm.device.bridge.Attach * include/admin-local-rwx
+!include-service admin.vm.device.bridge.Available * include/admin-local-ro
+!include-service admin.vm.device.bridge.Detach * include/admin-local-rwx
+!include-service admin.vm.device.bridge.List * include/admin-local-ro
+!include-service admin.vm.device.bridge.Set.persistent * include/admin-local-rwx

rpm_spec/qubes-core-admin-addon-bridge-device.spec.in

@@ -9,7 +9,9 @@ URL:		https://www.qubes-os.org
 Source0:    %{name}-%{version}.tar.gz
 
 BuildArch:	noarch
+BuildRequires:	make
 BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_pkgversion}-setuptools
 
 %description
 qubes-core-admin extension for handling Bridge Device
@@ -28,9 +30,9 @@ make %{?_smp_mflags}
 %{python3_sitelib}/qubesbridgedevice-*.egg-info
 %{python3_sitelib}/qubesbridgedevice
 
-%attr(2775,root,qubes) %dir /etc/qubes-rpc/policy
-%attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/admin.*
-/etc/qubes-rpc/admin.*
+%attr(2775,root,qubes) %dir /etc/qubes/policy.d/
+%attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/80-admin-default-bridge.policy
+/etc/qubes/policy.d/80-admin-default-bridge.policy
 
 %changelog
-
+@CHANGELOG@