From 872760c9ff8a17d04c40e52e4251953fc0e0924e Mon Sep 17 00:00:00 2001
From: Robin Malley <rmalley@cock.li>
Date: Fri, 2 Sep 2022 23:06:38 +0000
Subject: [PATCH] Refactor makefile

* Move SPP cli flags into it's own variable
* Remove a bunch of legacy code around settinig up a chroot environment
---
 Makefile | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 49f8a1b..4133838 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ user=robin
 port=8888
 domain=test.monster:$(port)
 
+SPPFLAGS=-D port=$(port) -D kore_chroot=$(chroot_dir) -D chuser=$(user) -D domain=$(domain)
 # squelch prints, flip to print verbose information
 Q=@
 #Q= 
@@ -52,7 +53,7 @@ all: $(chroot_dir) smr.so $(built_files) $(built_pages) $(built_sql) ## Build an
 
 conf/smr.conf : conf/smr.conf.in Makefile
 	$(Q)$(ECHO) "[preprocess] $@"
-	$(Q)$(SPP) -o $@ -D port=$(port) -D kore_chroot=$(chroot_dir) -D chuser=$(user) $<
+	$(Q)$(SPP) -o $@ $(SPPFLAGS) $<
 
 apk-tools-static-$(version).apk:
 	# wget -q $(mirror)latest-stable/main/$(arch)/apk-tools-static-$(version).apk
@@ -76,31 +77,6 @@ $(chroot_dir): apk-tools-static-$(version).apk
 	$(Q)$(MKDIR) $(chroot_dir)/data
 	$(Q)$(MKDIR) $(chroot_dir)/data/archive
 	$(Q)$(MKDIR) $(chroot_dir)/endpoints
-	#cd $(chroot_dir) && tar -xvzf ../apk-tools-static-*.apk
-	#cd $(chroot_dir) && sudo ./sbin/apk.static -X $(mirror)latest-stable/main -U --allow-untrusted --root $(chroot_dir) --no-cache --initdb add alpine-base
-	#ln -s /dev/urandom $(chroot_dir)/dev/random #Prevent an attacker with access to the chroot from exhausting our entropy pool and causing a dos
-	#ln -s /dev/urandom $(chroot_dir)/dev/urandom
-	#mount /dev/ $(chroot_dir)/dev --bind
-	#mount -o remount,ro,bind $(chroot_dir)/dev
-	#mount -t proc none $(chroot_dir)/proc
-	#mount -o bind /sys $(chroot_dir)/sys
-	#cp /etc/resolv.conf $(chroot_dir)/etc/resolv.conf
-	#echo "$(mirror)/$(branch)/main" > $(chroot)/etc/apk/repositories
-	#echo "$(mirror)/$(branch)/community" >> $(chroot)/etc/apk/repositories
-	#cp /etc/apk/repositories $(chroot_dir)/etc/apk/repositories
-	#mkdir $(chroot_dir)/var/sm
-	## Things to build lua libraries
-	#chroot $(chroot_dir) apk add luarocks5.1 sqlite sqlite-dev lua5.1-dev build-base zlib zlib-dev
-	#chroot $(chroot_dir) luarocks-5.1 install etlua
-	#chroot $(chroot_dir) luarocks-5.1 install lsqlite3
-	#chroot $(chroot_dir) luarocks-5.1 install lpeg
-	#chroot $(chroot_dir) luarocks-5.1 install lua-zlib ZLIB_LIBDIR=/lib #for some reason lzlib looks in /usr/lib for libz, when it needs to look at /lib
-	## Once we've built + installed everything, delete extra stuff from the chroot
-	#chroot $(chroot_dir) apk del sqlite-dev lua5.1-dev build-base zlib-dev
-	## SSL certificates, if you don't trust EFF (they have an antifa black block member as their favicon at time of writing) you may want to replace this.
-	#chroot $(chroot_dir) apk add certbot
-	## After chroot, apk add luarocks5.1 sqlite sqlite-dev lua5.1-dev build-base
-	## After chroot, luarocks install etlua; luarocks install lsqlite3
 
 code : $(built_files)
 
@@ -114,15 +90,15 @@ $(built_pages): $(chroot_dir)pages/%.etlua : src/pages/%.etlua
 
 src/lua/config.lua : src/lua/config.lua.in Makefile
 	$(Q)$(ECHO) "[preprocess] $@"
-	$(Q)$(SPP) -o $@ -D domain=$(domain) $<
+	$(Q)$(SPP) $(SPPFLAGS) -o $@ $<
 
 $(page_files) : % : %.in $(part_files)
 	$(Q)$(ECHO) "[preprocess] $@"
-	$(Q)$(SPP) -o $@ $<
+	$(Q)$(SPP) $(SPPFLAGS) -o $@ $<
 
 src/pages/parts/story_breif.etlua : src/pages/parts/story_breif.etlua.in
 	$(Q)$(ECHO) "[preprocess] $@"
-	$(Q)$(SPP) -o $@ $<
+	$(Q)$(SPP) $(SPPFLAGS) -o $@ $<
 
 $(built_sql): $(chroot_dir)sql/%.sql : src/sql/%.sql
 	$(Q)$(ECHO) "[copy] $@"
@@ -134,7 +110,7 @@ $(built_tests) : $(chroot_dir)% : %
 
 $(asset_files) : % : %.in
 	$(Q)$(ECHO) "[preprocess] $@"
-	$(Q)$(SPP) -o $@ $<
+	$(Q)$(SPP) $(SPPFLAGS) -o $@ $<
 
 smr.so : $(src_files) conf/smr.conf conf/build.conf $(asset_files)
 	$(Q)$(ECHO) "[build] $@"