From 03f12377178e209f599f00b3fafb33dfa649abc7 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:46 +0200 Subject: docs/manual: Document the variable $(PKG)_DL_OPTS This adds a description of the optional variable $(PKG)_DL_OPTS. When it is set, this option passes additional options to the downloader. Signed-off-by: Romain Perier Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs') diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index ef895ec91..51408e869 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -250,6 +250,13 @@ information is (assuming the package name is +libfoo+) : +LIBFOO_SITE=/opt/software/libfoo.tar.gz+ + +LIBFOO_SITE=$(TOPDIR)/../src/libfoo+ +* +LIBFOO_DL_OPTS+ is a space-separated list of additional options to + pass to the downloader. Useful for retrieving documents with + server-side checking for user logins and passwords, or to use a proxy. + All download methods valid for +LIBFOO_SITE_METHOD+ are supported; + valid options depend on the download method (consult the man page + for the respective download utilities). + * +LIBFOO_EXTRA_DOWNLOADS+ is a space-separated list of additional files that Buildroot should download. If an entry contains +://+ then Buildroot will assume it is a complete URL and will download -- cgit v1.2.3 From 4802db3dad05ff8926d4fb462fc9282c07544487 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:26 +0200 Subject: core: introduce a generated kconfig snippet Add the infrastructure for adding generated kconfig snippet in the menuconfig. For now, the kconfig snippet is generated empty, the recipe for filling it in will be introduced in sub-sequent patches. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Cc: Thomas De Schampheleire Cc: Samuel Martin Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in | 6 ++++++ Makefile | 10 +++++++++- docs/manual/manual.mk | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/Config.in b/Config.in index 741a7ce8a..5273cada7 100644 --- a/Config.in +++ b/Config.in @@ -18,6 +18,10 @@ config BR2_EXTERNAL string option env="BR2_EXTERNAL" +config BR2_BUILD_DIR + string + option env="BUILD_DIR" + # Hidden config symbols for packages to check system gcc version config BR2_HOST_GCC_VERSION string @@ -763,3 +767,5 @@ menu "User-provided options" source "$BR2_EXTERNAL/Config.in" endmenu + +source "$BR2_BUILD_DIR/.br2-external.in" diff --git a/Makefile b/Makefile index c9865a640..c7ac59edf 100644 --- a/Makefile +++ b/Makefile @@ -761,7 +761,7 @@ HOSTCFLAGS = $(CFLAGS_FOR_BUILD) export HOSTCFLAGS .PHONY: prepare-kconfig -prepare-kconfig: outputmakefile +prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in $(BUILD_DIR)/buildroot-config/%onf: mkdir -p $(@D)/lxdialog @@ -780,6 +780,7 @@ COMMON_CONFIG_ENV = \ BR2_CONFIG=$(BR2_CONFIG) \ BR2_EXTERNAL=$(BR2_EXTERNAL) \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ + BUILD_DIR=$(BUILD_DIR) \ SKIP_LEGACY= xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig @@ -880,6 +881,13 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +# Even though the target is a real file, we mark it as PHONY as we +# want it to be re-generated each time make is invoked, in case the +# value of BR2_EXTERNAL is changed. +.PHONY: $(BUILD_DIR)/.br2-external.in +$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) + @touch $@ + # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index caf080a84..b26f91234 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -7,6 +7,9 @@ MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) MANUAL_RESOURCES = $(TOPDIR)/docs/images +# Ensure the kconfig snippet is generated (for MANUAL_GEN_LISTS, below): +MANUAL_DEPENDENCIES += prepare-kconfig + # Our manual needs to generate lists define MANUAL_GEN_LISTS $(Q)$(call MESSAGE,"Updating the manual lists...") -- cgit v1.2.3 From 3c695928f593d2f7eff3d8ac60fcd9ac21a26c57 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:23 +0200 Subject: doc/asciidoc: add possibility to define document dependencies Currently, a document can not have dependencies, except for the purely internal ones (like checking asciidoc version, and presence of dblatex). For our own manual, this will come in handy when we introduce a generated kconfig snippet, so we can actually make the manual depend on that snippet being generated first. For external documents, it can be used to depend on host-packages if need be (e.g. a custom host packages that generates specific media files included in the manual). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-asciidoc.txt | 3 +++ package/doc-asciidoc.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index 6e2178696..0c10fd124 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -63,6 +63,9 @@ information is (assuming the document name is +foo+) : to one or more directories containing so-called resources (like CSS or images). By default, empty. +* +FOO_DEPENDENCIES+, optional, the list of packages (most probably, + host-packages) that must be built before building this document. + There are also additional hooks (see xref:hooks[] for general information on hooks), that a document may set to define extra actions to be done at various steps: diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 4f765b885..cb6e61660 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -141,7 +141,7 @@ endef ################################################################################ define ASCIIDOC # Single line, because splitting a foreach is not easy... -$(1)-check-dependencies: asciidoc-check-dependencies +$(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_HOOKS),$$(call $$(hook))$$(sep)) # Single line, because splitting a foreach is not easy... -- cgit v1.2.3 From fba75c8f9e56e0e17221ab0d827b55f16fc3d78e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:27 +0200 Subject: docs/manual: prepare-kconfig can be used as a dependency of documents Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-asciidoc.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index 0c10fd124..a278d44cc 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -65,6 +65,8 @@ information is (assuming the document name is +foo+) : * +FOO_DEPENDENCIES+, optional, the list of packages (most probably, host-packages) that must be built before building this document. + If a hook of your document needs to access the _Kconfig_ structure, + you may add +prepare-kconfig+ to the list of dependencies. There are also additional hooks (see xref:hooks[] for general information on hooks), that a document may set to define extra actions to be done at -- cgit v1.2.3