Revert "use the tools module instead of hardcoding chown"

This reverts commit 52571c840e035bf9abc4e724b453001ce7abca8d.

External tools and tools inside the chroot are different beasts. Revert
my commit as this was plain wrong.

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

diff --git a/generic/tools.lua b/generic/tools.lua
index 9c4dc0fbb2019fe5166cbcf79633d0a84833f54f..cf7528ae6e7f97e364549c8dbb03fb49c4f75e2c 100644 (file)
--- a/generic/tools.lua
+++ b/generic/tools.lua
@@ -55,7 +55,6 @@ local toollist = {
     tar = { name = "tar", flags = "", optional = false },
     sha1sum = { name = "sha1sum", flags = "", optional = false },
     md5sum = { name = "md5sum", flags = "", optional = false },
-    chown = { name = "chown", flags = "", optional = false },
     chmod = { name = "chmod", flags = "", optional = false },
     test = { name = "test", flags = "", optional = false },
     cat = { name = "cat", flags = "", optional = false },

diff --git a/local/e2build.lua b/local/e2build.lua
index 54057bcb4345e5ad0f6b92fc37a6caeb96ca2f15..7c433cf0eb2175da9dd18a3131e2ffcc196d55a1 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -349,8 +349,8 @@ local function fix_permissions(info, r, return_flags)
     local e = err.new("fixing permissions failed")
     e2lib.log(3, "fix permissions")
     e2tool.set_umask(info)
-    local argv = { "chroot_2_3", res.build_config.base, tools.get_tool("chown"),
-        "-R", "root:root", res.build_config.Tc }
+    local argv = { "chroot_2_3", res.build_config.base, "chown", "-R",
+    "root:root", res.build_config.Tc }
     rc, re = e2lib.e2_su_2_2(argv)
     e2tool.reset_umask(info)
     if not rc then