diff options
| author | John Stebbins <[email protected]> | 2018-07-01 15:28:59 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2018-07-01 15:28:59 -0700 |
| commit | 70a0ad3b0088f86fa26e3f8fe9006834155c7d4d (patch) | |
| tree | bdcbfce989ee1b9038407869950332f96c72937a /pkg | |
| parent | d735e4fbf4801eb17db8d4dea9832a32111a2c4e (diff) | |
flatpak: set the branch for flatpak bundles
This allows differentiation between stable and development builds in a
flatpak repository
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/linux/module.defs | 5 | ||||
| -rw-r--r-- | pkg/linux/module.rules | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs index bb630a1aa..326a891c6 100644 --- 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 d662d580f..b36d8899c 100644 --- 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 # |