summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederick Ding <[email protected]>2018-07-04 17:09:25 -0400
committerJohn Stebbins <[email protected]>2018-07-04 15:44:59 -0700
commit2393d8cffee535389a6ef17e47c442f70812c8aa (patch)
treea53d6d045f0c266b10604a3899429dae7fce18bf
parent7ceb4dda6383044cc80c9c6d101ba3f2ff8df174 (diff)
Specify flatpak branch when building the bundle
Fixes a bug introduced in 70a0ad3b0088f86fa26e3f8fe9006834155c7d4d. Branch must be either `development` or `stable`, can't rely on defaults. See http://docs.flatpak.org/en/latest/flatpak-command-reference.html#flatpak-build-bundle for CLI reference.
-rw-r--r--pkg/linux/module.rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index b36d8899c..45cd68176 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -74,14 +74,14 @@ $(PKG.gui.flatpak): GNUmakefile $(PKG.src.tar.bz2)
$(MKDIR.exe) -p $(PKG.out.flatpak/)
$(SRC/)scripts/create_flatpak_manifest.py -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.ghb.json
flatpak-builder --default-branch=$(PKG.flatpak.branch) --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.ghb.json
- flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) fr.handbrake.ghb
+ flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) fr.handbrake.ghb $(PKG.flatpak.branch)
$(PKG.cli.flatpak): GNUmakefile $(PKG.src.tar.bz2)
$(MKDIR.exe) -p $(STAGE.out.flatpak/)
$(MKDIR.exe) -p $(PKG.out.flatpak/)
$(SRC/)scripts/create_flatpak_manifest.py -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.cli.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
flatpak-builder --default-branch=$(PKG.flatpak.branch) --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
+ flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) fr.handbrake.HandBrakeCLI $(PKG.flatpak.branch)
#
# Debian binary package rules