diff options
| -rwxr-xr-x | build | 5 | ||||
| -rwxr-xr-x | libexec/build-makedeps | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -99,6 +99,11 @@ include() eval "test -z '\${BUILDER_INCLUDE_${2}}'" || return . "${BUILDER_CFGDIR}/${1}" eval "BUILDER_INCLUDE_${2}='${BUILDER_CFGDIR}/${1}" + if [ -z "${BUILDER_INCLUDED}" ]; then + BUILDER_INCLUDED="${1}" + else + BUILDER_INCLUDED="${BUILDER_INCLUDED} ${1}" + fi } # FIXME we need a build-resolv subcmd for resolving package names diff --git a/libexec/build-makedeps b/libexec/build-makedeps index 1d7a2bd..b346120 100755 --- a/libexec/build-makedeps +++ b/libexec/build-makedeps @@ -57,7 +57,13 @@ for package in $(echo "${BUILDER_PKGDIR}"/*/*); do package_export="${BUILDER_TOPDIR}/exports/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${CHOST%%-*}.rpm" package_logdir="${L}" - package_sources="${RULESFILE}" + package_sources="${BUILDER_TOPDIR}/.git/modules/scripts/index" + for config in ${BUILDER_INCLUDED}; do + test -f "${BUILDER_CFGDIR}/${config}" || continue + package_sources="${package_sources} ${BUILDER_CFGDIR}/${config}" + done + + package_sources="${package_sources} ${RULESFILE}" for patch in ${PATCHES}; do patch="${F}/${NAME}-${VERSION}-${patch}.patch" if ! test -f "${patch}"; then |