osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40350?usp=email ) Change subject: gen_makefile: remove openbsc support ...................................................................... gen_makefile: remove openbsc support This makes gen_make simpler. OpenBSC is obsolete since 2017, I think we can safely remove support for it from osmo-dev. Related: openbsc I5d5c0ff386dbc2e7b7dd02d6c33d1f9fec70707b Change-Id: Ia375e32d2e5e9f9d55568b9393b6935c647ec9d0 --- M default.opts M gen_makefile.py M iu.opts D openbsc.deps M sanitize.opts 5 files changed, 0 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/default.opts b/default.opts index 68a8c23..4b9e068 100644 --- a/default.opts +++ b/default.opts @@ -1,4 +1,3 @@ osmo-msc --enable-smpp -openbsc --enable-smpp --enable-osmo-bsc --enable-nat nftables --with-json strongswan-epdg --enable-osmo-epdg --enable-save-keys --enable-eap-aka-3gpp --enable-eap-aka-3gpp2 diff --git a/gen_makefile.py b/gen_makefile.py index 44c257d..550c722 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -442,9 +442,6 @@ def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): src_proj = os.path.join(src_dir, proj) - if proj == 'openbsc': - src_proj = os.path.join(src_proj, 'openbsc') - src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) build_proj = os.path.join(build_dir, proj) diff --git a/iu.opts b/iu.opts index bb58742..a96a1bc 100644 --- a/iu.opts +++ b/iu.opts @@ -1,3 +1,2 @@ osmo-msc --enable-iu osmo-sgsn --enable-iu -openbsc --enable-iu diff --git a/openbsc.deps b/openbsc.deps deleted file mode 100644 index f49e6a1..0000000 --- a/openbsc.deps +++ /dev/null @@ -1,8 +0,0 @@ -# project build these first -libosmocore -libosmo-abis libosmocore -libosmo-netif libosmo-abis -libsmpp34 -osmo-ggsn libosmocore -osmo-sgsn libosmo-netif osmo-ggsn -openbsc libosmo-netif libsmpp34 diff --git a/sanitize.opts b/sanitize.opts index 72a1d69..0ef0a8c 100644 --- a/sanitize.opts +++ b/sanitize.opts @@ -13,7 +13,6 @@ osmo-mgw --enable-sanitize osmo-msc --enable-sanitize osmo-sgsn --enable-sanitize -openbsc --enable-sanitize osmo-sip-connector --enable-sanitize osmo-pcu --enable-sanitize osmo-bts --enable-sanitize -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia375e32d2e5e9f9d55568b9393b6935c647ec9d0 Gerrit-Change-Number: 40350 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>