From 3af9e7f486dfd1668a64c6291de6b1104b499e99 Mon Sep 17 00:00:00 2001 From: viisauksena Date: Tue, 22 Mar 2016 03:21:17 +0100 Subject: [PATCH 1/2] doku: add hint how to list multiple modules in modules maybe a link to a live example is also quiet nice to have, especialy with the form of how to list a wanted packages was struggling --- docs/site-example/modules | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/site-example/modules b/docs/site-example/modules index 05856ce4..13f30821 100644 --- a/docs/site-example/modules +++ b/docs/site-example/modules @@ -6,17 +6,19 @@ ## GLUON_SITE_FEEDS # for each feed name given, add the corresponding PACKAGES_* lines # documented below -#GLUON_SITE_FEEDS='my_own_packages' +#GLUON_SITE_FEEDS='my_own_package my_second_package' ## PACKAGES_$feedname_REPO # the git repository from where to clone the package feed -#PACKAGES_MY_OWN_PACKAGES_REPO=https://github.com/.../my-own-packages.git - +#PACKAGES_MY_OWN_PACKAGE_REPO=https://github.com/.../my-own-packages.git ## PACKAGES_$feedname_COMMIT # the version/commit of the git repository to clone -#PACKAGES_MY_OWN_PACKAGES_COMMIT=123456789aabcda1a69b04278e4d38f2a3f57e49 +#PACKAGES_MY_OWN_PACKAGE_COMMIT=123456789aabcda1a69b04278e4d38f2a3f57e49 ## PACKAGES_$feedname_BRANCH # the branch to check out -#PACKAGES_MY_OWN_PACKAGES_BRANCH=my_branch +#PACKAGES_MY_OWN_PACKAGE_BRANCH=my_branch + +#PACKAGES_MY_SECOND_PACKAGE_REPO=https://github.com/.../my-second-package.git +#... From 21a8bfcd13c9b4083c26ab8e30ce1c47556ba7ad Mon Sep 17 00:00:00 2001 From: viisauksena Date: Sat, 26 Mar 2016 08:19:08 +0100 Subject: [PATCH 2/2] Update modules --- docs/site-example/modules | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/docs/site-example/modules b/docs/site-example/modules index 13f30821..9fe16803 100644 --- a/docs/site-example/modules +++ b/docs/site-example/modules @@ -1,24 +1,22 @@ # This file allows specifying additional repositories to use # when building gluon. # -# In most cases, it is not required so don't add it. +# In most cases, it is not required so don't add it by default. ## GLUON_SITE_FEEDS # for each feed name given, add the corresponding PACKAGES_* lines # documented below -#GLUON_SITE_FEEDS='my_own_package my_second_package' +# GLUON_SITE_FEEDS= -## PACKAGES_$feedname_REPO -# the git repository from where to clone the package feed -#PACKAGES_MY_OWN_PACKAGE_REPO=https://github.com/.../my-own-packages.git +# PACKAGES_MY_OWN_PACKAGE_REPO= +# PACKAGES_MY_OWN_PACKAGE_COMMIT= +# PACKAGES_MY_OWN_PACKAGE_BRANCH= -## PACKAGES_$feedname_COMMIT -# the version/commit of the git repository to clone -#PACKAGES_MY_OWN_PACKAGE_COMMIT=123456789aabcda1a69b04278e4d38f2a3f57e49 - -## PACKAGES_$feedname_BRANCH -# the branch to check out -#PACKAGES_MY_OWN_PACKAGE_BRANCH=my_branch - -#PACKAGES_MY_SECOND_PACKAGE_REPO=https://github.com/.../my-second-package.git -#... +## Example +GLUON_SITE_FEEDS='my_own_package my_second_package' +PACKAGES_MY_OWN_PACKAGE_REPO=https://github.com/.../my-own-packages.git +PACKAGES_MY_OWN_PACKAGE_COMMIT=123456789aabcda1a69b04278e4d38f2a3f57e49 +PACKAGES_MY_OWN_PACKAGE_BRANCH=master +PACKAGES_MY_SECOND_PACKAGE_REPO=https://github.com/.../my-second-package.git +PACKAGES_MY_SECOND_PACKAGE_COMMIT=123456789aabcda1a69b04278e4d38f2a3f57e49 +PACKAGES_MY_SECOND_PACKAGE_BRANCH=beta