osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40353?usp=email ) Change subject: gen_makefile: use more args vars directly ...................................................................... gen_makefile: use more args vars directly Use args.no_ldconfig, args.sudo_ldconfig, args.sudo_make_install directly. Change-Id: I050714163bddeb17351f373ea7dd2ffdfa9a0bb5 --- M gen_makefile.py 1 file changed, 9 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: 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 02ac203..08d450a 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -349,8 +349,10 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj, - no_ldconfig, sudo_ldconfig): +def gen_makefile_install(proj, docker_cmd, build_proj): + no_ldconfig = '#' if args.no_ldconfig else '' + sudo_ldconfig = '' if args.ldconfig_without_sudo else 'sudo ' + sudo_make_install = "sudo " if args.sudo_make_install else "" buildsystem = projects_buildsystems.get(proj, "autotools") if buildsystem == "autotools": return f''' @@ -383,8 +385,8 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_reinstall(proj, deps_reinstall, sudo_make_install, - build_proj): +def gen_makefile_reinstall(proj, deps_reinstall, build_proj): + sudo_make_install = "sudo " if args.sudo_make_install else "" return f''' .PHONY: {proj}-reinstall {proj}-reinstall: {deps_reinstall} @@ -440,7 +442,7 @@ return src_proj return os.path.join(make_dir, "src_copy", proj) -def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): +def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, make_check): src_proj = os.path.join(src_dir, proj) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) @@ -459,9 +461,6 @@ cflags = 'CFLAGS=-g ' if args.build_debug else '' docker_cmd = f'OSMODEV_PROJECT={proj} {args.docker_cmd} ' if args.docker_cmd else '' check = 'check' if make_check else '' - no_ldconfig = '#' if no_ldconfig else '' - sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo ' - sudo_make_install = 'sudo ' if sudo_make_install else '' update_src_copy_cmd = gen_update_src_copy_cmd(proj, src_dir, make_dir) return f''' @@ -514,14 +513,10 @@ {gen_makefile_install(proj, docker_cmd, - sudo_make_install, - build_proj, - no_ldconfig, - sudo_ldconfig)} + build_proj)} {gen_makefile_reinstall(proj, deps_reinstall, - sudo_make_install, build_proj)} {gen_makefile_clean(proj, build_proj)} @@ -687,8 +682,7 @@ all_config_opts.extend(configure_opts.get(proj) or []) content += gen_make(proj, deps, all_config_opts, make_dir, src_dir, build_dir, - args.sudo_make_install, args.no_ldconfig, - args.ldconfig_without_sudo, args.make_check) + args.make_check) # Replace spaces with tabs to avoid the common pitfall of inserting spaces # instead of tabs by accident into the Makefile (as the python code is indented -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40353?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: I050714163bddeb17351f373ea7dd2ffdfa9a0bb5 Gerrit-Change-Number: 40353 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>