diff options
| author | John Stebbins <[email protected]> | 2015-08-25 09:48:14 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2015-08-25 14:17:11 -0700 |
| commit | 4889bc95883dd2cb0eb679d381d15385b930bcfa (patch) | |
| tree | 7a20ea87161e790b84b7f1cd4b0d10010201f995 /pkg/linux/module.defs | |
| parent | d4d9555eca3048d281d510bd51267ce67142acd6 (diff) | |
build: use git version info instead of svn
Migrate from svn to git. Since our build system automatically generates
version info from the svn repo, this needs to change when we move the
repo to git.
Diffstat (limited to 'pkg/linux/module.defs')
| -rw-r--r-- | pkg/linux/module.defs | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs index 2570d0857..3b1a81f8e 100644 --- a/pkg/linux/module.defs +++ b/pkg/linux/module.defs @@ -1,8 +1,19 @@ PKG.deb.machine = `dpkg --print-architecture` PKG.rpm.machine = `rpm -E "%_target_cpu"` -PKG.release = 1 +PKG.release = $(HB.repo.rev) PKG.rpm.dist = `rpm -E "%dist"` +ifeq ($(HB.repo.tag),) + tag = 0.0.0 +endif +ifeq ($(HB.repo.type),release) + PKG.rpm.hb.version = $(tag) +else ifeq ($(HB.repo.branch),) + PKG.rpm.hb.version = $(tab).$(HB.repo.shorthash) +else + PKG.rpm.hb.version = $(tag).$(HB.repo.shorthash).$(HB.repo.branch) +endif + ############################################################################### @@ -12,27 +23,29 @@ STAGE.out.cli/ = $(STAGE.out/)cli/ ############################################################################### -PKG.rpm.src.tar.bz2 = $(STAGE.out.src/)rpm/$(PKG.basename).tar.bz2 +PKG.rpm.basename = $(HB.name.lower)-$(PKG.rpm.hb.version) +PKG.rpm.src.tar.bz2 = $(STAGE.out.src/)rpm/$(PKG.rpm.basename).tar.bz2 STAGE.out.rpm.src/ = $(STAGE.out.src/)rpm/ PKG.debian = $(PKG.in/)linux/debian PKG.cli.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_CLI_$(BUILD.machine).deb PKG.gui.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_GUI_$(BUILD.machine).deb -PKG.deb.basename = handbrake-$(HB.version) -PKG.src.deb.tar = handbrake_$(HB.version).tar.gz +PKG.deb.basename = $(HB.name.lower)-$(HB.version) +PKG.src.deb.tar = $(HB.name.lower)_$(HB.version).tar.gz PKG.src.deb.stamp = $(STAGE.out.src/).debsrc.stamp -PKG.src.deb = $(PKG.out/)handbrake_$(HB.version).deb +PKG.src.deb = $(PKG.out/)$(HB.name.lower)_$(HB.version).deb -PKG.cli.tmp.deb = $(PKG.out/)handbrake-cli_$(HB.version)_$(PKG.deb.machine).deb -PKG.gui.tmp.deb = $(PKG.out/)handbrake-gtk_$(HB.version)_$(PKG.deb.machine).deb +PKG.cli.tmp.deb = $(PKG.out/)$(HB.name.lower)-cli_$(HB.version)_$(PKG.deb.machine).deb +PKG.gui.tmp.deb = $(PKG.out/)$(HB.name.lower)-gtk_$(HB.version)_$(PKG.deb.machine).deb PKG.native.rpm.stamp = $(RPM.out/).rpm.stamp +PKG.rpm.stamp = $(PKG.out/).rpm.stamp -PKG.gui.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-gui-$(HB.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm -PKG.cli.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-cli-$(HB.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm +PKG.gui.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name.lower)-gui-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm +PKG.cli.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name.lower)-cli-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm -PKG.cli.rpm = $(PKG.out/)$(HB.name)-$(HB.version)-Fedora_CLI_$(BUILD.machine).rpm -PKG.gui.rpm = $(PKG.out/)$(HB.name)-$(HB.version)-Fedora_GUI_$(BUILD.machine).rpm +PKG.cli.rpm = $(PKG.out/)$(HB.name.lower)-cli-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm +PKG.gui.rpm = $(PKG.out/)$(HB.name.lower)-gui-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm RPM.out = $(STAGE.out/)rpm RPM.out/ = $(STAGE.out/)rpm/ RPMROOT.out = $(PWD)/$(STAGE.out/)rpmroot |