diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-11-10 09:04:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-11-10 09:24:45 +0100 |
| commit | 1d2b0651a3a4e580043b70ffc0da8a97bd324066 (patch) | |
| tree | 3ef5b11710ae713dc5389773ef1175691f215a3d | |
| parent | e690846cf3db937a5dec92b1542c59f58729a0cf (diff) | |
| download | buildscripts-1d2b0651a3a4e580043b70ffc0da8a97bd324066.tar.gz buildscripts-1d2b0651a3a4e580043b70ffc0da8a97bd324066.tar.bz2 buildscripts-1d2b0651a3a4e580043b70ffc0da8a97bd324066.zip | |
Support sbuild's --extra-repository parameter at build time.
| -rwxr-xr-x | bin/sbuild-deb-package | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index ff87ee2..9e66850 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -256,7 +256,7 @@ build_packages() { mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386} OTHERMIRROR="" if [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then - grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="--extra-repository=\"deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_MAIN} ${COMPONENT}\"" + grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="--extra-repository=\"deb http://${REPOS_SERVER}/${l_DIST}-nightly ${l_CODENAME} ${COMPONENT_MAIN} ${COMPONENT}\"" else grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="--extra-repository=\"deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}\"" fi @@ -276,7 +276,7 @@ build_packages() { filename="$(echo $line | cut -d" " -f3-)" cp "${TEMP_DIR}/${filename}" . done - nice ${SBUILD} -j2 -sAd "${VERSION}" -k "${GPG_KEY}" -c "arctica-${l_CODENAME}" ${SA_OPTION} "${DSCFILE}" + nice ${SBUILD} -j2 -sAd "${VERSION}" -k "${GPG_KEY}" -c "arctica-${l_CODENAME}" ${OTHERMIRROR} ${SA_OPTION} "${DSCFILE}" } [ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" @@ -286,7 +286,7 @@ build_packages() { filename="$(echo $line | cut -d" " -f3-)" cp "${TEMP_DIR}/${filename}" . done - nice ${SBUILD} -j2 -sAd "${VERSION}" -k "${GPG_KEY}" -c "arctica-${l_CODENAME}-i386" --arch=i386 --debbuildopts="-B" "${DSCFILE}" + nice ${SBUILD} -j2 -sAd "${VERSION}" -k "${GPG_KEY}" -c "arctica-${l_CODENAME}-i386" ${OTHERMIRROR} --arch=i386 --debbuildopts="-B" "${DSCFILE}" } done } |