Commit Graph

86 Commits

Author SHA1 Message Date
Neels Hofmeyr 7aeaf42112 add prefix_usr.opts
Change-Id: I258711d3cfcc310a0dde1a37532c3a8b1ea2f373
2018-11-19 02:54:11 +01:00
Neels Hofmeyr 4f0612251c fill_config.py: ignore templates starting with 'common_'
It's useful to include common parts in numerous cfg files, using the
${include(path)} command. So far they were called common_* and stored outside
of the templates dir (e.g. for logging). So far all files in a templates dir
are seen as templates, so the common files had to be stored in a different dir,
which is a bit senseless.

Allow storing them in the same dir with the templates: ignore all files
starting with 'common_'.

Change-Id: I74446dc0a7f51d4f231e8758a691abb675e87483
2018-11-17 00:05:16 +01:00
Neels Hofmeyr 5549ffbde8 fill_config.py: add ${foreach(FOO)}
This patch indicates that we should rather use a proper templating python
library instead of re-inventing this stuff. But now that we're here...

Add a construct

  ${foreach(BTS)}
   bts ${BTSn}
    location_area_code ${BTSn_LAC}
  ${foreach_end}

that repeats for each BTS<nr> variable found, e.g.

  BTS0_LAC=23
  BTS1_LAC=24
  BTS2_LAC=25

would result in three blocks of the above.

I am using this to avoid copy-pasting for configuring N BTSes for 35c3.

Change-Id: Ie1139a017f42cea5bf7ebbbe457bbc3bfe06944c
2018-11-16 18:43:43 +01:00
Neels Hofmeyr 01496a8afe deps: osmo-msc now needs libosmo-gsup-client from osmo-hlr
Change-Id: Ic50819b7bf7b5bcebe39d89850cf8b153fd287d8
2018-11-15 16:06:42 +01:00
Oliver Smith b93f504814 gits: use git plumbing commands
Instead of 'git status' and 'git branch', which change their output
depending on the git version and locale, use the low-level plumbing
commands.

'gits status' output is exactly the same, 'gits rebase' output is
a bit less redundant now (that was easier to implement).

Change-Id: I42544313d14db126c99e2d9a02b8f63031944947
2018-11-09 15:22:09 +01:00
Neels Hofmeyr b459b6c2ae replace src/* git scripts with a single src/gits
I keep re-using this functionality in completely unrelated realms, and decided
to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can
just symlink this script into my ~/bin and use it everywhere.

Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2
2018-11-08 11:37:19 +01:00
Neels Hofmeyr 0cbe590462 sanitize.opts: add osmo-sip-connector --enable-sanitize
Otherwise it is not able to link asan-enabled libosmocore in the binaries.

Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196
2018-11-07 16:54:23 +01:00
Neels Hofmeyr f08745f9f2 2G.deps: add osmo-sip-connector
Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3
2018-11-07 16:54:21 +01:00
Neels Hofmeyr 80630cfe8e deps: comment out osmo-trx
osmo-trx shouldn't run with address sanitizer. But omitting --enable-sanitize
from osmo-trx breaks 'make check', so then the whole top-level makefile will
end in error with sanitize.opts.

A user wanting to build osmo-trx can just uncomment that line.

Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb
2018-11-07 16:53:34 +01:00
Pau Espin 3cb08210b3 deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client
Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a
2018-10-31 15:32:21 +01:00
Oliver Smith 5c882f66e9 gen_makefile.py: detect changes in cpp files
Properly rebuild when cpp files (e.g. from osmo-trx) have been changed.

Change-Id: I9382d984fa1988eefbb6be3e45d88b2f1f5b598a
2018-10-31 14:13:34 +01:00
Oliver Smith 9c032908e2 2G.deps, 3G+2G.deps: add osmo-trx
Change-Id: Ia4ebf2732694cee0600b602b82c660cf6278958d
2018-10-31 14:13:14 +01:00
Oliver Smith d9f3d34443 support osmo-sip-connector with kamailio
Kamailio is a SIP server, that is relatively easy to configure, in
contrary to asterisk it only has one config file. The config file
here is based on the example config provided in the wiki:

<http://osmocom.org/projects/osmo-sip-conector/wiki/Howto>

To enable the osmo-sip-connector, build it, install kamailio and
then set SIPCON_ENABLE=true in your copy of config_2g_3g.

Change-Id: Ia5c4e9992eab390bc6d26ada7564223ff41a01b2
2018-10-31 14:12:28 +01:00
Oliver Smith fd7446fcab fill_config.py: add NET_DIR variable
Allow all config files to use a new NET_DIR variable, which always
points to the network folder with the generated configs. We can use
this to place all temporary files (sockets, pid files, ...) there.

Change-Id: Idbdf478ebb9f0b2fcd860e5eff3c414a0a459561
2018-10-31 13:07:00 +00:00
Neels Hofmeyr eee671b15d add BSC_CODEC_LIST to config 2018-10-29 17:50:17 +01:00
Oliver Smith 4d7072cc2d find the terminal once and abort if missing
Change-Id: Ie823e17ff1e7ad3ba23998233b41a810c90858b3
2018-10-12 11:10:06 +02:00
Oliver Smith d865c97ec4 change default of MGW4BSC_PORT to 2427
That way one can view the MGCP traffic in wireshark without changing
the MGCP port. We are using a different IP for the two MGWs already, so
they won't conflict even if they use the same port.

Change-Id: I2c73df138642bc3fd52eea493fcab5261e5bc5c8
2018-10-05 14:34:34 +02:00
Oliver Smith b56ce0b326 3G+2G.deps: add osmo-sip-connector
Change-Id: I57fa43209581638c39554079d7c4b65ce24890f8
2018-10-05 14:34:34 +02:00
Neels Hofmeyr b045b5366a net/tmpl_std: msc: iu: use X.213 NSAP for nano3G 2018-10-01 17:33:18 +02:00
Neels Hofmeyr cae6585391 add common_bsc_logging for less debug logs 2018-09-26 15:04:20 +02:00
Neels Hofmeyr 9bd6241cb3 common_logging: use 'logging set-all' to not force debug 2018-09-26 15:03:20 +02:00
Neels Hofmeyr e02e0aee7a fill_config: resolve relative include paths recursively 2018-09-26 14:57:57 +02:00
Neels Hofmeyr ede8016f4b tmpl_std: run.sh: make 'ip addr add $ip2' optional 2018-09-16 13:49:54 +02:00
Neels Hofmeyr dd37c72bca tmpl_std: hlr: add *#100#, *#101#
My old Nokia refuses to send *1# as USSD.
2018-09-16 13:49:54 +02:00
Neels Hofmeyr 8051995a96 common_logging: file basename last 2018-09-16 13:49:54 +02:00
Neels Hofmeyr 8d066e8a1e all-tests.opts: add libosmocore external-tests 2018-09-16 13:49:54 +02:00
Neels Hofmeyr 19d8a0d9f2 add no_systemd.opts 2018-09-16 13:49:54 +02:00
Neels Hofmeyr d924e332bb fill_config.py: fix missing config file error msg 2018-09-10 00:05:29 +02:00
Neels Hofmeyr a007eaa405 gen_makefile: add ALL config opts keyword 2018-09-04 14:37:38 +02:00
Neels Hofmeyr 6d16ae9bad gen_makefile: mark project name as phony target 2018-09-04 14:37:38 +02:00
Neels Hofmeyr f6078c49c0 gen_makefile: add --no-make-check 2018-09-04 14:37:38 +02:00
Neels Hofmeyr 5a9bf17171 tweak readme 2018-08-23 15:31:44 +02:00
Neels Hofmeyr 57e4288c86 include cfg.sh,stale_config.sh in fill_config.py
Staleness check now also checks for included files.
fill_config.py figures out last used paths itself and has cmdline doc.
2018-08-23 15:19:35 +02:00
Neels Hofmeyr 3178290e9e net: make more items configurable from config file 2018-08-23 14:17:20 +02:00
Neels Hofmeyr 697a617e0e add template-configs, script to launch network
This is the set of scripts I've written for myself over the years to easily
configure and run Osmocom core networks on my lab computer. I hope this will be
useful to others as well.
2018-08-23 14:17:20 +02:00
Neels Hofmeyr 693355ea35 e: rewrite in python for proper arg handling 2018-07-26 16:46:38 +02:00
Neels Hofmeyr 7bd5c31c4e sync before touching .make.* files 2018-07-26 16:43:01 +02:00
Neels Hofmeyr 2e65707b57 gen_makefile.py: libsmpp34 can build in parallel now 2018-05-29 12:24:34 +02:00
Neels Hofmeyr 8b5d6a96c5 add openbsc.deps to allow building legacy openbsc.git as well 2018-05-25 17:19:42 +02:00
Neels Hofmeyr 453004b171 fix some deps: sgsn->ggsn and msc->libsmpp34 2018-05-25 17:14:16 +02:00
Neels Hofmeyr 1fa9b2989e rm .version with -f 2018-04-23 17:04:25 +02:00
Neels Hofmeyr 4d38c1e77b add reinstall 2018-04-23 17:04:15 +02:00
Neels Hofmeyr 0d3ff73413 fix 2G.deps: missing deps for osmo-msc 2018-04-10 13:19:04 +02:00
Neels Hofmeyr 29fde6ff8e gen_makefile: accomodate openbsc's extra subdir 2018-04-01 15:57:02 +02:00
Neels Hofmeyr 972c2945e2 gen_makefile: fix empty push-url for 'make regen' 2018-03-16 03:49:58 +01:00
Neels Hofmeyr 1b0d34f77a produced Makfile: add all_debug target to see rebuild reasons 2018-03-16 03:46:08 +01:00
Neels Hofmeyr 4f81d9e213 add werror.opts using 'configure --enable-werror' 2018-03-16 03:45:02 +01:00
Neels Hofmeyr 28d4be5520 gen_makefile: add --push-url option 2018-03-16 03:44:07 +01:00
Neels Hofmeyr d313c72b40 s: auto fast forward, commit local mods first 2018-02-28 18:28:09 +01:00
Neels Hofmeyr 2535a26046 gen_makefile: add example to end of --help 2018-01-16 16:34:32 +01:00