From 7f20ca9ed5eedec3e06ff9c42dcf4fc1fbe853c9 Mon Sep 17 00:00:00 2001
From: Martin Kennedy <hurricos@gmail.com>
Date: Tue, 16 Mar 2021 18:50:03 +0000
Subject: [PATCH] Combine base input requirements for building owrt image into
 a var

---
 openwrt/Makefile | 18 +++++++++++++-----
 openwrt/input.sh |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/openwrt/Makefile b/openwrt/Makefile
index e44adb2..aa4fedf 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -22,10 +22,18 @@ prep-output:
 diffconfig:
 	touch $@;
 
-input/diffconfig: diffconfig input
+input/.config: diffconfig input
 	cp $< $@
 
-output: diffconfig ${docker_src}/built/openwrt-builder-master.sentinel prep-output input/diffconfig input.sh output.sh
+files/:
+	-rm -r $@; mkdir -p $@;
+
+input/files/: files/
+	cp -r $< $@
+
+BASE_REQS := prep-output input/.config input.sh output.sh input/files/
+
+output: ${docker_src}/built/openwrt-builder-master.sentinel $(BASE_REQS)
 	docker run \
 		-v $$PWD/output:/output \
 		-v $$PWD/input:/input \
@@ -33,7 +41,7 @@ output: diffconfig ${docker_src}/built/openwrt-builder-master.sentinel prep-outp
 		-v $$PWD/output.sh:/output.sh \
 		--rm -it openwrt-builder-master make V=ssc -j24 build
 
-output-%: diffconfig ${docker_src}/built/openwrt-builder-%.sentinel prep-output input/diffconfig input.sh output.sh
+output-%: ${docker_src}/built/openwrt-builder-%.sentinel $(BASE_REQS)
 	docker run \
 		-v $$PWD/output:/output \
 		-v $$PWD/input:/input \
@@ -41,7 +49,7 @@ output-%: diffconfig ${docker_src}/built/openwrt-builder-%.sentinel prep-output
 		-v $$PWD/output.sh:/output.sh \
 		--rm -it openwrt-builder-$* make V=ssc -j24
 
-debug-%: diffconfig ${docker_src}/built/openwrt-builder-%.sentinel prep-output input/diffconfig input.sh output.sh
+debug-%: ${docker_src}/built/openwrt-builder-%.sentinel $(BASE_REQS)
 	docker run \
 		-v $$PWD/output:/output \
 		-v $$PWD/input:/input \
@@ -50,7 +58,7 @@ debug-%: diffconfig ${docker_src}/built/openwrt-builder-%.sentinel prep-output i
 		-it openwrt-builder-$* /bin/bash
 
 .PHONY: menuconfig
-menuconfig-%: ${docker_src}/built/openwrt-builder-%.sentinel prep-output input/diffconfig input.sh output.sh
+menuconfig-%: ${docker_src}/built/openwrt-builder-%.sentinel $(BASE_REQS)
 	docker run \
 		-v $$PWD/output:/output \
 		-v $$PWD/input:/input \
diff --git a/openwrt/input.sh b/openwrt/input.sh
index 15b6a73..629bebd 100755
--- a/openwrt/input.sh
+++ b/openwrt/input.sh
@@ -2,6 +2,6 @@
 
 cd /builder/openwrt
 
-cp /input/diffconfig .config
+rsync -av /input/ .
 
 make defconfig