Skip to content

Commit

Permalink
Correctly identify metapackage for server builds
Browse files Browse the repository at this point in the history
The server kernel uses "securedrop" as the version label, so it
appears in all packages. Fix the regex to only look for "securedrop-"
packages as the metapackage (as the comment correctly described).

Fixes #50.
  • Loading branch information
legoktm committed May 24, 2024
1 parent 32dae88 commit 1a7a0d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ ifneq (,$(filter-out parallel=1,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
endif

# Get the metapackage name by listing the packages from d/control and
# picking the only one that starts with SD
METAPACKGE := $(shell dh_listpackages | grep "securedrop")
# picking the only one that starts with "securedrop"
METAPACKGE := $(shell dh_listpackages | grep "^securedrop")

.PHONY: binary binary-indep binary-arch
binary: binary-arch binary-indep
Expand Down

0 comments on commit 1a7a0d8

Please sign in to comment.