summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-09-13 13:48:48 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-09-13 13:48:48 +0200
commitd413bd4fa1ecda01d1ee2e489dc4e1af6184686b (patch)
tree6cf5910d95f69fb58cdfe15142f0c02151ff6c71 /bin
parentbb516cb52e16ecf606914616a13608d8897b34ce (diff)
downloadbuildscripts-d413bd4fa1ecda01d1ee2e489dc4e1af6184686b.tar.gz
buildscripts-d413bd4fa1ecda01d1ee2e489dc4e1af6184686b.tar.bz2
buildscripts-d413bd4fa1ecda01d1ee2e489dc4e1af6184686b.zip
use "release" as keyword for release builds
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build-rpm-package21
-rwxr-xr-xbin/sbuild-deb-package18
2 files changed, 16 insertions, 23 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 2e2513f..a99a62f 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -38,7 +38,7 @@ RPM_EXTRA_REPO_MOCK_CONFIG_BASE=""
RPM_EXTRA_REPO_MOCK_CONFIG_FULL_NAME=""
-COMPONENT_MAIN="main"
+COMPONENT_RELEASE="release"
COMPONENT_NIGHTLY="nightly"
COMPONENT_BUNDLES="bundle-release1 bundle-release2"
REPOS_SERVER="packages.mydomain.org"
@@ -48,7 +48,7 @@ GNUPGHOME="${HOME}/.gnupg"
OPENSUSE_DOWNLOAD_URL="http://download.opensuse.org/distribution/#VERSION#/repo/oss/suse/"
SLE_DOWNLOAD_URL="/srv/mirrors/non-public/sle/#VERSION#/rpms/"
-test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; }
+test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {release,release/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; }
PREFIX="$(cut -d"-" -f1 <<< "$(basename "${0}")")"
test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { echo "${0} has no valid context prefix..." >&2; exit 1; }
@@ -147,11 +147,11 @@ set_vars() {
CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}"
[ -n "${ARGV2_CODENAME}" ] && FORCE_BUILD="yes" || true
DATE="${DATE:-$(date +%Y%m%d)}"
- if [ "x${COMPONENT}" = "x${COMPONENT_MAIN}" ]; then
- CHECKOUT="${3:-build-main}"
- elif [ "x${COMPONENT}" = "x${COMPONENT_MAIN}-test" ]; then
- CHECKOUT="${3:-build-main-test}"
- COMPONENT="maintest"
+ if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then
+ CHECKOUT="${3:-release-builds}"
+ elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then
+ CHECKOUT="${3:-build-release-test}"
+ COMPONENT="release-testbuilds"
elif grep -qs "${COMPONENT}" <<< "${COMPONENT_BUNDLES}"; then
CHECKOUT="${3:-build-$COMPONENT}"
elif [ "x${COMPONENT}" = "x$COMPONENT_NIGHTLY" ]; then
@@ -307,13 +307,6 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET
fi
done
- # Rename "main" to "release" and "heuler" to "nightly".
- if [ "${COMPONENT}" = "main" ]; then
- COMPONENT="release"
- elif [ "${COMPONENT}" = "heuler" ]; then
- COMPONENT="nightly"
- fi
-
# Note: there is no way to check for the component's validity,
# as LTS releases have "random" names assigned to them.
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 2a99e71..e0b8a61 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -29,7 +29,7 @@ DEB_DISTS_SUPPORTED="debian ubuntu"
DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,sid"
UBUNTU_DISTROS="lucid,precise,trusty,xenial,yakkety"
-COMPONENT_MAIN="main"
+COMPONENT_RELEASE="release"
COMPONENT_NIGHTLY="nightly"
COMPONENT_BUNDLES="bundle-release1 bundle-release2"
REPOS_SERVER="packages.mydomain.org"
@@ -38,7 +38,7 @@ GNUPGHOME="${HOME}/.gnupg"
TIMESTAMP=$(date +%s%N)
-test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; }
+test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {release,release/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; }
PREFIX="$(cut -d"-" -f1 <<< "$(basename "${0}")")"
test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { echo "${0} has no valid context prefix..." >&2; exit 1; }
@@ -85,10 +85,10 @@ set_vars() {
CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}"
[ -n "${ARGV2_CODENAME}" ] && FORCE_BUILD="yes" || true
DATE="${DATE:-$(date +%Y%m%d)}"
- if [ "x${COMPONENT}" = "x${COMPONENT_MAIN}" ]; then
- CHECKOUT="${3:-build-main}"
- elif [ "x${COMPONENT}" = "x${COMPONENT_MAIN}-test" ]; then
- CHECKOUT="${3:-build-main-test}"
+ if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then
+ CHECKOUT="${3:-release-builds}"
+ elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then
+ CHECKOUT="${3:-release-testbuilds}"
elif grep -qs "$COMPONENT" <<< "${COMPONENT_BUNDLES}"; then
CHECKOUT="${3:-build-$COMPONENT}"
elif [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then
@@ -272,8 +272,8 @@ build_packages() {
exit 1
fi
- # modify the section for non-main package builds
- [ "x${COMPONENT}" != "xmain" ] && {
+ # modify the section for non-release package builds
+ [ "x${COMPONENT}" != "xrelease" ] && {
mv -- "debian/control" "debian/control.tmp"
sed "s,Section:[\ ]*\(.*\),Section: ${COMPONENT}/\1,g" debian/control.tmp > debian/control
}
@@ -287,7 +287,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="deb http://${REPOS_SERVER}/${l_DIST}-nightly ${l_CODENAME} ${COMPONENT_MAIN}"
+ grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST}-nightly ${l_CODENAME} ${COMPONENT_RELEASE}"
else
grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}"
fi