diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-10-26 11:06:04 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-10-26 11:06:04 +0400 |
| commit | 32c4576478363eb0b47ccc2a77333d149879e1a6 (patch) | |
| tree | 0bbe98b36c3336dce4893196a91534d4163f0273 | |
| parent | 73d7cc0cc80b0c58bfebd2c8c036a9a892dac138 (diff) | |
| download | cibs-32c4576478363eb0b47ccc2a77333d149879e1a6.tar.gz | |
ips-version can be defined in Makefile
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | rules/ips.mk | 4 |
2 files changed, 7 insertions, 4 deletions
@@ -74,7 +74,12 @@ are in "work/manifests" directory. * `ips-repo` - IPS repository to publish, e. g. `make publish ips-repo=http://example.com:1234` Any variable defined in Makefile will be passed to `pkgmogrify` and -can be used in IPS manifests (*.p5m). These variables passed additionally: +can be used in IPS manifests (*.p5m). This is especially useful +when with variable `ips-version`, which is by default `= version`. +Example is OpenSSL, where `version = 0.9.8x`, but `ips-version=0.9.8.23` +(because letters are not allowed by IPS). + +These variables passed additionally: `build32` = `#` or empty, and `build64` = `#` or empty. These variables can be used to cut off some line in package manifest (by commenting out). By default these vars are `#` (pound). diff --git a/rules/ips.mk b/rules/ips.mk index f0f082e..0cdf7ea 100644 --- a/rules/ips.mk +++ b/rules/ips.mk @@ -29,10 +29,8 @@ include /usr/share/cibs/rules/common.mk manifestdir := $(workdir)/manifest transdir := /usr/share/cibs/trans -# TODO: rewrite -ifeq (,$(ips-version)) +# Default, can be overriden in Makefile. See next lines. ips-version = $(version) -endif # Substitutions in IPS manifest: makefile-vars := $(shell sed -n 's/^ *\([a-zA-Z][-_0-9a-zA-Z]*\) *[:?]*=.*$$/\1/p' Makefile | sort -u) |