diff --git a/.qubesbuilder b/.qubesbuilder index a763927..17829a3 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -11,7 +11,6 @@ vm: - debian source: commands: - - 'sed -i /qubes-mgmt-salt-vm-connector/d @SOURCE_DIR@/debian/control' - 'sed -i "s/pulseaudio-qubes,/pipewire-qubes,/" @SOURCE_DIR@/debian/control' archlinux: build: @@ -21,15 +20,15 @@ vm: build: - debian source: - commands: - - 'sed -i /qubes-mgmt-salt-vm-connector/d @SOURCE_DIR@/debian/control' + commands: [] vm-focal: deb: build: - debian source: - commands: [] + commands: + - 'sed -i /qubes-mgmt-salt-vm-connector/d @SOURCE_DIR@/debian/control' vm-bullseye: deb: diff --git a/Makefile.builder b/Makefile.builder index 3e099e8..796c114 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -7,19 +7,16 @@ RPM_SPEC_FILES := $(RPM_SPEC_FILES.$(PACKAGE_SET)) DEBIAN_BUILD_DIRS := $(DEBIAN_BUILD_DIRS.$(PACKAGE_SET)) ARCH_BUILD_DIRS := $(ARCH_BUILD_DIRS.$(PACKAGE_SET)) -ifneq (,$(findstring $(DISTRIBUTION),debian qubuntu)) +ifneq (,$(findstring $(DISTRIBUTION),qubuntu)) SOURCE_COPY_IN := source-debian-quilt-copy-in endif -# remove Debian dependencies that will not work in Ubuntu focal and bookworm +# remove Debian dependencies that will not work in Ubuntu focal source-debian-quilt-copy-in: if [[ $(DIST) == focal ]] ; then \ sed -i /qubes-core-agent-dom0-updates/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ sed -i /qubes-mgmt-salt-vm-connector/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ fi - if [[ $(DIST) == bookworm ]] ; then \ - sed -i /qubes-mgmt-salt-vm-connector/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ - fi # Support for new packaging ifneq ($(filter $(DISTRIBUTION), archlinux),)