From b4ced98b9dd28062a7990592b7723b8916448679 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 22 Jun 2020 11:57:42 -0700
Subject: Generate root.perms from fspec

---
 setup.lua | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'setup.lua')

diff --git a/setup.lua b/setup.lua
index 40f2dd82..27984fa0 100755
--- a/setup.lua
+++ b/setup.lua
@@ -33,7 +33,6 @@ local function gen(gendir)
 		srcdir=dir..'/src',
 		outdir=outdir,
 		inputs={
-			perms={},
 			index={},
 			fspec={implicit={}},
 			gen={
@@ -45,7 +44,6 @@ local function gen(gendir)
 			ninja={'$gendir/local.ninja'},
 			fetch={},
 		},
-		perms={},
 		fspec={},
 	}
 	assert(os.execute(('exec mkdir -p %s %s'):format(gendir, outdir)))
@@ -76,16 +74,6 @@ local function gen(gendir)
 		phony('deps', pkg.deps)
 	end
 
-	if next(pkg.perms) then
-		table.sort(pkg.perms, function(s1, s2)
-			return s1:sub(8) < s2:sub(8)
-		end)
-		local f = assert(io.open(outdir..'/local.perms', 'w'))
-		f:write(table.concat(pkg.perms, '\n'))
-		f:write('\n')
-		table.insert(pkg.inputs.perms, '$outdir/local.perms')
-		f:close()
-	end
 	if next(pkg.fspec) then
 		local out = outdir..'/local.fspec'
 		local tmp = out..'.tmp'
@@ -109,11 +97,6 @@ local function gen(gendir)
 		end
 		table.insert(pkg.inputs.fspec, '$outdir/local.fspec')
 	end
-	if next(pkg.inputs.perms) then
-		build('mergeperms', '$outdir/root.perms', pkg.inputs.perms)
-	else
-		build('empty', '$outdir/root.perms')
-	end
 	if next(pkg.inputs.index) then
 		build('cat', '$outdir/root.index', pkg.inputs.index, {
 			description='	INDEX	$outdir/root.index',
@@ -144,7 +127,6 @@ function subgen(dir)
 	subninja(file)
 	table.insert(pkg.inputs.ninja, '$gendir/'..dir..'/ninja')
 	table.insert(pkg.inputs.index, '$outdir/'..dir..'/root.index')
-	table.insert(pkg.inputs.perms, '$outdir/'..dir..'/root.perms')
 	table.insert(pkg.inputs.fspec, '$outdir/'..dir..'/root.fspec')
 	local cmd = ('exec test -f %s/%s/local.ninja'):format(pkg.gendir, dir)
 	if recurse or not os.execute(cmd) then
-- 
cgit v1.2.3