Skip to content
Snippets Groups Projects
Commit 76e93a4c authored by Juntong Liu's avatar Juntong Liu
Browse files

removed `sed -i /submodule/,24465d $(TOP)/.git/config` from DEFINES_FT

parent 4bf67062
No related branches found
No related tags found
1 merge request!57E3-546: Address flaw in make init process
Pipeline #99209 passed
...@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Removed duplicated entries from generated `.dep` files * Removed duplicated entries from generated `.dep` files
### Other changes ### Other changes
* removed `sed -i /submodule/,24465d $(TOP)/.git/config` from DEFINES_FT
* removed `e3.cfg`, `ess-env.conf` and `DEFINES_REQUIRE` files and associated codes in `RULES_REQUIRE`, `setE3Env.bash` and `.gitignore`. * removed `e3.cfg`, `ess-env.conf` and `DEFINES_REQUIRE` files and associated codes in `RULES_REQUIRE`, `setE3Env.bash` and `.gitignore`.
* removed legacy code from setE3Env.bash * removed legacy code from setE3Env.bash
* Removed usage of `env.sh` - now there is a check only for seeing if the environment variable `$IOCNAME` is set * Removed usage of `env.sh` - now there is a check only for seeing if the environment variable `$IOCNAME` is set
......
# Keep always the module up-to-date # Keep always the module up-to-date
define git_update = define git_update =
git submodule deinit -f $@/ git submodule deinit -f $@/
sed -i '/submodule/,24465d' $(TOP)/.git/config
rm -rf $(TOP)/.git/modules/$@ rm -rf $(TOP)/.git/modules/$@
git submodule init $@/ git submodule init $@/
git submodule update --init --recursive $@/. git submodule update --init --recursive $@/.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment