josh
/
ppl-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: Typos and stuff

This commit is contained in:
Maciej Krüger 2018-10-21 14:13:16 +02:00
parent a809c3b822
commit 8cf86677cc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -6,13 +6,18 @@ DEVICE_PORT=$(shell bash conf-tool.sh read DEVICE_PORT)
USER_KEY=$(shell bash conf-tool.sh read USER_KEY) USER_KEY=$(shell bash conf-tool.sh read USER_KEY)
USER_EMAIL=$(shell bash conf-tool.sh read USER_EMAIL) USER_EMAIL=$(shell bash conf-tool.sh read USER_EMAIL)
all: all: .config
.config:
bash conf-tool.sh
echo "Please re-run the command"
exit 2
clean: clean:
rm -rf *.img *.model *.manifest snaps rm -rf *.img *.model *.manifest snaps
%.model: boards/%.yaml # sign a model file %.model: boards/%.yaml # sign a model file
cat definition.yaml $< | python -c "import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=2)" | sed "s|TIMESTAMP|$(shell date -Iseconds --utc)|g" | snap sign -k "$USER_KEY" > $@ cat definition.yaml $< | python -c "import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=2)" | sed "s|TIMESTAMP|$(shell date -Iseconds --utc)|g" | snap sign -k "$(USER_KEY)" > $@
snaps/%: deps/%.yaml snaps/%: deps/%.yaml
node build-tool.js --env $(ENV) --channel $(CHANNEL) --board $* node build-tool.js --env $(ENV) --channel $(CHANNEL) --board $*
%.img: %.model snaps/% $(ENV).cloud-init.yaml # build an image %.img: %.model snaps/% $(ENV).cloud-init.yaml # build an image

1
conf-tool.sh
View File

@ -11,6 +11,7 @@ if [ "x$1" == "xread" ]; then
fi fi
. .config . .config
echo "${!2}" echo "${!2}"
exit
fi fi
signing_key=$(snap keys | tail -n 1 | sed "s| |\n|g" | head -n 1) # value if no key exists: "No" signing_key=$(snap keys | tail -n 1 | sed "s| |\n|g" | head -n 1) # value if no key exists: "No"