From 76e93a4c3a4234e2296bf93bc15fc81ac2d81877 Mon Sep 17 00:00:00 2001 From: Juntong Liu <juntong.liu@ess.eu> Date: Mon, 25 Oct 2021 12:37:29 +0000 Subject: [PATCH] removed `sed -i /submodule/,24465d $(TOP)/.git/config` from DEFINES_FT --- CHANGELOG.md | 1 + configure/E3/DEFINES_FT | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00ff4e5d..a4f7efdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 ### 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 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 diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT index 3a50916c..840ac0cf 100644 --- a/configure/E3/DEFINES_FT +++ b/configure/E3/DEFINES_FT @@ -1,7 +1,6 @@ # Keep always the module up-to-date define git_update = git submodule deinit -f $@/ -sed -i '/submodule/,24465d' $(TOP)/.git/config rm -rf $(TOP)/.git/modules/$@ git submodule init $@/ git submodule update --init --recursive $@/. -- GitLab