3rd-party/linux-kernel-module-cheat
1
0
Fork 0
mirror of https://github.com/cirosantilli/linux-kernel-module-cheat.git synced 2026-01-23 02:05:57 +01:00
Code Issues Releases Wiki Activity

gem5: renamame --gem5-src to --gem5-source

Browse Source 
And fix outdated README references to --gem5-worktree.
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2018-10-09 18:53:02 +01:00
parent 8815312cad
commit b6d00baac0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.adoc
View File

@@ -10674,17 +10674,17 @@ git clone https://my.private.repo.com/my-fork/gem5.git gem5-internal
gem5_internal="$(pwd)/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 cd linux-kernel-module-cheat
./build-gem5 \ ./build-gem5 \
--gem5-build-id private/master \ --gem5-build-id private/master \
--gem5-worktree-path "$gem5_internal" \ --gem5-source "$gem5_internal" \
; ;
./run-gem5 ./run-gem5 \
--gem5-build-id private/master \ --gem5-build-id private/master \
--gem5-worktree-path "$gem5_internal" \ --gem5-source "$gem5_internal" \
; ;
.... ....

2
build-gem5
View File

@@ -27,7 +27,7 @@ else:
start_time = time.time() start_time = time.time()
os.makedirs(binaries_dir, exist_ok=True) os.makedirs(binaries_dir, exist_ok=True)
os.makedirs(disks_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 not os.path.exists(os.path.join(common.gem5_src_dir, '.git')):
if common.gem5_src_dir == common.gem5_default_src_dir: if common.gem5_src_dir == common.gem5_default_src_dir:
raise Exception('gem5 submodule not checked out') raise Exception('gem5 submodule not checked out')

8
common.py
View File

@@ -134,7 +134,7 @@ given, just use the submodule source.
''' '''
) )
parser.add_argument( parser.add_argument(
'--gem5-src', '--gem5-source',
help='''\ help='''\
Use the given directory as the gem5 source tree. Ignore `--gem5-worktree`. 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_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.crosstool_ng_download_dir = os.path.join(this.crosstool_ng_out_dir, 'download')
this.gem5_default_src_dir = os.path.join(submodules_dir, 'gem5') this.gem5_default_src_dir = os.path.join(submodules_dir, 'gem5')
if args.gem5_src is not None: if args.gem5_source is not None:
this.gem5_src_dir = args.gem5_src this.gem5_src_dir = args.gem5_source
assert(os.path.exists(args.gem5_src)) assert(os.path.exists(args.gem5_source))
else: else:
if args.gem5_worktree is not None: if args.gem5_worktree is not None:
this.gem5_src_dir = os.path.join(this.gem5_non_default_src_root_dir, args.gem5_worktree) this.gem5_src_dir = os.path.join(this.gem5_non_default_src_root_dir, args.gem5_worktree)