diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-05-11 17:45:19 +0200 |
|---|---|---|
| committer | osmith <osmith@sysmocom.de> | 2021-05-17 08:27:17 +0000 |
| commit | 00188531c2bcd7fc79062fc377c3169f0bd410e0 (patch) | |
| tree | 7f01f9f1ebab7ccb3133a7901f300172820cdcd4 /scripts | |
| parent | d79365051958ae38e05b5b8060b50e220b7dd3fd (diff) | |
OBS: conflict: allow overriding pkgver
Allow overriding OSMO_OBS_CONFLICT_PKGVER, so we can increase the
version of the osmocom-2021q1 package whenever something changes on one
of the 2021q1 branches.
Related: SYS#5370
Change-Id: Iae45d7462aab8227ed3756e6cccfa3e64cb04211
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/common-obs-conflict.sh | 2 | ||||
| -rwxr-xr-x | scripts/osmocom-packages-docker.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh index a4fc98d..b6b381a 100644 --- a/scripts/common-obs-conflict.sh +++ b/scripts/common-obs-conflict.sh @@ -2,7 +2,7 @@ # Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages # built from different branches by accident -OSMO_OBS_CONFLICT_PKGVER="1.0.0" +OSMO_OBS_CONFLICT_PKGVER="${OSMO_OBS_CONFLICT_PKGVER:-1.0.0}" # Create the conflicting package for debian # diff --git a/scripts/osmocom-packages-docker.sh b/scripts/osmocom-packages-docker.sh index 66eb311..4465d20 100755 --- a/scripts/osmocom-packages-docker.sh +++ b/scripts/osmocom-packages-docker.sh @@ -26,6 +26,7 @@ esac docker run \ -e "FEED=$FEED" \ + -e "OSMO_OBS_CONFLICT_PKGVER=$OSMO_OBS_CONFLICT_PKGVER" \ -e "PACKAGES=$PACKAGES" \ -e "PROJ=$PROJ" \ -v "$SCRIPTS:/scripts" \ |