Remove all traces of e2-2.1 based tools.

e2-2.1 was never supported by e2factory-2.3

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/doc/man/e2-build.1 b/doc/man/e2-build.1
index ac30f4ff1a763adbd276bba9366110580b52f682..b2e24f0833ef5894d2ee72bc0ada536b21f6c5ff 100644 (file)
--- a/doc/man/e2-build.1
+++ b/doc/man/e2-build.1
@@ -86,7 +86,6 @@ Doubtless there are many.
 .BR e2-ls-project (1),
 .BR e2-playground (1),
 .BR e2config (5),
-.BR e2-sync-results (1),
 .BR e2-runbuild (1).
 
 .SH AUTHORS

diff --git a/doc/man/e2intro.7 b/doc/man/e2intro.7
index 9aa1c43255cfa5babb7cde6b7bca77932578254f..88239b58ea3f51fa65d746db6ae6aac9b4f0ead7 100644 (file)
--- a/doc/man/e2intro.7
+++ b/doc/man/e2intro.7
@@ -83,9 +83,6 @@ Retrieves the sources for the current project from the backing store.
 .BR e2-ls-project
 Displays a schematic view of the current project and shows the project build status.
 .TP
-.BR e2-use-source
-Add a source to the current project.
-.TP
 .BR e2-new-source
 Create a new source in the backing store.
 .TP
@@ -138,12 +135,10 @@ set ssh options when using the \fBe2ssh\fR(1) \fBssh\fR wrapper.
 .BR e2-dsort(1)
 .BR e2-fetch-sources(1)
 .BR e2-ls-project(1)
-.BR e2-use-source(1)
 .BR e2-fetch-project(1)
 .BR e2-new-source(1)
 .BR e2-create-project(1)
 .BR e2config(5)
-.BR e2-sync-results(1)
 .BR e2global(1)
 .BR e2-install-e2(1)
 .BR e2ssh(1)

diff --git a/doc/man/e2workflow.7 b/doc/man/e2workflow.7
index fa6af8d1d7633b3652eddee62ae5661579c568e0..33e8c845a29831f66e574f5124d4a2017ed8515d 100644 (file)
--- a/doc/man/e2workflow.7
+++ b/doc/man/e2workflow.7
@@ -24,8 +24,6 @@ e2-dsort
 
 .SH "ADDING NEW PACKAGES TO A PROJECT"
 e2-new-source
-.br
-e2-use-source
 
 .SH "BUILDING RESULTS"
 e2-build

diff --git a/local/Makefile b/local/Makefile
index 2bf66fc124acc6f2189d97d8ba42f7ca7053448f..2da595c2db04e7bd49af1f2187d147dc6297788a 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -50,19 +50,12 @@ LUA_LIBS += policy.lua strict.lua e2build.lua
 LUA_LIBS += e2lib.lua buildconfig.lua
 LOCALTOOLS = $(LOCALSHTOOLS) $(LOCALLUATOOLS)
 
-SYMLINKS_2_1 = lookup-server use-source prepare-cargo sync-results cleanup \
-       git-to-tar required-files buildid
-
 .PHONY: all install uninstall install install-local doc install-doc
 
 
 all: linux32 sha1.so luafile_ll.so e2util.so
 
 install:
-       # install symlinks for e2-2.1 compatibility
-       for i in $(SYMLINKS_2_1); do \
-               ln -sf e2 $(DESTDIR)$(BINDIR)/e2-$$i ; \
-       done
        for i in $(LOCALTOOLS); do \
                ln -sf e2 $(DESTDIR)$(BINDIR)/e2-$$i ; \
        done
@@ -103,9 +96,6 @@ install-doc:
        done
 
 uninstall:
-       for i in $(SYMLINKS_2_1); do \
-               rm -f $(DESTDIR)$(BINDIR)/e2-$$i ; \
-       done
        for i in $(LOCALTOOLS); do \
                rm -f $(DESTDIR)$(BINDIR)/e2-$$i ; \
        done

diff --git a/local/new-source.lua b/local/new-source.lua
index ac8dca5b21eddfecb72deb76ada7634ef8eb5ce8..d9bb3baa34a84fcec9a2680ed6713327095acb5c 100644 (file)
--- a/local/new-source.lua
+++ b/local/new-source.lua
@@ -295,10 +295,7 @@ elseif opts.files then
   local rc = new_files_source(info.cache, server, location, source_file,
                        checksum_file, checksum_file_format, no_checksum)
 else
-  e2lib.log(1,
-       "Creating repositories other than git is not supported yet.\n"..
-       "You might nevertheless use 'e2-use-source' to use existing\n"..
-       "sources in your project")
+  e2lib.log(1, "Creating repositories other than git is not supported yet.")
 end
 
 e2lib.finish(0)