nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: clean up key generation and early preparation

Browse Source 
This will fix the early preparation happening much too often and also fixes
early preparation after `make clean`.
This commit is contained in:
Matthias Schiffer 2015-11-02 00:58:34 +01:00
parent db6c50011d
commit 31d65173f2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -207,6 +207,8 @@ gluon-tools: FORCE
+$(GLUONMAKE_EARLY) package/lua/host/install package/usign/host/install +$(GLUONMAKE_EARLY) package/lua/host/install package/usign/host/install
early_prepared_stamp := $(GLUON_BUILDDIR)/prepared
prepare-early: FORCE prepare-early: FORCE
for dir in build_dir dl staging_dir; do \ for dir in build_dir dl staging_dir; do \
mkdir -p $(GLUON_ORIGOPENWRTDIR)/$$dir; \ mkdir -p $(GLUON_ORIGOPENWRTDIR)/$$dir; \
@ -215,10 +217,20 @@ prepare-early: FORCE
+$(GLUONMAKE_EARLY) feeds +$(GLUONMAKE_EARLY) feeds
+$(GLUONMAKE_EARLY) gluon-tools +$(GLUONMAKE_EARLY) gluon-tools
create-key: prepare-early mkdir -p $$(dirname $(early_prepared_stamp))
touch $(early_prepared_stamp)
$(early_prepared_stamp):
+$(GLUONMAKE_EARLY) prepare-early
$(GLUON_OPKG_KEY): $(early_prepared_stamp) FORCE
[ -s $(GLUON_OPKG_KEY) -a -s $(GLUON_OPKG_KEY).pub ] || \ [ -s $(GLUON_OPKG_KEY) -a -s $(GLUON_OPKG_KEY).pub ] || \
mkdir -p $$(dirname $(GLUON_OPKG_KEY)) && $(STAGING_DIR_HOST)/bin/usign -G -s $(GLUON_OPKG_KEY) -p $(GLUON_OPKG_KEY).pub -c "Gluon opkg key" mkdir -p $$(dirname $(GLUON_OPKG_KEY)) && $(STAGING_DIR_HOST)/bin/usign -G -s $(GLUON_OPKG_KEY) -p $(GLUON_OPKG_KEY).pub -c "Gluon opkg key"
$(GLUON_OPKG_KEY).pub: $(GLUON_OPKG_KEY)
create-key: $(GLUON_OPKG_KEY).pub
include $(GLUONDIR)/targets/targets.mk include $(GLUONDIR)/targets/targets.mk
ifneq ($(GLUON_TARGET),) ifneq ($(GLUON_TARGET),)
@ -259,8 +271,9 @@ config: FORCE
| sed -e 's/ /\n/g'; \ | sed -e 's/ /\n/g'; \
) > $(BOARD_BUILDDIR)/config.tmp ) > $(BOARD_BUILDDIR)/config.tmp
scripts/config/conf --defconfig=$(BOARD_BUILDDIR)/config.tmp Config.in scripts/config/conf --defconfig=$(BOARD_BUILDDIR)/config.tmp Config.in
+$(NO_TRACE_MAKE) tools/prepare
prepare-target: create-key prepare-target: $(GLUON_OPKG_KEY).pub
rm $(GLUON_OPENWRTDIR)/tmp || true rm $(GLUON_OPENWRTDIR)/tmp || true
mkdir -p $(GLUON_OPENWRTDIR)/tmp mkdir -p $(GLUON_OPENWRTDIR)/tmp
@ -271,10 +284,10 @@ prepare-target: create-key
+$(GLUONMAKE) config +$(GLUONMAKE) config
touch $(target_prepared_stamp) touch $(target_prepared_stamp)
$(target_prepared_stamp): create-key $(target_prepared_stamp):
+$(GLUONMAKE_EARLY) prepare-target +$(GLUONMAKE_EARLY) prepare-target
maybe-prepare-target: $(target_prepared_stamp) maybe-prepare-target: $(GLUON_OPKG_KEY).pub $(target_prepared_stamp)
$(BUILD_DIR)/.prepared: Makefile $(BUILD_DIR)/.prepared: Makefile
@mkdir -p $$(dirname $@) @mkdir -p $$(dirname $@)