From: Peter Korsgaard Date: Sat, 12 Mar 2011 21:10:56 +0000 (+0100) Subject: Makefile.package.in: make _SOURCE optional X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7266ed46535c4195e2f5cbd644bc5745992b043e;p=buildroot.git Makefile.package.in: make _SOURCE optional For packages where the sources are included in buildroot (E.G. makedevs). We unfortunately already use no _SOURCE to mean _.tar.gz, in several packages (and for git/svn/bzr support), so you need to define _SOURCE to the empty string to use it. Signed-off-by: Peter Korsgaard --- diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 92ce4e22f8..84687d58ec 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -232,7 +232,7 @@ ifeq ($(DL_MODE),DOWNLOAD) (test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \ $(call MESSAGE,"Downloading") endif - $(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)) + $(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))) $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH))) ifeq ($(DL_MODE),DOWNLOAD) $(Q)mkdir -p $(@D) @@ -243,8 +243,8 @@ endif $(BUILD_DIR)/%/.stamp_extracted: @$(call MESSAGE,"Extracting") $(Q)mkdir -p $(@D) - $(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + $(Q)$(if $($(PKG)_SOURCE),$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \ + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -) # some packages have messed up permissions inside $(Q)chmod -R ug+rw $(@D) $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))