From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 01/13] pkg-{download, generic}: remove source-check
Date: Mon, 8 Jan 2018 21:22:51 +0100 [thread overview]
Message-ID: <20180108202251.GA4062@scaer> (raw)
In-Reply-To: <20171025201003.16105-2-ps.report@gmx.net>
Peter, Maxime, All,
On 2017-10-25 22:09 +0200, Peter Seiderer spake thusly:
> From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
>
> This feature is not used by anyone in the core developpers and makes a
> drastic simplification of the pkg-download infrastructure harder.
>
> The future patch will move much of what's in the current pkg-download.mk
> file into the dl-wrapper which is a shell script.
>
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> Changes v1 --> v2:
> - from https://github.com/maximeh/buildroot/commit/a4d0e83729a1ab534ff99d6f258058a1be1ed949.patch
> - remove more references to source-check (suggested by Thomas Petazzoni)
> ---
> Makefile | 7 +------
> package/pkg-download.mk | 44 --------------------------------------------
> package/pkg-generic.mk | 14 +-------------
> 3 files changed, 2 insertions(+), 63 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 79db7fe48a..45047f7e9a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -141,7 +141,7 @@ noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconf
> # We're building in two situations: when MAKECMDGOALS is empty
> # (default target is to build), or when MAKECMDGOALS contains
> # something else than one of the nobuild_targets.
> -nobuild_targets := source %-source source-check \
> +nobuild_targets := source %-source \
> legal-info %-legal-info external-deps _external-deps \
> clean distclean help show-targets graph-depends \
> %-graph-depends %-show-depends %-show-version \
> @@ -754,10 +754,6 @@ _external-deps: $(foreach p,$(PACKAGES),$(p)-all-external-deps)
> external-deps:
> @$(MAKE1) -Bs $(EXTRAMAKEARGS) _external-deps | sort -u
>
> -# check if download URLs are outdated
> -.PHONY: source-check
> -source-check: $(foreach p,$(PACKAGES),$(p)-all-source-check)
> -
> .PHONY: legal-info-clean
> legal-info-clean:
> @rm -fr $(LEGAL_INFO_DIR)
> @@ -1044,7 +1040,6 @@ help:
> @echo
> @echo 'Miscellaneous:'
> @echo ' source - download all sources needed for offline-build'
> - @echo ' source-check - check selected packages for valid download URLs'
> @echo ' external-deps - list external packages used'
> @echo ' legal-info - generate info about license compliance'
> @echo ' printvars - dump all the internal variables'
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index dc4ff1c8c7..2b845e77a2 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -68,9 +68,6 @@ export BR_NO_CHECK_HASH_FOR =
> # ssh authentication. DOWNLOAD_WGET is the normal wget-based download
> # mechanism.
> #
> -# The SOURCE_CHECK_* helpers are in charge of simply checking that the source
> -# is available for download. This can be used to make sure one will be able
> -# to get all the sources needed for one's build configuration.
> ################################################################################
>
> define DOWNLOAD_GIT
> @@ -86,12 +83,6 @@ define DOWNLOAD_GIT
> $($(PKG)_DL_OPTS)
> endef
>
> -# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
> -# repository
> -define SOURCE_CHECK_GIT
> - $(GIT) ls-remote --heads $($(PKG)_SITE) > /dev/null
> -endef
> -
> define DOWNLOAD_BZR
> $(EXTRA_ENV) $(DL_WRAPPER) -b bzr \
> -o $(DL_DIR)/$($(PKG)_SOURCE) \
> @@ -103,10 +94,6 @@ define DOWNLOAD_BZR
> $($(PKG)_DL_OPTS)
> endef
>
> -define SOURCE_CHECK_BZR
> - $(BZR) ls --quiet $($(PKG)_SITE) > /dev/null
> -endef
> -
> define DOWNLOAD_CVS
> $(EXTRA_ENV) $(DL_WRAPPER) -b cvs \
> -o $(DL_DIR)/$($(PKG)_SOURCE) \
> @@ -119,11 +106,6 @@ define DOWNLOAD_CVS
> $($(PKG)_DL_OPTS)
> endef
>
> -# Not all CVS servers support ls/rls, use login to see if we can connect
> -define SOURCE_CHECK_CVS
> - $(CVS) -d:pserver:anonymous:@$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) login
> -endef
> -
> define DOWNLOAD_SVN
> $(EXTRA_ENV) $(DL_WRAPPER) -b svn \
> -o $(DL_DIR)/$($(PKG)_SOURCE) \
> @@ -135,10 +117,6 @@ define DOWNLOAD_SVN
> $($(PKG)_DL_OPTS)
> endef
>
> -define SOURCE_CHECK_SVN
> - $(SVN) ls $($(PKG)_SITE)@$($(PKG)_DL_VERSION) > /dev/null
> -endef
> -
> # SCP URIs should be of the form scp://[user@]host:filepath
> # Note that filepath is relative to the user's home directory, so you may want
> # to prepend the path with a slash: scp://[user@]host:/absolutepath
> @@ -152,10 +130,6 @@ define DOWNLOAD_SCP
> $($(PKG)_DL_OPTS)
> endef
>
> -define SOURCE_CHECK_SCP
> - $(SSH) $(call domain,$(1),:) ls '$(call notdomain,$(1),:)' > /dev/null
> -endef
> -
> define DOWNLOAD_HG
> $(EXTRA_ENV) $(DL_WRAPPER) -b hg \
> -o $(DL_DIR)/$($(PKG)_SOURCE) \
> @@ -167,12 +141,6 @@ define DOWNLOAD_HG
> $($(PKG)_DL_OPTS)
> endef
>
> -# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
> -# repository
> -define SOURCE_CHECK_HG
> - $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
> -endef
> -
> define DOWNLOAD_WGET
> $(EXTRA_ENV) $(DL_WRAPPER) -b wget \
> -o $(DL_DIR)/$(2) \
> @@ -183,10 +151,6 @@ define DOWNLOAD_WGET
> $($(PKG)_DL_OPTS)
> endef
>
> -define SOURCE_CHECK_WGET
> - $(WGET) --spider '$(call qstrip,$(1))'
> -endef
> -
> define DOWNLOAD_LOCALFILES
> $(EXTRA_ENV) $(DL_WRAPPER) -b cp \
> -o $(DL_DIR)/$(2) \
> @@ -197,10 +161,6 @@ define DOWNLOAD_LOCALFILES
> $($(PKG)_DL_OPTS)
> endef
>
> -define SOURCE_CHECK_LOCALFILES
> - test -e $(call stripurischeme,$(call qstrip,$(1)))
> -endef
> -
> ################################################################################
> # DOWNLOAD -- Download helper. Will try to download source from:
> # 1) BR2_PRIMARY_SITE if enabled
> @@ -221,10 +181,6 @@ define DOWNLOAD
> $(call DOWNLOAD_INNER,$(1),$(notdir $(1)),DOWNLOAD)
> endef
>
> -define SOURCE_CHECK
> - $(call DOWNLOAD_INNER,$(1),$(notdir $(1)),SOURCE_CHECK)
> -endef
> -
> define DOWNLOAD_INNER
> $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),export BR_NO_CHECK_HASH_FOR=$(2);) \
> if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index cca94ba338..5989417902 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -706,10 +706,6 @@ $(1)-legal-source: $$($(2)_TARGET_ACTUAL_SOURCE)
> endif # actual sources != sources
> endif # actual sources != ""
>
> -$(1)-source-check: PKG=$(2)
> -$(1)-source-check:
> - $$(foreach p,$$($(2)_ALL_DOWNLOADS),$$(call SOURCE_CHECK,$$(p))$$(sep))
> -
> $(1)-external-deps:
> @for p in $$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS) ; do \
> echo `basename $$$$p` ; \
> @@ -734,9 +730,6 @@ $(1)-rsync: $$($(2)_TARGET_RSYNC)
> $(1)-source:
> $(1)-legal-source:
>
> -$(1)-source-check:
> - test -d $$($(2)_OVERRIDE_SRCDIR)
> -
> $(1)-external-deps:
> @echo "file://$$($(2)_OVERRIDE_SRCDIR)"
> endif
> @@ -762,9 +755,6 @@ $(1)-graph-rdepends: graph-depends-requirements
> $(1)-all-source: $(1)-source
> $(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source)
>
> -$(1)-all-source-check: $(1)-source-check
> -$(1)-all-source-check: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source-check)
> -
> $(1)-all-external-deps: $(1)-external-deps
> $(1)-all-external-deps: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-external-deps)
>
> @@ -964,7 +954,6 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
> $(1)-all-external-deps \
> $(1)-all-legal-info \
> $(1)-all-source \
> - $(1)-all-source-check \
> $(1)-build \
> $(1)-clean-for-rebuild \
> $(1)-clean-for-reconfigure \
> @@ -989,8 +978,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
> $(1)-rsync \
> $(1)-show-depends \
> $(1)-show-version \
> - $(1)-source \
> - $(1)-source-check
> + $(1)-source
>
> ifneq ($$($(2)_SOURCE),)
> ifeq ($$($(2)_SITE),)
> --
> 2.14.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2018-01-08 20:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 20:09 [Buildroot] [PATCH v2 00/13] New DL_DIR organisation; git cache feature Peter Seiderer
2017-10-25 20:09 ` [Buildroot] [PATCH v2 01/13] pkg-{download, generic}: remove source-check Peter Seiderer
2018-01-08 20:22 ` Yann E. MORIN [this message]
2018-01-08 20:28 ` Thomas Petazzoni
2018-01-10 12:04 ` Thomas De Schampheleire
2018-01-10 12:41 ` Thomas Petazzoni
2018-01-10 12:51 ` Thomas De Schampheleire
2018-01-10 18:18 ` Yann E. MORIN
2017-10-25 20:09 ` [Buildroot] [PATCH v2 02/13] core/pkg-download: change all helpers to use common options Peter Seiderer
2018-02-05 15:34 ` Luca Ceresoli
2017-10-25 20:09 ` [Buildroot] [PATCH v2 03/13] download: put most of the infra in dl-wrapper Peter Seiderer
2018-02-05 15:34 ` Luca Ceresoli
2017-10-25 20:09 ` [Buildroot] [PATCH v2 04/13] packages: use new $($PKG)_DL_DIR) variable Peter Seiderer
2017-10-25 20:09 ` [Buildroot] [PATCH v2 05/13] pkg-{download, generic}: use new $($(PKG)_DL_DIR) Peter Seiderer
2017-10-25 20:09 ` [Buildroot] [PATCH v2 06/13] support/download: make sure the download folder is created Peter Seiderer
2017-10-25 20:09 ` [Buildroot] [PATCH v2 07/13] pkg-generic: add a subdirectory to the DL_DIR Peter Seiderer
2017-10-25 20:09 ` [Buildroot] [PATCH v2 08/13] pkg-download: support new subdir for mirrors Peter Seiderer
2017-10-25 20:09 ` [Buildroot] [PATCH v2 09/13] pkg-generic: introduce _SAME_SOURCE_AS Peter Seiderer
2017-10-25 20:10 ` [Buildroot] [PATCH v2 10/13] help/manual: update help about the new $(LIBFOO_DL_DIR) Peter Seiderer
2017-10-25 20:10 ` [Buildroot] [PATCH v2 11/13] download: add flock call before dl-wrapper Peter Seiderer
2017-10-25 20:10 ` [Buildroot] [PATCH v2 12/13] download: git: introduce cache feature Peter Seiderer
2018-02-05 13:46 ` Thomas Petazzoni
2017-10-25 20:10 ` [Buildroot] [PATCH v2 13/13] WIP: support package with '-' Peter Seiderer
2018-02-05 13:33 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180108202251.GA4062@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.