aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2020-05-11 11:58:23 +0200
committerOliver Smith <osmith@sysmocom.de>2020-05-11 11:58:23 +0200
commitc33df3d734883a36978ef8b1a1276069cc1d8e39 (patch)
treee2768065fd2c468c65f8288ecb4b2e291ff10ca6
parentde551896546ac65aaea72af8563d6951808e7788 (diff)
build.sh: osmo-gsm-manuals-devel: different repo name
-rwxr-xr-xrpm-local/build.sh17
1 files changed, 12 insertions, 5 deletions
diff --git a/rpm-local/build.sh b/rpm-local/build.sh
index 1a4c3a2..5c6b7b6 100755
--- a/rpm-local/build.sh
+++ b/rpm-local/build.sh
@@ -92,22 +92,28 @@ _build_pkg() {
}
# $1: pkgname (e.g. libosmocore)
+# $2: osmocom git repo name (if different than $1)
build_pkg_osmo() {
local pkgname="$1"
+ local repo="$2"
local specfile="spec/$pkgname/$pkgname.spec"
local version
skip_pkg "$pkgname" && return
mkdir_rpmbuild
+ if [ -z "$repo" ]; then
+ repo="$pkgname"
+ fi
+
version="$(spec_version "$specfile")"
tarball="rpmbuild/SOURCES/$pkgname-$version.tar.xz"
echo "add source: git HEAD tarball: $tarball"
- require_path "$SRCDIR/$pkgname"
- git -C "$SRCDIR/$pkgname" archive \
+ require_path "$SRCDIR/$repo"
+ git -C "$SRCDIR/$repo" archive \
--format=tar \
- --prefix="$pkgname-$version/" \
+ --prefix="$repo-$version/" \
HEAD \
> "$tarball"
@@ -210,6 +216,7 @@ build_pkg_osmo "osmo-el2tpd"
# needs: libosmo-simtrace2, libulfius
# build_pkg_osmo "osmo-remsim"
build_pkg_osmo "osmo-sim-auth"
-build_pkg_osmo "osmo-sysmon"
+# needs: liboping
+# build_pkg_osmo "osmo-sysmon"
build_pkg_osmo "osmo-uecups"
-build_pkg_osmo "osmo-gsm-manuals"
+build_pkg_osmo "osmo-gsm-manuals-devel" "osmo-gsm-manuals"