- gerrit-log - lists.osmocom.org

[M] Change in osmo-dev[master]: gen_makefile: generate convenience targets

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40838?usp=email ) Change subject: gen_makefile: generate convenience targets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40838?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I64cd267cb1accda308585144b154f5f3837bf3e7 Gerrit-Change-Number: 40838 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 09:05:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: turn projects_deps into a dict

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40837?usp=email ) Change subject: gen_makefile: turn projects_deps into a dict ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40837?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I74c53f4d6dda791c5d9e14f2274260f0e8cbbad2 Gerrit-Change-Number: 40837 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 09:03:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[M] Change in libosmo-abis[master]: Create rpm make targets and add libosmo-abis.spec.in

by fixeria

Attention is currently required from: Paul Bichis. fixeria has posted comments on this change by Paul Bichis. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40833?usp=email ) Change subject: Create rpm make targets and add libosmo-abis.spec.in ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: We did have RPM spec files in the past, but they have been removed: https://gerrit.osmocom.org/c/libosmo-abis/+/36723 For more details, please see: * https://osmocom.org/news/246 * https://osmocom.org/news/255 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40833?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I86c2c621887d1d9352f3ddfa1270c1379cf50fd9 Gerrit-Change-Number: 40833 Gerrit-PatchSet: 3 Gerrit-Owner: Paul Bichis <paul(a)afk.ro> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Paul Bichis <paul(a)afk.ro> Gerrit-Comment-Date: Wed, 06 Aug 2025 09:02:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 week, 3 days

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: turn projects_deps into a dict

by jolly

Attention is currently required from: fixeria, osmith. jolly has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40837?usp=email ) Change subject: gen_makefile: turn projects_deps into a dict ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40837?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I74c53f4d6dda791c5d9e14f2274260f0e8cbbad2 Gerrit-Change-Number: 40837 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 08:59:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[XS] Change in libosmo-abis[master]: Declare contrib/libosmo-abis.spec in AC_LOCAL

by fixeria

Attention is currently required from: Paul Bichis. fixeria has posted comments on this change by Paul Bichis. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40836?usp=email ) Change subject: Declare contrib/libosmo-abis.spec in AC_LOCAL ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-abis/+/40836/comment/6ca020cd_7a0c630d… : PS1, Line 7: contrib/libosmo-abis.spec File `contrib/libosmo-abis.spec.in` is no longer present in the repository. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40836?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I5c99d0d19908000e5e6ae521faeb25e7e6ecd32d Gerrit-Change-Number: 40836 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Bichis <paul(a)afk.ro> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Paul Bichis <paul(a)afk.ro> Gerrit-Comment-Date: Wed, 06 Aug 2025 08:54:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 week, 3 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: osmo_dev: remove unused limit_section arg

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40840?usp=email ) Change subject: testenv: osmo_dev: remove unused limit_section arg ...................................................................... testenv: osmo_dev: remove unused limit_section arg Remove the unused limit_section argument in testenv.osmo_dev.make(). The idea was to use osmo-dev to build programs where no packages are available when using --binary-packages, but this didn't work because when using --binary-packages, we must install all package dependencies from the binary repository (so testing nightly / latest use the expected library versions). Nowadays this use case is handled by podman_install.from_source_* functions without using osmo-dev. Change-Id: Ib09ffd0e269c58acd431bdbb5cc7cdcec2d36359 --- M _testenv/testenv/osmo_dev.py 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/40840/1 diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 5852063..fd5fa4e 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -99,7 +99,7 @@ init_done = True -def make(cfg, limit_section=None): +def make(cfg): targets = [] for section in cfg: @@ -107,11 +107,6 @@ if section == "testsuite": # Gets built with testenv.testsuite.build() continue - if limit_section and limit_section != section: - # When called from testenv.podman.install_packages as fallback to - # not having a package available, then we only want to run make - # for the target of one specific config section - continue if "make" in section_data and section_data["make"] != "no" and section_data["make"] not in targets: targets += [section_data["make"]] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40840?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib09ffd0e269c58acd431bdbb5cc7cdcec2d36359 Gerrit-Change-Number: 40840 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 week, 3 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv/osmo-dev: split get_targets to own func

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40841?usp=email ) Change subject: testenv/osmo-dev: split get_targets to own func ...................................................................... testenv/osmo-dev: split get_targets to own func Split the code for getting osmo-dev targets into a separate function, so this can be reused in the next patch. Change-Id: I2bd7c05102ca472614289870957cdca335c01eaf --- M _testenv/testenv/osmo_dev.py 1 file changed, 16 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/40841/1 diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index fd5fa4e..8f9667e 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -51,6 +51,21 @@ sys.exit(1) +def get_targets(cfg): + ret = [] + + for section in cfg: + section_data = cfg[section] + if section == "testsuite": + # Gets built with testenv.testsuite.build() + continue + + if "make" in section_data and section_data["make"] != "no" and section_data["make"] not in ret: + ret += [section_data["make"]] + + return ret + + def init(): global init_done @@ -100,17 +115,7 @@ def make(cfg): - targets = [] - - for section in cfg: - section_data = cfg[section] - if section == "testsuite": - # Gets built with testenv.testsuite.build() - continue - - if "make" in section_data and section_data["make"] != "no" and section_data["make"] not in targets: - targets += [section_data["make"]] - + targets = get_targets(cfg) if not targets: logging.debug("No osmo-dev make targets found in testenv.cfg") return -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2bd7c05102ca472614289870957cdca335c01eaf Gerrit-Change-Number: 40841 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 week, 3 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: pass targets to osmo-dev's gen_makefile

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40842?usp=email ) Change subject: testenv: pass targets to osmo-dev's gen_makefile ...................................................................... testenv: pass targets to osmo-dev's gen_makefile Pass the targets we are about to build to osmo-dev's gen_makefile script. This has two advantages: 1) Check early if a target isn't known by the current osmo-dev version, displaying a useful error to the user instead of just failing during make later on: ERROR: filter_projects_deps_targets: can't find project osmo-new-project in projects_deps! [testenv] gen_makefile.py from osmo-dev failed! [testenv] Your osmo-dev.git clone might be outdated, try: [testenv] $ git -C /home/user/code/osmo-dev pull 2) Parsing the generated Makefile when running "make" after generating it doesn't cause a noticable delay anymore. On my machine (with many Osmocom git repos cloned in osmo-dev's src dir) it went from several seconds to instantly. Depends: osmo-dev I89bb60e94dd03606dbba5a3609d5e1a95993af5b Change-Id: Ib2d8802b305f145d27aab3c1cc3129709b93d93d --- M _testenv/testenv.py M _testenv/testenv/osmo_dev.py 2 files changed, 4 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/40842/1 diff --git a/_testenv/testenv.py b/_testenv/testenv.py index ebc625e..9e33e37 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -45,9 +45,6 @@ testenv.podman.start() testenv.podman.check_titan_version() - if not testenv.args.binary_repo: - testenv.osmo_dev.init() - testenv.testsuite.init() testenv.testsuite.build() @@ -55,6 +52,7 @@ if not testenv.args.binary_repo: for cfg_name, cfg in testenv.testenv_cfg.cfgs.items(): testenv.testenv_cfg.set_current(cfg_name) + testenv.osmo_dev.init(cfg) testenv.osmo_dev.make(cfg) # Run the components + testsuite diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8f9667e..0b6bdf0 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -7,8 +7,6 @@ import testenv import testenv.cmd -init_done = False - def get_osmo_dev_dir(): # Users may have used osmo-dev to clone osmo-ttcn3-hacks: @@ -66,12 +64,7 @@ return ret -def init(): - global init_done - - if init_done: - return - +def init(cfg): extra_opts = [] if testenv.args.asan: extra_opts += ["sanitize.opts"] @@ -91,6 +84,8 @@ "--src-dir", testenv.src_dir, "--autoreconf-in-src-copy", + "--targets", + ",".join(get_targets(cfg)), "default.opts", "ccache.opts", "gtp_linux.opts", @@ -111,7 +106,6 @@ logging.critical("Your osmo-dev.git clone might be outdated, try:") logging.critical(f"$ git -C {shlex.quote(cwd)} pull") sys.exit(1) - init_done = True def make(cfg): -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40842?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2d8802b305f145d27aab3c1cc3129709b93d93d Gerrit-Change-Number: 40842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 week, 3 days

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: turn projects_deps into a dict

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40837?usp=email ) Change subject: gen_makefile: turn projects_deps into a dict ...................................................................... gen_makefile: turn projects_deps into a dict Let read_projects_deps() return a dictionary instead of a list of tuples. This allows looking up entries in the dictionary by project name, which I'm making use of in a future patch. While using a dictionary here makes more sense, I assume this was implemented as list of tuples because with earlier (long EOL) python3 versions, the order of entries in the dictionary were not stable. From https://docs.python.org/3/library/stdtypes.html#dict: > Changed in version 3.7: Dictionary order is guaranteed to be insertion > order. This behavior was an implementation detail of CPython from 3.6. Change-Id: I74c53f4d6dda791c5d9e14f2274260f0e8cbbad2 --- M gen_makefile.py 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/40837/1 diff --git a/gen_makefile.py b/gen_makefile.py index e06dbd2..c49a27a 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -144,15 +144,15 @@ self.extend(k, v) def read_projects_deps(path): - 'Read deps config and return tuples of (project_name, which-other-to-build-first).' - l = [] + 'Read deps config and return a dict of {project_name: which-other-to-build-first, …}.' + ret = {} for line in open(path): line = line.strip() if not line or line.startswith('#'): continue tokens = line.split() - l.append((tokens[0], tokens[1:])) - return l + ret[tokens[0]] = tokens[1:] + return ret def read_projects_dict(path): 'Read urls/buildsystems config and return dict {project_name: url, …}.' @@ -170,7 +170,7 @@ 'Read config opts file and return tuples of (project_name, config-opts).' if not path: return {} - return dict(read_projects_deps(path)) + return read_projects_deps(path) def gen_makefile_clone(proj, src, src_proj, update_src_copy_cmd): if proj == "osmocom-bb_layer23": @@ -646,17 +646,17 @@ """ # convenience target: clone all repositories first -content += 'clone: \\\n\t' + ' \\\n\t'.join([ '.make.%s.clone' % p for p, d in projects_deps ]) + '\n\n' +content += 'clone: \\\n\t' + ' \\\n\t'.join([ '.make.%s.clone' % p for p, d in projects_deps.items() ]) + '\n\n' # convenience target: clean all -content += 'clean: \\\n\t' + ' \\\n\t'.join([ '%s-clean' % p for p, d in projects_deps ]) + '\n\n' +content += 'clean: \\\n\t' + ' \\\n\t'.join([ '%s-clean' % p for p, d in projects_deps.items() ]) + '\n\n' # now the actual useful build rules content += 'all: clone all-install\n\n' -content += 'all-install: \\\n\t' + ' \\\n\t'.join([ '.make.%s.install' % p for p, d in projects_deps ]) + '\n\n' +content += 'all-install: \\\n\t' + ' \\\n\t'.join([ '.make.%s.install' % p for p, d in projects_deps.items() ]) + '\n\n' -for proj, deps in projects_deps: +for proj, deps in projects_deps.items(): all_config_opts = [] all_config_opts.extend(configure_opts.get('ALL') or []) all_config_opts.extend(configure_opts.get(proj) or []) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40837?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I74c53f4d6dda791c5d9e14f2274260f0e8cbbad2 Gerrit-Change-Number: 40837 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 week, 3 days

1
0
0 0

[M] Change in osmo-dev[master]: gen_makefile: generate convenience targets

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40838?usp=email ) Change subject: gen_makefile: generate convenience targets ...................................................................... gen_makefile: generate convenience targets Instead of directly hardcoding the convenience targets as Makefile code, generate them from a dictionary. This allows reusing the information from the dictionary in the next patch for the --targets option. Change-Id: I64cd267cb1accda308585144b154f5f3837bf3e7 --- M gen_makefile.py 1 file changed, 45 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/38/40838/1 diff --git a/gen_makefile.py b/gen_makefile.py index c49a27a..5eb28ef 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -58,6 +58,40 @@ all_buildsystems_file = os.path.join(topdir, "all.buildsystems") parser = argparse.ArgumentParser(epilog=__doc__, formatter_class=argparse.RawTextHelpFormatter) +convenience_targets = { + # Whole networks + "cn": [ + "osmo-ggsn", + "osmo-hlr", + "osmo-iuh", + "osmo-mgw", + "osmo-sgsn", + "osmo-sip-connector", + "osmo-smlc", + ], + "cn-bsc": [ + "cn", + "osmo-bsc", + ], + "cn-bsc-nat": [ + "cn", + "mobile", + "osmo-bsc", + "osmo-bsc-nat", + "osmo-bts", + "virtphy", + ], + "usrp": [ + "cn-bsc", + "osmo-bts", + "osmo-trx", + ], + # Components in subdirs of repositories + "mobile": ["osmocom-bb_layer23"], + "trxcon": ["osmocom-bb_trxcon"], + "virtphy": ["osmocom-bb_virtphy"], +} + parser.add_argument('configure_opts_files', help='''Config file containing project name and ./configure options''', @@ -172,6 +206,15 @@ return {} return read_projects_deps(path) +def gen_convenience_targets(): + ret = "" + for short, full in convenience_targets.items(): + if ret: + ret += "\n" + ret += f".PHONY: {short}\n" + ret += f"{short}: {' '.join(full)}\n" + return ret + def gen_makefile_clone(proj, src, src_proj, update_src_copy_cmd): if proj == "osmocom-bb_layer23": return f''' @@ -550,55 +593,9 @@ default: usrp # -# Convenience targets for whole networks +# Convenience targets (whole networks, components in subdirs) # -.PHONY: cn -cn: \\ - osmo-ggsn \\ - osmo-hlr \\ - osmo-iuh \\ - osmo-mgw \\ - osmo-msc \\ - osmo-sgsn \\ - osmo-sip-connector \\ - osmo-smlc \\ - $(NULL) - -.PHONY: cn-bsc -cn-bsc: \\ - cn \\ - osmo-bsc \\ - $(NULL) - -.PHONY: cn-bsc-nat -cn-bsc-nat: \\ - cn \\ - mobile \\ - osmo-bsc \\ - osmo-bsc-nat \\ - osmo-bts \\ - virtphy \\ - $(NULL) - -.PHONY: usrp -usrp: \\ - cn-bsc \\ - osmo-bts \\ - osmo-trx \\ - $(NULL) - -# -# Convenience targets for components in subdirs of repositories -# -.PHONY: mobile -mobile: osmocom-bb_layer23 - -.PHONY: virtphy -virtphy: osmocom-bb_virtphy - -.PHONY: trxcon -trxcon: osmocom-bb_trxcon - +{gen_convenience_targets()} # # Other convenience targets # -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40838?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I64cd267cb1accda308585144b154f5f3837bf3e7 Gerrit-Change-Number: 40838 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 week, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log