aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-12-14 15:36:39 +0100
committerFelix Fietkau <nbd@nbd.name>2016-12-17 10:36:25 +0100
commit7a315b0b5d6aa91695853a8647383876e4b49a7a (patch)
treeca99d91b9ec9408e37d30f2983847fc5a500d4a7 /include
parent720b99215da295a2e7b4acdef30b58bec6acedc2 (diff)
downloadupstream-7a315b0b5d6aa91695853a8647383876e4b49a7a.tar.gz
upstream-7a315b0b5d6aa91695853a8647383876e4b49a7a.tar.bz2
upstream-7a315b0b5d6aa91695853a8647383876e4b49a7a.zip
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@nbd.name>
Diffstat (limited to 'include')
-rw-r--r--include/download.mk69
-rw-r--r--include/host-build.mk8
-rw-r--r--include/kernel.mk9
-rw-r--r--include/package.mk22
-rw-r--r--include/subdir.mk2
-rw-r--r--include/toplevel.mk3
6 files changed, 91 insertions, 22 deletions
diff --git a/include/download.mk b/include/download.mk
index 095311bfbd..a9e8a0e2ff 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 1ba849f88d..e11e3edd09 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 2721c83d8e..4e66c0c76f 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 26fc30c7ec..f51232f503 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 f4085f9df4..10476d3476 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 f31884d3fe..5e99df8d9e 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)