- gerrit-log - lists.osmocom.org

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

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40841?usp=email ) Change subject: testenv/osmo-dev: split get_targets to own func ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 11:58:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 5 hours

1
0
0 0

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

by laforge

Attention is currently required from: jolly, osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40840?usp=email ) Change subject: testenv: osmo_dev: remove unused limit_section arg ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 06 Aug 2025 11:58:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 5 hours

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve 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: merged 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-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 days, 6 hours

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40839?usp=email ) Change subject: gen_makefile: add --targets ...................................................................... gen_makefile: add --targets Add an option to specify the targets to include in the Makefile, instead of always including all of them. This option will be used by testenv to check early if there are any unknown targets, and to make running the generated Makefile faster. Running the Makefile is currently slowed down when having a lot of projects cloned in osmo-dev's src dir, because regardless of the target to be built, make is looking for all source files for all projects while parsing the Makefile. For each project we have: libosmocore_configure_files := $(shell find -L …/src/libosmocore …) libosmocore_files := $(shell find -L …/src/libosmocore …) Changing ":=" to "=" doesn't make it faster either, make still executes the find commands while parsing target lines such as: .make.libosmocore.build: .make.libosmocore.configure $(libosmocore_files) Related: osmo-ttcn3-hacks Ib2d8802b305f145d27aab3c1cc3129709b93d93d Change-Id: I89bb60e94dd03606dbba5a3609d5e1a95993af5b --- M gen_makefile.py M tests/test_gen_makefile.py 2 files changed, 51 insertions(+), 0 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/gen_makefile.py b/gen_makefile.py index 5eb28ef..4730c59 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -153,6 +153,9 @@ parser.add_argument('-A', '--autoreconf-in-src-copy', action='store_true', help="run autoreconf in a copy of the source dir, avoids 'run make distclean' errors") +parser.add_argument('--targets', + help="comma separated list of high-level targets to build instead of all targets") + args = parser.parse_args() class listdict(dict): @@ -215,6 +218,40 @@ ret += f"{short}: {' '.join(full)}\n" return ret +def filter_projects_deps_targets(): + if not args.targets: + return projects_deps + + ret = {} + for target in args.targets.split(","): + # .make.osmocom-bb.clone -> osmocom-bb + if target.startswith(".make."): + target = target.split(".")[2] + + current_targets = [target] + if target in convenience_targets: + current_targets = convenience_targets[target] + + for target in current_targets: + # Add target + all dependencies to ret + queue = [target] + while queue: + project = queue.pop() + if project not in projects_deps: + print() + print(f"ERROR: filter_projects_deps_targets: can't find project {project} in projects_deps!") + print() + sys.exit(1) + + deps = projects_deps[project] + ret[project] = deps + + for dep in deps: + if dep not in ret: + queue += [dep] + + return ret + def gen_makefile_clone(proj, src, src_proj, update_src_copy_cmd): if proj == "osmocom-bb_layer23": return f''' @@ -555,6 +592,7 @@ ''' projects_deps = read_projects_deps(all_deps_file) +projects_deps = filter_projects_deps_targets() projects_urls = read_projects_dict(all_urls_file) projects_buildsystems = read_projects_dict(all_buildsystems_file) configure_opts = listdict() @@ -631,6 +669,8 @@ content += " --build-debug \\\n" if args.autoreconf_in_src_copy: content += " --autoreconf-in-src-copy \\\n" +if args.targets: + content += f" --targets={shlex.quote(args.targets)} \\\n" content += " $(NULL)\n" if args.autoreconf_in_src_copy: diff --git a/tests/test_gen_makefile.py b/tests/test_gen_makefile.py index 2ae0667..6232003 100644 --- a/tests/test_gen_makefile.py +++ b/tests/test_gen_makefile.py @@ -64,3 +64,14 @@ run_cmd(["./gen_makefile.py", "-m", tmp_path, "--autoreconf-in-src-copy"], cwd=osmo_dev_path) run_cmd(["make", ".make.open5gs.configure"], cwd=tmp_path) run_make_regen_2x(tmp_path) + + +def test_gen_makefile_with_targets_arg(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path, "--targets", "trxcon,osmo-mgw"], cwd=osmo_dev_path) + run_cmd("grep -q '^osmocom-bb_trxcon_files :=' Makefile", cwd=tmp_path, shell=True) + run_cmd("grep -q '^osmo-mgw_files :=' Makefile", cwd=tmp_path, shell=True) + run_cmd("grep -q '^libosmocore_files :=' Makefile", cwd=tmp_path, shell=True) + run_cmd("! grep -q '^osmo-bts_files :=' Makefile", cwd=tmp_path, shell=True) + run_cmd("! grep -q '^osmo-s1gw_files :=' Makefile", cwd=tmp_path, shell=True) + run_cmd("! grep -q '^open5gs_files :=' Makefile", cwd=tmp_path, shell=True) + run_make_regen_2x(tmp_path) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40839?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: I89bb60e94dd03606dbba5a3609d5e1a95993af5b Gerrit-Change-Number: 40839 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-Reviewer: osmith <osmith(a)sysmocom.de>

3 days, 6 hours

1
0
0 0

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

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40839?usp=email ) Change subject: gen_makefile: add --targets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40839?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: I89bb60e94dd03606dbba5a3609d5e1a95993af5b Gerrit-Change-Number: 40839 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 10:54:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 6 hours

1
0
0 0

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

by osmith

osmith 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+2 -- 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-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 10:54:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 6 hours

1
0
0 0

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

by jolly

Attention is currently required from: osmith. jolly has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40839?usp=email ) Change subject: gen_makefile: add --targets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40839?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: I89bb60e94dd03606dbba5a3609d5e1a95993af5b Gerrit-Change-Number: 40839 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 10:51:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 6 hours

1
0
0 0

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

by jolly

Attention is currently required from: osmith. jolly 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-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Aug 2025 10:38:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 6 hours

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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: merged 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-Reviewer: osmith <osmith(a)sysmocom.de>

3 days, 7 hours

1
0
0 0

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

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40842?usp=email ) Change subject: testenv: pass targets to osmo-dev's gen_makefile ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment 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> 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:11:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 days, 8 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log