diff --git a/README.adoc b/README.adoc index 0c76e72..2c97aae 100644 --- a/README.adoc +++ b/README.adoc @@ -10674,17 +10674,17 @@ git clone https://my.private.repo.com/my-fork/gem5.git gem5-internal gem5_internal="$(pwd)/gem5-internal" .... -Next, when you want to build with this repository, use the `--gem5-worktree-path` argument to point this repository to the private source code: +Next, when you want to build with this repository, use the `--gem5-source` argument to point this repository to the private source code: .... cd linux-kernel-module-cheat ./build-gem5 \ --gem5-build-id private/master \ - --gem5-worktree-path "$gem5_internal" \ + --gem5-source "$gem5_internal" \ ; -./run-gem5 +./run-gem5 \ --gem5-build-id private/master \ - --gem5-worktree-path "$gem5_internal" \ + --gem5-source "$gem5_internal" \ ; .... diff --git a/build-gem5 b/build-gem5 index d947ae3..4b2316b 100755 --- a/build-gem5 +++ b/build-gem5 @@ -27,7 +27,7 @@ else: start_time = time.time() os.makedirs(binaries_dir, exist_ok=True) os.makedirs(disks_dir, exist_ok=True) - if args.gem5_src is None: + if args.gem5_source is None: if not os.path.exists(os.path.join(common.gem5_src_dir, '.git')): if common.gem5_src_dir == common.gem5_default_src_dir: raise Exception('gem5 submodule not checked out') diff --git a/common.py b/common.py index 9ed6576..56ab7ff 100644 --- a/common.py +++ b/common.py @@ -134,7 +134,7 @@ given, just use the submodule source. ''' ) parser.add_argument( - '--gem5-src', + '--gem5-source', help='''\ Use the given directory as the gem5 source tree. Ignore `--gem5-worktree`. ''' @@ -531,9 +531,9 @@ def setup(parser): this.crosstool_ng_build_dir = os.path.join(this.crosstool_ng_buildid_dir, 'build') this.crosstool_ng_download_dir = os.path.join(this.crosstool_ng_out_dir, 'download') this.gem5_default_src_dir = os.path.join(submodules_dir, 'gem5') - if args.gem5_src is not None: - this.gem5_src_dir = args.gem5_src - assert(os.path.exists(args.gem5_src)) + if args.gem5_source is not None: + this.gem5_src_dir = args.gem5_source + assert(os.path.exists(args.gem5_source)) else: if args.gem5_worktree is not None: this.gem5_src_dir = os.path.join(this.gem5_non_default_src_root_dir, args.gem5_worktree)