From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 7 Sep 2012 09:27:27 +0000 (+0200)
Subject: e2-root does not need to be executable, trim cleanup files
X-Git-Tag: e2factory-2.3.13rc1~107
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=17ebce217066b4afb5534e63d2a37733281523b1;p=e2factory.git

e2-root does not need to be executable, trim cleanup files

e2-root is called via e2, does not need to be an executable script. It's
not an entry point into e2factory.

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

diff --git a/global/Makefile b/global/Makefile
index 167579b..adc0ae2 100644
--- a/global/Makefile
+++ b/global/Makefile
@@ -35,7 +35,7 @@ SCRIPTS =
 GLOBALLUATOOLS = e2-create-project e2-fetch-project e2-install-e2 e2-root
 GLOBALSHTOOLS = e2-locate-project-root e2ssh
 GLOBALTOOLS = $(GLOBALLUATOOLS) $(GLOBALSHTOOLS)
-CLEAN_FILES = *~ $(GLOBALTOOLS) e2 $(SCRIPTS) *.lua e2-su *.sh e2.conf
+CLEAN_FILES = e2 e2-su e2.conf
 LUA_LIBS = strict.lua plugin.lua e2lib.lua
 LUA_LIBS += e2option.lua hash.lua tools.lua transport.lua cache.lua url.lua
 LUA_LIBS += generic_git.lua luafile.lua err.lua lock.lua
@@ -43,7 +43,7 @@ LUA_LIBS += buildconfig.lua
 
 .PHONY: all install uninstall clean
 
-all: e2 e2-root $(SCRIPTS) e2-su \
+all: e2 $(SCRIPTS) e2-su \
 	$(GLOBALSHTOOLS:=.sh) e2.conf sha1.so e2-su-2.2 \
 	luafile_ll.so e2util.so
 
@@ -68,7 +68,6 @@ install: all install-dirs install-lua
 	for i in $(GLOBALSHTOOLS) ; do \
 		install -m 755 $$i.sh $(DESTDIR)$(BINDIR)/$$i ; \
 	done
-	install -m 755 e2-root $(DESTDIR)$(TOOLDIR)/
 	$(SUDO) install -m 4754 -o root -g $(E2_GROUP) e2-su $(DESTDIR)$(BINDIR)/
 	install -m 755 e2 $(DESTDIR)$(BINDIR)/
 	if [ ! -f "$(DESTDIR)$(SYSCONFDIR)/e2.conf" ] ; then \
@@ -122,10 +121,6 @@ e2: e2.lua
 	echo "#!$(LIBEXECDIR)/e2-lua-$(LUA_VERSION)" >$@
 	cat $< >>$@
 
-e2-root: e2-root.lua
-	echo "#!$(LIBEXECDIR)/e2-lua-$(LUA_VERSION)" >$@
-	cat $< >>$@
-
 e2.conf: e2.conf.in
 	$(TOPLEVEL)/scripts/genscript.sh $< $@