pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/29290 )

Change subject: contrib: Workaround poky SDK bug building libosmo-netif ......................................................................

contrib: Workaround poky SDK bug building libosmo-netif

Similar fixes are applied in meta-telephony.git and meta-sysmocom-bsp.git for recipes checking for existence of netinet/sctp.h. This is basically a poky pyro bug, already fixed in upstream poky master (b11fc7795cd1a6d74c9bb50b922d928f4a17722d).

Change-Id: I330866badba8f30f500f74ac31e2c4e20b11d53c --- M contrib/jenkins-build-osmo-bts-oc2g.sh M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-oc2g.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 4 files changed, 28 insertions(+), 0 deletions(-)

Approvals: pespin: Looks good to me, approved; Verified

diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh index 6d660ef..74ebf44 100755 --- a/contrib/jenkins-build-osmo-bts-oc2g.sh +++ b/contrib/jenkins-build-osmo-bts-oc2g.sh @@ -12,6 +12,13 @@ # Cross-compilation: all installations need to be put in the sysmo SDK sysroot export DESTDIR="$_poky_path/sysroots/cortexa15hf-neon-poky-linux-gnueabi"

+# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing +# unavailability of netinet/sctp.h. +# Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ +# Merged: poky.git b11fc7795cd1a6d74c9bb50b922d928f4a17722d +# See meta-telephony.git 7acf2bff4e279b7d974373b952bad8e400c3bff2 +export ac_cv_header_netinet_sctp_h=yes + base="$PWD" name="osmo-bts-oc2g" prefix="/usr/local/jenkins-build/inst-$name" diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 67681c3..472e73d 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -12,6 +12,13 @@ # Cross-compilation: all installations need to be put in the sysmo SDK sysroot export DESTDIR="$_poky_path/sysroots/armv5te-poky-linux-gnueabi"

+# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing +# unavailability of netinet/sctp.h. +# Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ +# Merged: poky.git b11fc7795cd1a6d74c9bb50b922d928f4a17722d +# See meta-telephony.git 7acf2bff4e279b7d974373b952bad8e400c3bff2 +export ac_cv_header_netinet_sctp_h=yes + base="$PWD" name="osmo-bts-sysmo" prefix="/usr/local/jenkins-build/inst-$name" diff --git a/contrib/jenkins-build-osmo-pcu-oc2g.sh b/contrib/jenkins-build-osmo-pcu-oc2g.sh index 5e85c6e..60f42f7 100755 --- a/contrib/jenkins-build-osmo-pcu-oc2g.sh +++ b/contrib/jenkins-build-osmo-pcu-oc2g.sh @@ -12,6 +12,13 @@ # Cross-compilation: all installations need to be put in the sysmo SDK sysroot export DESTDIR="$_poky_path/sysroots/cortexa15hf-neon-poky-linux-gnueabi"

+# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing +# unavailability of netinet/sctp.h. +# Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ +# Merged: poky.git b11fc7795cd1a6d74c9bb50b922d928f4a17722d +# See meta-telephony.git 7acf2bff4e279b7d974373b952bad8e400c3bff2 +export ac_cv_header_netinet_sctp_h=yes + base="$PWD" name="osmo-pcu-oc2g" prefix="/usr/local/jenkins-build/inst-$name" diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index 86d53da..e55fd3d 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -12,6 +12,13 @@ # Cross-compilation: all installations need to be put in the sysmo SDK sysroot export DESTDIR="$_poky_path/sysroots/armv5te-poky-linux-gnueabi"

+# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing +# unavailability of netinet/sctp.h. +# Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ +# Merged: poky.git b11fc7795cd1a6d74c9bb50b922d928f4a17722d +# See meta-telephony.git 7acf2bff4e279b7d974373b952bad8e400c3bff2 +export ac_cv_header_netinet_sctp_h=yes + base="$PWD" name="osmo-pcu-sysmo" prefix="/usr/local/jenkins-build/inst-$name"