summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkg/linux/module.defs4
-rw-r--r--pkg/linux/module.rules8
2 files changed, 8 insertions, 4 deletions
diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs
index 16a1baebc..308981dd8 100644
--- a/pkg/linux/module.defs
+++ b/pkg/linux/module.defs
@@ -14,6 +14,10 @@ else
PKG.rpm.hb.version = $(tag).$(HB.repo.shorthash).$(HB.repo.branch)
endif
+ifneq ($(PGP_ID),)
+ PGPSIGN = --gpg-sign=$(PGP_ID)
+endif
+
###############################################################################
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index bf9f48ed2..1e065f338 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -1,4 +1,4 @@
-pkg.create.flatpak:: $(PKG.gui.flatpak) $(PKG.cli.flatpak)
+pkg.create.flatpak:: contrib.fetch $(PKG.gui.flatpak) $(PKG.cli.flatpak)
pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb)
pkg.create.rpm:: $(PKG.rpm.stamp)
pkg.create.src.deb:: $(PKG.src.deb.stamp)
@@ -63,7 +63,7 @@ $(PKG.rpm.stamp): $(PKG.native.rpm.stamp)
#
$(PKG.src.flatpak): $(PKG.src.tar.bz2)
$(MKDIR.exe) -p $(STAGE.out.flatpak/)
- -$(RM.exe) -rf $(STAGE.out.flatpak/).flatpak-builder
+ -$(RM.exe) -rf $(BUILD/).flatpak-builder
$(CP.exe) $(PKG.src.tar.bz2) $(PKG.src.flatpak)
$(PKG.contrib.flatpak):
@@ -77,7 +77,7 @@ $(PKG.gui.flatpak): GNUmakefile $(PKG.src.flatpak) $(PKG.contrib.flatpak)
# of the manifest. So put it where we have staged the files that
# it needs.
$(CP.exe) $(PKG.gui.manifest.flatpak) $(STAGE.out.flatpak/)fr.handbrake.gui.json
- flatpak-builder --force-clean --gpg-sign=608AD8F6 --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.gui.json
+ flatpak-builder --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.gui.json
flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) fr.handbrake.ghb
$(PKG.cli.flatpak): GNUmakefile $(PKG.src.flatpak) $(PKG.contrib.flatpak)
@@ -87,7 +87,7 @@ $(PKG.cli.flatpak): GNUmakefile $(PKG.src.flatpak) $(PKG.contrib.flatpak)
# of the manifest. So put it where we have staged the files that
# it needs.
$(CP.exe) $(PKG.cli.manifest.flatpak) $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
- flatpak-builder --force-clean --gpg-sign=608AD8F6 --repo=$(PKG.repo.flatpak) $(PKG.cli.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
+ flatpak-builder --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.cli.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) fr.handbrake.HandBrakeCLI
#