[source] build: implement make check and make package/X/check
LEDE Commits
lede-commits at lists.infradead.org
Sat Dec 17 01:37:37 PST 2016
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/7a315b0b5d6aa91695853a8647383876e4b49a7a
commit 7a315b0b5d6aa91695853a8647383876e4b49a7a
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Dec 14 15:36:39 2016 +0100
build: implement make check and make package/X/check
This is intended to be used for a wide array of package sanity checks.
The first check that is implemented is for the hash of downloaded files.
It checks:
- Missing hash
- Use of SHA256 instead of MD5
- dl/<file> hash not matching hash in makefile
- deprecated MD5SUM variable
The deprecated MD5SUM variable check is skipped for feeds/ until OpenWrt
is updated as well
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
Makefile | 1 +
include/download.mk | 69 ++++++++++++++++++++++++++++++++++++++++++++-------
include/host-build.mk | 8 ++++--
include/kernel.mk | 9 ++++++-
include/package.mk | 22 +++++++++-------
include/subdir.mk | 2 +-
include/toplevel.mk | 3 +++
package/Makefile | 1 +
rules.mk | 8 ++++++
toolchain/Makefile | 1 +
tools/Makefile | 1 +
11 files changed, 103 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index 59320d4..51ed5a1 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ $(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUI
$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
$(package/stamp-install): $(package/stamp-compile)
$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
+check: $(tools/stamp-check) $(toolchain/stamp-check) $(package/stamp-check)
printdb:
@true
diff --git a/include/download.mk b/include/download.mk
index 095311b..a9e8a0e 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -44,20 +44,66 @@ define dl_tar_pack
$(TAR) --numeric-owner --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | $(call dl_pack,$(1))
endef
+ifdef CHECK
+check_escape=$(subst ','\'',$(1))
+#')
+check_warn = $(info $(shell printf "$(_R)WARNING: %s$(_N)" '$(call check_escape,$(call C_$(1),$(2),$(3),$(4)))'))
+gen_sha256sum = $(shell openssl dgst -sha256 $(DL_DIR)/$(1) | awk '{print $$2}')
+
+C_download_missing = $(1) is missing, please run make download before re-running this check
+C_hash_mismatch = $(3) does not match $(1) hash $(call gen_sha256sum,$(1))
+C_hash_deprecated = $(3) uses deprecated hash, set to $(call gen_sha256sum,$(1))
+C_hash_missing = $(3) is missing, set to $(call gen_sha256sum,$(1))
+
+check_hash = \
+ $(if $(wildcard $(DL_DIR)/$(1)), \
+ $(if $(filter-out x,$(2)), \
+ $(if $(filter 64,$(shell printf '%s' '$(2)' | wc -c)), \
+ $(if $(filter $(2),$(call gen_sha256sum,$(1))),, \
+ $(call check_warn,hash_mismatch,$(1),$(2),$(3)) \
+ ), \
+ $(call check_warn,hash_deprecated,$(1),$(2),$(3)), \
+ ), \
+ $(call check_warn,hash_missing,$(1),$(2),$(3)) \
+ ), \
+ $(call check_warn,download_missing,$(1),$(2),$(3)) \
+ )
+
+C_md5_deprecated = Use of $(2) is deprecated, switch to $(3)
+
+# Skip MD5SUM check in feeds until OpenWrt is updated
+ifneq ($(filter $(foreach dir,package tools toolchain, $(TOPDIR)/$(dir)/%),$(CURDIR)),)
+check_md5 = \
+ $(if $(filter-out x,$(1)), \
+ $(call check_warn,md5_deprecated,$(1),$(2),$(3)) \
+ )
+endif
+
+hash_var = $(if $(filter-out x,$(1)),MD5SUM,HASH)
+endif
+
define DownloadMethod/unknown
@echo "ERROR: No download method available"; false
endef
define DownloadMethod/default
- $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(HASH)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)")
+ $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(HASH)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)") \
+ $(if $(filter check,$(1)), \
+ $(call check_hash,$(FILE),$(HASH),$(2)$(call hash_var,$(MD5SUM))) \
+ $(call check_md5,$(MD5SUM),$(2)MD5SUM,$(2)HASH) \
+ )
endef
define wrap_mirror
-$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_HASH))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_HASH)" "" || ( $(1) ),$(1))
+$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_HASH))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_HASH)" "" || ( $(3) ),$(3)) \
+$(if $(filter check,$(1)), \
+ $(call check_hash,$(FILE),$(MIRROR_HASH),$(2)MIRROR_$(call hash_var,$(MIRROR_MD5SUM))) \
+ $(call check_md5,$(MIRROR_MD5SUM),$(2)MIRROR_MD5SUM,$(2)MIRROR_HASH) \
+)
endef
define DownloadMethod/cvs
- $(call wrap_mirror, \
+ $(call wrap_mirror,$(1),$(2), \
echo "Checking out files from the cvs repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
@@ -72,7 +118,7 @@ define DownloadMethod/cvs
endef
define DownloadMethod/svn
- $(call wrap_mirror, \
+ $(call wrap_mirror,$(1),$(2), \
echo "Checking out files from the svn repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
@@ -90,7 +136,7 @@ define DownloadMethod/svn
endef
define DownloadMethod/git
- $(call wrap_mirror, \
+ $(call wrap_mirror,$(1),$(2), \
echo "Checking out files from the git repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
@@ -109,7 +155,7 @@ define DownloadMethod/git
endef
define DownloadMethod/bzr
- $(call wrap_mirror, \
+ $(call wrap_mirror,$(1),$(2), \
echo "Checking out files from the bzr repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
@@ -125,7 +171,7 @@ define DownloadMethod/bzr
endef
define DownloadMethod/hg
- $(call wrap_mirror, \
+ $(call wrap_mirror,$(1),$(2), \
echo "Checking out files from the hg repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
@@ -142,7 +188,7 @@ define DownloadMethod/hg
endef
define DownloadMethod/darcs
- $(call wrap_mirror, \
+ $(call wrap_mirror, $(1), $(2), \
echo "Checking out files from the darcs repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
@@ -209,6 +255,11 @@ define Download
$(DL_DIR)/$(FILE):
mkdir -p $(DL_DIR)
- $(call locked,$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown)),$(FILE))
+ $(call locked, \
+ $(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))), \
+ $(call DownloadMethod/$(call dl_method,$(URL),$(PROTO)),check,$(if $(filter default,$(1)),PKG_,Download/$(1):)), \
+ $(DownloadMethod/unknown) \
+ ),\
+ $(FILE))
endef
diff --git a/include/host-build.mk b/include/host-build.mk
index 1ba849f..e11e3ed 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -136,9 +136,8 @@ Host/Exports=$(Host/Exports/Default)
.NOTPARALLEL:
ifndef DUMP
- define HostBuild
+ define HostBuild/Core
$(if $(HOST_QUILT),$(Host/Quilt))
- $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
$(if $(DUMP),,$(call HostHost/Autoclean))
$(HOST_STAMP_PREPARED):
@@ -198,3 +197,8 @@ ifndef DUMP
clean:
endif
+
+define HostBuild
+ $(HostBuild/Core)
+ $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
+endef
diff --git a/include/kernel.mk b/include/kernel.mk
index 2721c83..4e66c0c 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -5,8 +5,15 @@
# See /LICENSE for more information.
#
+ifneq ($(filter check,$(MAKECMDGOALS)),)
+CHECK:=1
+DUMP:=1
+endif
+
ifeq ($(__target_inc),)
- include $(INCLUDE_DIR)/target.mk
+ ifndef CHECK
+ include $(INCLUDE_DIR)/target.mk
+ endif
endif
ifeq ($(DUMP),1)
diff --git a/include/package.mk b/include/package.mk
index 26fc30c..f51232f 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -7,7 +7,7 @@
__package_mk:=1
-all: $(if $(DUMP),dumpinfo,compile)
+all: $(if $(DUMP),dumpinfo,$(if $(CHECK),check,compile))
PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
@@ -144,9 +144,8 @@ define Build/Exports/Default
endef
Build/Exports=$(Build/Exports/Default)
-define Build/DefaultTargets
+define Build/CoreTargets
$(if $(QUILT),$(Build/Quilt))
- $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
$(call Build/Autoclean)
download:
@@ -211,15 +210,20 @@ define Build/DefaultTargets
compile: $(STAMP_INSTALLED)
endif
- define Build/DefaultTargets
- endef
-
prepare: $(STAMP_PREPARED)
configure: $(STAMP_CONFIGURED)
dist: $(STAMP_CONFIGURED)
distcheck: $(STAMP_CONFIGURED)
endef
+define Build/DefaultTargets
+ $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
+ $(if $(DUMP),,$(Build/CoreTargets))
+
+ define Build/DefaultTargets
+ endef
+endef
+
define Build/IncludeOverlay
$(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_DIR_NAME).mk))
define Build/IncludeOverlay
@@ -251,14 +255,14 @@ endif
)
$(if $(DUMP), \
- $(Dumpinfo/Package), \
+ $(if $(CHECK),,$(Dumpinfo/Package)), \
$(foreach target, \
$(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
$(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \
), $(BuildTarget/$(target)) \
) \
)
- $(if $(PKG_HOST_ONLY)$(DUMP),,$(call Build/DefaultTargets,$(1)))
+ $(if $(PKG_HOST_ONLY),,$(call Build/DefaultTargets,$(1)))
endef
define pkg_install_files
@@ -286,7 +290,7 @@ prepare-package-install:
$(PACKAGE_DIR):
mkdir -p $@
-
+
dumpinfo:
download:
prepare:
diff --git a/include/subdir.mk b/include/subdir.mk
index f4085f9..10476d3 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -9,7 +9,7 @@ ifeq ($(MAKECMDGOALS),prereq)
SUBTARGETS:=prereq
PREREQ_ONLY:=1
else
- SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure
+ SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure check
endif
subtarget-default = $(filter-out ., \
diff --git a/include/toplevel.mk b/include/toplevel.mk
index f31884d..5e99df8 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -179,6 +179,9 @@ clean dirclean: .config
prereq:: prepare-tmpinfo .config
@+$(NO_TRACE_MAKE) -r -s $@
+check: .config FORCE
+ @+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
+
WARN_PARALLEL_ERROR = $(if $(BUILD_LOG),,$(and $(filter -j,$(MAKEFLAGS)),$(findstring s,$(OPENWRT_VERBOSE))))
ifeq ($(SDK),1)
diff --git a/package/Makefile b/package/Makefile
index 8726e2e..c4fb8ca 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -123,5 +123,6 @@ $(eval $(call stampfile,$(curdir),package,prereq,.config))
$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,check,$(TMP_DIR)/.build))
$(eval $(call subdir,$(curdir)))
diff --git a/rules.mk b/rules.mk
index d455f0d..41e0ef2 100644
--- a/rules.mk
+++ b/rules.mk
@@ -15,6 +15,11 @@ endif
include $(TOPDIR)/include/debug.mk
include $(TOPDIR)/include/verbose.mk
+ifneq ($(filter check,$(MAKECMDGOALS)),)
+CHECK:=1
+DUMP:=1
+endif
+
export TMP_DIR:=$(TOPDIR)/tmp
qstrip=$(strip $(subst ",,$(1)))
@@ -386,6 +391,9 @@ all:
FORCE: ;
.PHONY: FORCE
+check: FORCE
+ @true
+
val.%:
@$(if $(filter undefined,$(origin $*)),\
echo "$* undefined" >&2, \
diff --git a/toolchain/Makefile b/toolchain/Makefile
index a656a86..9f565d0 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -87,5 +87,6 @@ $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
endif
$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR)))
+$(eval $(call stampfile,$(curdir),toolchain,check,$(TMP_DIR)/.build))
$(eval $(call subdir,$(curdir)))
diff --git a/tools/Makefile b/tools/Makefile
index 4bfe4af..6915ea7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -145,4 +145,5 @@ $(curdir)//install = $(1)/compile
tools_enabled = $(foreach tool,$(sort $(tools-y) $(tools-)),$(if $(filter $(tool),$(tools-y)),y,n))
$(eval $(call stampfile,$(curdir),tools,install,,_$(subst $(space),,$(tools_enabled))))
+$(eval $(call stampfile,$(curdir),tools,check,$(TMP_DIR)/.build))
$(eval $(call subdir,$(curdir)))
More information about the lede-commits
mailing list