| Message ID | 20180827114530.19263-1-Denis.Osterland@diehl.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | acceptance-tests: add support for clean target | expand |
Hi, any objections here? Regards Denis Am Montag, den 27.08.2018, 11:46 +0000 schrieb Denis OSTERLAND: > Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> > --- > Makefile | 2 +- > scripts/acceptance-tests/CheckImage.mk | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index b40b9cf..0c53430 100644 > --- a/Makefile > +++ b/Makefile > @@ -505,7 +505,7 @@ MRPROPER_FILES += .config .config.old tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS > # > clean: rm-dirs := $(CLEAN_DIRS) > clean: rm-files := $(CLEAN_FILES) > -clean-dirs := $(addprefix _clean_, $(swupdate-dirs) $(tools-dirs) $(shared-dirs)) > +clean-dirs := $(addprefix _clean_, $(swupdate-dirs) $(tools-dirs) $(shared-dirs) scripts/acceptance-tests) > > PHONY += $(clean-dirs) clean archclean > $(clean-dirs): > diff --git a/scripts/acceptance-tests/CheckImage.mk b/scripts/acceptance-tests/CheckImage.mk > index 0dbb9ba..f1df244 100644 > --- a/scripts/acceptance-tests/CheckImage.mk > +++ b/scripts/acceptance-tests/CheckImage.mk > @@ -61,6 +61,7 @@ PHONY += CrapFileTest > CrapFileTest: $(obj)/CrapFile.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) > $(call cmd,swu_check_assert_false) > > +clean-files += CrapFile.swu > $(obj)/CrapFile.swu: > $(Q)mkdir -p $(dir $@) > $(Q)dd if=/dev/random of=$@ bs=1K count=1 > @@ -76,6 +77,7 @@ ImgNameErrorTest: $(obj)/ImgNameError.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $( > $(Q)mkdir -p $(dir $@) > $(Q)echo "Hello World" > $@ > > +clean-dirs += ImgNameError > $(obj)/ImgNameError/sw-description: > $(Q)mkdir -p $(dir $@) > $(Q)printf "\ > @@ -102,6 +104,7 @@ software =\n\ > > with_sig = $1 $(if $(CONFIG_SIGNED_IMAGES),$(addsuffix .sig, $1)) > > +clean-files += ImgNameError.swu > $(obj)/ImgNameError.swu: $(call with_sig, $(obj)/ImgNameError/sw-description) $(obj)/ImgNameError/hello.txt > $(call cmd,mkswu) > > @@ -112,6 +115,7 @@ PHONY += ValidImageTest > ValidImageTest: $(obj)/ValidImage.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) > $(call cmd,swu_check_assert_true) > > +clean-dirs += ValidImage > $(obj)/ValidImage/sw-description: > $(Q)mkdir -p $(dir $@) > $(Q)printf "\ > @@ -137,6 +141,7 @@ $(if $(CONFIG_HASH_VERIFY), sha256 = \"d2a84f4b8b650937ec8f73cd8be2c74add5a911b > }\n\ > " > $@ > > +clean-files += ValidImage.swu > $(obj)/ValidImage.swu: $(call with_sig, $(obj)/ValidImage/sw-description) $(obj)/ValidImage/hello.txt > $(call cmd,mkswu) > > @@ -161,6 +166,7 @@ PHONY += InvOptsCheckWithSur > InvOptsCheckWithSur: FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) > $(call cmd,swu_check_inv_suricatta) > > +clean-files += signer.pem cacert.pem > $(obj)/signer.pem $(obj)/cacert.pem: > wget -O $@.tmp https://raw.githubusercontent.com/openssl/openssl/master/demos/cms/$(notdir $@) > mv -f $@.tmp $@ Diehl Connectivity Solutions GmbH Geschäftsführung: Horst Leonberger Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht Nürnberg: HRB 32315
On 08/10/2018 11:09, Denis OSTERLAND wrote: > Hi, > > any objections here? > Ouch...no. I merge it - I check the other patches, too, to see if I miss something. Thanks for remond. Best regards, Stefano Babic > Regards Denis > > Am Montag, den 27.08.2018, 11:46 +0000 schrieb Denis OSTERLAND: >> Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> >> --- >> Makefile | 2 +- >> scripts/acceptance-tests/CheckImage.mk | 6 ++++++ >> 2 files changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/Makefile b/Makefile >> index b40b9cf..0c53430 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -505,7 +505,7 @@ MRPROPER_FILES += .config .config.old tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS >> # >> clean: rm-dirs := $(CLEAN_DIRS) >> clean: rm-files := $(CLEAN_FILES) >> -clean-dirs := $(addprefix _clean_, $(swupdate-dirs) $(tools-dirs) $(shared-dirs)) >> +clean-dirs := $(addprefix _clean_, $(swupdate-dirs) $(tools-dirs) $(shared-dirs) scripts/acceptance-tests) >> >> PHONY += $(clean-dirs) clean archclean >> $(clean-dirs): >> diff --git a/scripts/acceptance-tests/CheckImage.mk b/scripts/acceptance-tests/CheckImage.mk >> index 0dbb9ba..f1df244 100644 >> --- a/scripts/acceptance-tests/CheckImage.mk >> +++ b/scripts/acceptance-tests/CheckImage.mk >> @@ -61,6 +61,7 @@ PHONY += CrapFileTest >> CrapFileTest: $(obj)/CrapFile.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) >> $(call cmd,swu_check_assert_false) >> >> +clean-files += CrapFile.swu >> $(obj)/CrapFile.swu: >> $(Q)mkdir -p $(dir $@) >> $(Q)dd if=/dev/random of=$@ bs=1K count=1 >> @@ -76,6 +77,7 @@ ImgNameErrorTest: $(obj)/ImgNameError.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $( >> $(Q)mkdir -p $(dir $@) >> $(Q)echo "Hello World" > $@ >> >> +clean-dirs += ImgNameError >> $(obj)/ImgNameError/sw-description: >> $(Q)mkdir -p $(dir $@) >> $(Q)printf "\ >> @@ -102,6 +104,7 @@ software =\n\ >> >> with_sig = $1 $(if $(CONFIG_SIGNED_IMAGES),$(addsuffix .sig, $1)) >> >> +clean-files += ImgNameError.swu >> $(obj)/ImgNameError.swu: $(call with_sig, $(obj)/ImgNameError/sw-description) $(obj)/ImgNameError/hello.txt >> $(call cmd,mkswu) >> >> @@ -112,6 +115,7 @@ PHONY += ValidImageTest >> ValidImageTest: $(obj)/ValidImage.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) >> $(call cmd,swu_check_assert_true) >> >> +clean-dirs += ValidImage >> $(obj)/ValidImage/sw-description: >> $(Q)mkdir -p $(dir $@) >> $(Q)printf "\ >> @@ -137,6 +141,7 @@ $(if $(CONFIG_HASH_VERIFY), sha256 = \"d2a84f4b8b650937ec8f73cd8be2c74add5a911b >> }\n\ >> " > $@ >> >> +clean-files += ValidImage.swu >> $(obj)/ValidImage.swu: $(call with_sig, $(obj)/ValidImage/sw-description) $(obj)/ValidImage/hello.txt >> $(call cmd,mkswu) >> >> @@ -161,6 +166,7 @@ PHONY += InvOptsCheckWithSur >> InvOptsCheckWithSur: FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) >> $(call cmd,swu_check_inv_suricatta) >> >> +clean-files += signer.pem cacert.pem >> $(obj)/signer.pem $(obj)/cacert.pem: >> wget -O $@.tmp https://raw.githubusercontent.com/openssl/openssl/master/demos/cms/$(notdir $@) >> mv -f $@.tmp $@ > > Diehl Connectivity Solutions GmbH > Geschäftsführung: Horst Leonberger > Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht > Nürnberg: HRB 32315 > ___________________________________________________________________________________________________ > > Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. > Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. > Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. > The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by > mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. >
diff --git a/Makefile b/Makefile index b40b9cf..0c53430 100644 --- a/Makefile +++ b/Makefile @@ -505,7 +505,7 @@ MRPROPER_FILES += .config .config.old tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean: rm-dirs := $(CLEAN_DIRS) clean: rm-files := $(CLEAN_FILES) -clean-dirs := $(addprefix _clean_, $(swupdate-dirs) $(tools-dirs) $(shared-dirs)) +clean-dirs := $(addprefix _clean_, $(swupdate-dirs) $(tools-dirs) $(shared-dirs) scripts/acceptance-tests) PHONY += $(clean-dirs) clean archclean $(clean-dirs): diff --git a/scripts/acceptance-tests/CheckImage.mk b/scripts/acceptance-tests/CheckImage.mk index 0dbb9ba..f1df244 100644 --- a/scripts/acceptance-tests/CheckImage.mk +++ b/scripts/acceptance-tests/CheckImage.mk @@ -61,6 +61,7 @@ PHONY += CrapFileTest CrapFileTest: $(obj)/CrapFile.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) $(call cmd,swu_check_assert_false) +clean-files += CrapFile.swu $(obj)/CrapFile.swu: $(Q)mkdir -p $(dir $@) $(Q)dd if=/dev/random of=$@ bs=1K count=1 @@ -76,6 +77,7 @@ ImgNameErrorTest: $(obj)/ImgNameError.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $( $(Q)mkdir -p $(dir $@) $(Q)echo "Hello World" > $@ +clean-dirs += ImgNameError $(obj)/ImgNameError/sw-description: $(Q)mkdir -p $(dir $@) $(Q)printf "\ @@ -102,6 +104,7 @@ software =\n\ with_sig = $1 $(if $(CONFIG_SIGNED_IMAGES),$(addsuffix .sig, $1)) +clean-files += ImgNameError.swu $(obj)/ImgNameError.swu: $(call with_sig, $(obj)/ImgNameError/sw-description) $(obj)/ImgNameError/hello.txt $(call cmd,mkswu) @@ -112,6 +115,7 @@ PHONY += ValidImageTest ValidImageTest: $(obj)/ValidImage.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) $(call cmd,swu_check_assert_true) +clean-dirs += ValidImage $(obj)/ValidImage/sw-description: $(Q)mkdir -p $(dir $@) $(Q)printf "\ @@ -137,6 +141,7 @@ $(if $(CONFIG_HASH_VERIFY), sha256 = \"d2a84f4b8b650937ec8f73cd8be2c74add5a911b }\n\ " > $@ +clean-files += ValidImage.swu $(obj)/ValidImage.swu: $(call with_sig, $(obj)/ValidImage/sw-description) $(obj)/ValidImage/hello.txt $(call cmd,mkswu) @@ -161,6 +166,7 @@ PHONY += InvOptsCheckWithSur InvOptsCheckWithSur: FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) $(call cmd,swu_check_inv_suricatta) +clean-files += signer.pem cacert.pem $(obj)/signer.pem $(obj)/cacert.pem: wget -O $@.tmp https://raw.githubusercontent.com/openssl/openssl/master/demos/cms/$(notdir $@) mv -f $@.tmp $@
Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> --- Makefile | 2 +- scripts/acceptance-tests/CheckImage.mk | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)