2
0

970-remove-unsane-filenames-from-deps_initramfs-list.patch 1.2 KB

1234567891011121314151617181920212223242526272829
  1. --- a/usr/Makefile
  2. +++ b/usr/Makefile
  3. @@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data
  4. include $(obj)/.initramfs_data.cpio.d
  5. endif
  6. +deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
  7. +
  8. quiet_cmd_initfs = GEN $@
  9. cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
  10. @@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra
  11. initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
  12. initramfs_data.cpio
  13. # do not try to update files included in initramfs
  14. -$(deps_initramfs): ;
  15. +$(deps_initramfs_sane): ;
  16. -$(deps_initramfs): klibcdirs
  17. +$(deps_initramfs_sane): klibcdirs
  18. # We rebuild initramfs_data.cpio if:
  19. # 1) Any included file is newer then initramfs_data.cpio
  20. # 2) There are changes in which files are included (added or deleted)
  21. # 3) If gen_init_cpio are newer than initramfs_data.cpio
  22. # 4) arguments to gen_initramfs.sh changes
  23. -$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
  24. +$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
  25. $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
  26. $(call if_changed,initfs)