Commit 59e19c7e authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

pkg-generic: refactor the "Downloading" message logic 



In the .stamp_downloaded hook, the logic to decide whether or not to
display the "Downloading" message is treating the check of
<pkg>_SOURCE as a special case. But in fact, there is no real reason
to do so: the existing loop used for <pkg>_PATCH and
<pkg>_EXTRA_DOWNLOADS could work just as well.

This commit therefore refactors this piece of code, to have a single
loop checking <pkg>_SOURCE, <pkg>_PATCH and <pkg>_EXTRA_DOWNLOADS.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 48296c5a

package/pkg-generic.mk

+6 −10
Original line number Diff line number Diff line
@@ -73,16 +73,12 @@ $(BUILD_DIR)/%/.stamp_downloaded: 
	$(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep))

ifeq ($(DL_MODE),DOWNLOAD)

# Only show the download message if it isn't already downloaded

	$(Q)if test ! -e $(DL_DIR)/$($(PKG)_SOURCE); then \

		$(call MESSAGE,"Downloading") ; \

	else \

		for p in $($(PKG)_PATCH) $($(PKG)_EXTRA_DOWNLOADS) ; do \

	$(Q)for p in $($(PKG)_SOURCE) $($(PKG)_PATCH) $($(PKG)_EXTRA_DOWNLOADS) ; do \

		if test ! -e $(DL_DIR)/`basename $$p` ; then \

			$(call MESSAGE,"Downloading") ; \

			break ; \

		fi ; \

		done ; \

	fi

	done

endif

	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))

	$(foreach p,$($(PKG)_EXTRA_DOWNLOADS),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))$(sep))