pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32055 ) Change subject: contrib/jenkins: build libosmo-abis without dahdi ...................................................................... contrib/jenkins: build libosmo-abis without dahdi Looks like this is not needed, so make the jenkins build work without installing dahdi-source. Related: OS#5863 Change-Id: I61c483983a4793e0429bb37804dee0a128125daf (cherry picked from commit 07017887245f24b94eb7cea8fbcc2151d5ce3cbf) --- M contrib/jenkins_bts_trx.sh M contrib/jenkins_lc15.sh M contrib/jenkins_oc2g.sh M contrib/jenkins_oct.sh M contrib/jenkins_oct_and_bts_trx.sh M contrib/jenkins_sysmobts.sh 6 files changed, 20 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh index a98a633..9ac820d 100755 --- a/contrib/jenkins_bts_trx.sh +++ b/contrib/jenkins_bts_trx.sh @@ -9,7 +9,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen -osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-abis "" --disable-dahdi osmo-build-dep.sh libosmo-netif "" --disable-doxygen cd "$deps" diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh index 4454f65..89dd54b 100755 --- a/contrib/jenkins_lc15.sh +++ b/contrib/jenkins_lc15.sh @@ -9,7 +9,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-abis "" --disable-dahdi osmo-build-dep.sh libosmo-netif "" --disable-doxygen cd "$deps" diff --git a/contrib/jenkins_oc2g.sh b/contrib/jenkins_oc2g.sh index af2f8a0..e4795cf 100755 --- a/contrib/jenkins_oc2g.sh +++ b/contrib/jenkins_oc2g.sh @@ -9,7 +9,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-abis "" --disable-dahdi osmo-build-dep.sh libosmo-netif "" --disable-doxygen cd "$deps" diff --git a/contrib/jenkins_oct.sh b/contrib/jenkins_oct.sh index 0984e20..d1b6aee 100755 --- a/contrib/jenkins_oct.sh +++ b/contrib/jenkins_oct.sh @@ -9,7 +9,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-abis "" --disable-dahdi osmo-build-dep.sh libosmo-netif "" --disable-doxygen cd "$deps" diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh index 3f4efae..f188147 100755 --- a/contrib/jenkins_oct_and_bts_trx.sh +++ b/contrib/jenkins_oct_and_bts_trx.sh @@ -9,7 +9,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen -osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-abis "" --disable-dahdi osmo-build-dep.sh libosmo-netif "" --disable-doxygen cd "$deps" diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh index 2e5ab8d..87a98f3 100755 --- a/contrib/jenkins_sysmobts.sh +++ b/contrib/jenkins_sysmobts.sh @@ -9,7 +9,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-abis "" --disable-dahdi osmo-build-dep.sh libosmo-netif "" --disable-doxygen cd "$deps" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: 2023q1 Gerrit-Change-Id: I61c483983a4793e0429bb37804dee0a128125daf Gerrit-Change-Number: 32055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-CC: osmith <osmith@sysmocom.de> Gerrit-MessageType: merged