hurricos/docker-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combine base input requirements for building owrt image into a var

Browse Source
This commit is contained in:
Martin Kennedy 2021-03-16 18:50:03 +00:00
parent c00a54a07d
commit 7f20ca9ed5
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openwrt/Makefile
View File

@ -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 \

2
openwrt/input.sh
View File

@ -2,6 +2,6 @@
cd /builder/openwrt
cp /input/diffconfig .config
rsync -av /input/ .
make defconfig