flatpak: set the branch for flatpak bundles

This allows differentiation between stable and development builds in a
flatpak repository

diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs
index bb630a1aa6aa0985a6356ba5ced9c3ddbc7978aa..326a891c6f14718b31af5fc4b0fb38036c73bb8b 100644 (file)
--- a/pkg/linux/module.defs
+++ b/pkg/linux/module.defs
@@ -13,6 +13,11 @@ else ifeq ($(HB.repo.branch),)
 else
     PKG.rpm.hb.version = $(tag).$(HB.repo.shorthash).$(HB.repo.branch)
 endif
+ifeq ($(HB.repo.type),release)
+    PKG.flatpak.branch = stable
+else
+    PKG.flatpak.branch = development
+endif
 
 ifneq ($(PGP_ID),)
     PGPSIGN = --gpg-sign=$(PGP_ID)

diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index d662d580f275779522500c87a0024fca80e8ec2f..b36d8899c22ee4d559ccd85d9e604d0c6382f12f 100644 (file)
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -73,14 +73,14 @@ $(PKG.gui.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.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.ghb.json
-       flatpak-builder --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(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
 
 $(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 --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.cli.build.flatpak) $(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
 
 #