mirror of
https://forge.fsky.io/oneflux/omegafox.git
synced 2026-02-10 09:52:05 -08:00
Makefile: Remove revert from dir command
Removes git reset when running `make dir`. This avoids errors when using `make setup-minimal`.
This commit is contained in:
parent
c142266646
commit
a891914b9a
2 changed files with 2 additions and 2 deletions
1
Makefile
1
Makefile
|
|
@ -60,7 +60,6 @@ dir:
|
||||||
@if [ ! -d $(cf_source_dir) ]; then \
|
@if [ ! -d $(cf_source_dir) ]; then \
|
||||||
make setup; \
|
make setup; \
|
||||||
fi
|
fi
|
||||||
make revert
|
|
||||||
python3 scripts/patch.py $(version) $(release)
|
python3 scripts/patch.py $(version) $(release)
|
||||||
touch $(cf_source_dir)/_READY
|
touch $(cf_source_dir)/_READY
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ def into_camoufox_dir():
|
||||||
def reset_camoufox():
|
def reset_camoufox():
|
||||||
"""Reset the Camoufox source"""
|
"""Reset the Camoufox source"""
|
||||||
with temp_cd('..'):
|
with temp_cd('..'):
|
||||||
run('make revert')
|
run('make clean')
|
||||||
|
|
||||||
|
|
||||||
def run_patches(reverse=False):
|
def run_patches(reverse=False):
|
||||||
|
|
@ -172,6 +172,7 @@ def handle_choice(choice):
|
||||||
|
|
||||||
case "Create new patch":
|
case "Create new patch":
|
||||||
# Reset camoufox, apply all patches, then create a checkpoint
|
# Reset camoufox, apply all patches, then create a checkpoint
|
||||||
|
reset_camoufox()
|
||||||
with temp_cd('..'):
|
with temp_cd('..'):
|
||||||
run('make dir')
|
run('make dir')
|
||||||
run('make checkpoint')
|
run('make checkpoint')
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue