pespin submitted this change.
jenkins.sh: libosmo-netif no longer depends on libosmo-abis
Change-Id: Iaf391691093d84824d99059d1fad98293872db5d
Depends: libosmo-abis.git Change-Id I079dc3999de508301dd37ed03e399356a58d3cab
Depends: libosmo-netif.git Change-Id I13d6e88158f6d9ce017986283183ee9c2cc68cae
---
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, 10 insertions(+), 16 deletions(-)
diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh
index 9ac820d..adc97b4 100755
--- a/contrib/jenkins_bts_trx.sh
+++ b/contrib/jenkins_bts_trx.sh
@@ -8,9 +8,8 @@
export LD_LIBRARY_PATH="$inst/lib"
osmo-build-dep.sh libosmocore "" --disable-doxygen
-
-osmo-build-dep.sh libosmo-abis "" --disable-dahdi
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
cd "$deps"
diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh
index 89dd54b..71c3460 100755
--- a/contrib/jenkins_lc15.sh
+++ b/contrib/jenkins_lc15.sh
@@ -4,13 +4,12 @@
# shellcheck source=contrib/jenkins_common.sh
. $(dirname "$0")/jenkins_common.sh
-osmo-build-dep.sh libosmocore "" --disable-doxygen
-
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$inst/lib"
-osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmocore "" --disable-doxygen
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
cd "$deps"
osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION"
diff --git a/contrib/jenkins_oc2g.sh b/contrib/jenkins_oc2g.sh
index e4795cf..5421af7 100755
--- a/contrib/jenkins_oc2g.sh
+++ b/contrib/jenkins_oc2g.sh
@@ -4,13 +4,12 @@
# shellcheck source=contrib/jenkins_common.sh
. $(dirname "$0")/jenkins_common.sh
-osmo-build-dep.sh libosmocore "" --disable-doxygen
-
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$inst/lib"
-osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmocore "" --disable-doxygen
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
cd "$deps"
osmo-layer1-headers.sh oc2g "$FIRMWARE_VERSION"
diff --git a/contrib/jenkins_oct.sh b/contrib/jenkins_oct.sh
index d1b6aee..82b9cc8 100755
--- a/contrib/jenkins_oct.sh
+++ b/contrib/jenkins_oct.sh
@@ -4,13 +4,12 @@
# shellcheck source=contrib/jenkins_common.sh
. $(dirname "$0")/jenkins_common.sh
-osmo-build-dep.sh libosmocore "" --disable-doxygen
-
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$inst/lib"
-osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmocore "" --disable-doxygen
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
cd "$deps"
osmo-layer1-headers.sh oct "$FIRMWARE_VERSION"
diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh
index f188147..c1f2fb6 100755
--- a/contrib/jenkins_oct_and_bts_trx.sh
+++ b/contrib/jenkins_oct_and_bts_trx.sh
@@ -8,9 +8,8 @@
export LD_LIBRARY_PATH="$inst/lib"
osmo-build-dep.sh libosmocore "" --disable-doxygen
-
-osmo-build-dep.sh libosmo-abis "" --disable-dahdi
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
cd "$deps"
diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh
index 87a98f3..85aaecc 100755
--- a/contrib/jenkins_sysmobts.sh
+++ b/contrib/jenkins_sysmobts.sh
@@ -4,13 +4,12 @@
# shellcheck source=contrib/jenkins_common.sh
. $(dirname "$0")/jenkins_common.sh
-osmo-build-dep.sh libosmocore "" --disable-doxygen
-
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$inst/lib"
-osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+osmo-build-dep.sh libosmocore "" --disable-doxygen
osmo-build-dep.sh libosmo-netif "" --disable-doxygen
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
cd "$deps"
osmo-layer1-headers.sh sysmo "$FIRMWARE_VERSION"
To view, visit change 38859. To unsubscribe, or for help writing mail filters, visit settings.