Skip to content

Commit

Permalink
Adjust builderv1 to use pipewire in Debian 12 too
Browse files Browse the repository at this point in the history
Use exclude list to make it easier for future versions.

QubesOS/qubes-issues#6358
  • Loading branch information
marmarek committed Jul 12, 2023
1 parent 47a6128 commit 3870cc7
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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),qubuntu))
ifneq (,$(findstring $(DISTRIBUTION),qubuntu debian))
SOURCE_COPY_IN := source-debian-quilt-copy-in
endif

Expand All @@ -17,6 +17,9 @@ source-debian-quilt-copy-in:
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) != bullseye ]] && [[ $(DIST) != focal ]] && [[ $(DIST) != jammy ]]; then \
sed -i "s/pulseaudio-qubes,/pipewire-qubes,/" $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
fi

# Support for new packaging
ifneq ($(filter $(DISTRIBUTION), archlinux),)
Expand Down

0 comments on commit 3870cc7

Please sign in to comment.