From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../yatebts-4.0.0-dont-mess-with-cflags.patch | 13 ++++ .../yatebts/files/yatebts-5.0.0-gcc6.patch | 31 ++++++++ ...bts-bladeRF-transceiver_revert_init_order.patch | 86 ++++++++++++++++++++++ .../yatebts-sgsnggsn-inetutils-hostname-fix.diff | 14 ++++ 4 files changed, 144 insertions(+) create mode 100644 net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch create mode 100644 net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch create mode 100644 net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch create mode 100644 net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff (limited to 'net-wireless/yatebts/files') diff --git a/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch new file mode 100644 index 000000000000..b10eb57237ef --- /dev/null +++ b/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch @@ -0,0 +1,13 @@ +diff -Naur yate-bts/configure.in yate-bts-sane/configure.in +--- yate-bts/configure.in 2014-07-25 10:28:44.000000000 -0400 ++++ yate-bts-sane/configure.in 2014-07-25 17:38:23.550069064 -0400 +@@ -36,9 +36,6 @@ + AC_PROG_CC + AC_PROG_AWK + +-# Delete -g as we handle debug info at build time +-CFLAGS=`echo "$CFLAGS" | sed 's/-g[[0-9]]* *//' 2>/dev/null` +- + # Helper to check by pkgconfig including local paths + function pkgconfig_check() + { diff --git a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch new file mode 100644 index 000000000000..988ca2d4f73f --- /dev/null +++ b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch @@ -0,0 +1,31 @@ +--- a/mbts/GPRS/MSInfo.cpp ++++ b/mbts/GPRS/MSInfo.cpp +@@ -638,7 +638,7 @@ + if (msPCHDowns.size() > 1) { + std::ostringstream os; + msDumpChannels(os); +- GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<getSI() == this)) { +@@ -252,7 +252,7 @@ + { + std::ostringstream ss; + gmmInfoDump(gmm,ss,0); +- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"< + +- + #define MIN_OVERSAMPLING 4 + + #define HEALTH_BAD 10 +@@ -128,7 +127,36 @@ bool bladeRFDevice::open(const std::string &args, bool) + << "." << ver.patch << " (" << ver.describe << ")"; + + uint32_t val = 0; +- bladerf_config_gpio_read(bdev, &val); ++ ++ status = bladerf_sync_config(bdev, ++ BLADERF_MODULE_RX, ++ BLADERF_FORMAT_SC16_Q11, ++ DEFAULT_STREAM_RX_BUFFERS, ++ DEFAULT_STREAM_SAMPLES, ++ DEFAULT_STREAM_RX_XFERS, ++ DEFAULT_STREAM_TIMEOUT ++ ); ++ ++ if (status < 0) { ++ LOG(CRIT) << "Failed to intialize RX sync handle: " << bladerf_strerror(status); ++ checkHealth(mRxHealth, false); ++ } ++ ++ status = bladerf_sync_config(bdev, ++ BLADERF_MODULE_TX, ++ BLADERF_FORMAT_SC16_Q11, ++ DEFAULT_STREAM_TX_BUFFERS, ++ DEFAULT_STREAM_SAMPLES, ++ DEFAULT_STREAM_TX_XFERS, ++ DEFAULT_STREAM_TIMEOUT ++ ); ++ ++ if (status < 0) { ++ LOG(CRIT) << "Failed to intialize TX sync handle: " << bladerf_strerror(status); ++ checkHealth(mTxHealth, false); ++ } ++ ++ bladerf_config_gpio_read(bdev, &val); + val |= 0x10000; //enable timestamps, clears and resets everything on write + bladerf_config_gpio_write(bdev, val); + bladerf_config_gpio_read(bdev, &val); +@@ -185,34 +213,6 @@ bool bladeRFDevice::open(const std::string &args, bool) + else + LOG(INFO) << "Actual bandwidth " << bw; + +- status = bladerf_sync_config(bdev, +- BLADERF_MODULE_RX, +- BLADERF_FORMAT_SC16_Q11, +- DEFAULT_STREAM_RX_BUFFERS, +- DEFAULT_STREAM_SAMPLES, +- DEFAULT_STREAM_RX_XFERS, +- DEFAULT_STREAM_TIMEOUT +- ); +- +- if (status < 0) { +- LOG(CRIT) << "Failed to intialize RX sync handle: " << bladerf_strerror(status); +- checkHealth(mRxHealth, false); +- } +- +- status = bladerf_sync_config(bdev, +- BLADERF_MODULE_TX, +- BLADERF_FORMAT_SC16_Q11, +- DEFAULT_STREAM_TX_BUFFERS, +- DEFAULT_STREAM_SAMPLES, +- DEFAULT_STREAM_TX_XFERS, +- DEFAULT_STREAM_TIMEOUT +- ); +- +- if (status < 0) { +- LOG(CRIT) << "Failed to intialize TX sync handle: " << bladerf_strerror(status); +- checkHealth(mTxHealth, false); +- } +- + mRxGain1 = BLADERF_RXVGA1_GAIN_MAX; + mDcCorrect = true; + mRxMaxOffset = RX_OFFSET_ERROR * RX_AVERAGE_DAMPING; + diff --git a/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff b/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff new file mode 100644 index 000000000000..46b4b1d1ba4d --- /dev/null +++ b/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff @@ -0,0 +1,14 @@ +diff --git a/mbts/SGSNGGSN/iputils.cpp b/mbts/SGSNGGSN/iputils.cpp +index 979ae3a..49bb0ff 100644 +--- a/mbts/SGSNGGSN/iputils.cpp ++++ b/mbts/SGSNGGSN/iputils.cpp +@@ -466,7 +466,7 @@ EXPORT uint32_t *ip_findmyaddr() + const int maxaddrs = 5; + static uint32_t addrs[maxaddrs+1]; + int n = 0; +- int fd = runcmd("|/bin/hostname","hostname","-I", NULL); ++ int fd = runcmd("|/bin/hostname","hostname","-i", NULL); + if (fd < 0) { + failed: + addrs[0] = (unsigned) -1; // converts to all 1s + -- cgit v1.2.3