The clean stage did not clean up the installed kernel images from the image directory, but if we use ptx/image-install to install them, this can all be done by PTXdist's default clean stage. That macro now also prints the installed images, so we don't need to echo them.
While at it, fix a misplaced space in the "foreach dtb" statement. Signed-off-by: Roland Hieber <[email protected]> --- … oops, forgot to send this with the first series… rules/templates/template-kernel-make | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index cd1b717c51ba..1497a0c2177a 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -114,13 +114,14 @@ $(STATEDIR)/kernel-@[email protected]: @$(call targetinfo) @$(foreach image, $(KERNEL_@PACKAGE@_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-@package@$(ptx/nl)) + $(call ptx/image-install, KERNEL_@PACKAGE@, \ + $(image), \ + $(notdir $(image))-@package@$(ptx/nl))) - @$(foreach dtb ,$(KERNEL_@PACKAGE@_DTB_FILES), \ - echo -e "Installing $(dtb) ...\n"$(ptx/nl) \ - install -D -m0644 $(KERNEL_@PACKAGE@_PKGDIR)/boot/$(dtb) \ - $(IMAGEDIR)/$(dtb)$(ptx/nl)) + @$(foreach dtb, $(KERNEL_@PACKAGE@_DTB_FILES), \ + $(call ptx/image-install, KERNEL_@PACKAGE@, \ + $(KERNEL_@PACKAGE@_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-@package@) @$(call install_fixup, kernel-@package@, PRIORITY,optional) @@ -142,16 +143,6 @@ $(STATEDIR)/kernel-@[email protected]: @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel-@[email protected]: - @$(call targetinfo) - @$(call clean_pkg, KERNEL_@PACKAGE@) - @$(foreach dtb,$(KERNEL_@PACKAGE@_DTB_FILES), \ - rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl)) - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- -- 2.39.2
