imagebuilder: merge r25078 to align files/ handling with current buildroot

SVN-Revision: 34301

target/imagebuilder/files/Makefile

@@ -134,6 +134,14 @@ package_install: FORCE
 copy_files: FORCE
 	@echo
 	@echo Copying extra files
+	@( cd $(USER_FILES); find -type f ) | \
+		( cd $(TARGET_DIR); while :; do \
+			read FILE; \
+			[ -z "$$FILE" ] && break; \
+			[ -L "$$FILE" ] || continue; \
+			echo "Removing symlink $(TARGET_DIR)/$$FILE"; \
+			rm -f "$$FILE"; \
+		done; )
 	$(CP) $(USER_FILES)/* $(TARGET_DIR)/
 
 package_postinst: FORCE