diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-04 18:25:19 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-04 18:25:19 +0900 |
| commit | eb3700be2a32c737346b3cc19cce3b50e6a16700 (patch) | |
| tree | c316950cb4ee15d8aab22fe575193465dd484b6d /debian/_buildscripts/local/internals | |
| parent | 628b3b8262c617857deece3409194e4fda4d1b25 (diff) | |
| download | tde-packaging-eb3700be2a32c737346b3cc19cce3b50e6a16700.tar.gz tde-packaging-eb3700be2a32c737346b3cc19cce3b50e6a16700.zip | |
DEB build scripts:
1) updated application list.
2) fixed problem with .tdescminfo contents when branches are more recent
than master/r14.0.x.
3) fixed issue with detection of extra dependencies repository.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian/_buildscripts/local/internals')
| -rwxr-xr-x | debian/_buildscripts/local/internals/_pbuilder.sh | 14 | ||||
| -rw-r--r-- | debian/_buildscripts/local/internals/extra_deps.txt | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh index cbcded647..870758df0 100755 --- a/debian/_buildscripts/local/internals/_pbuilder.sh +++ b/debian/_buildscripts/local/internals/_pbuilder.sh @@ -47,15 +47,29 @@ END_D05_01 # Get building branch from .tdescminfo file if [[ -f "$MOD_BUILD_PATH/.tdescminfo" ]]; then BUILD_BRANCH=`sed -n -r "s/^Revision: ([^-]+)-.*/\1/p" "$MOD_BUILD_PATH/.tdescminfo"` + bool_EDEPS_FOUND="n" OLD_IFS=$IFS && IFS=$' \t' while read l_branch l_repo l_component; do if [ "$l_branch" = "$BUILD_BRANCH" ]; then + bool_EDEPS_FOUND="y" cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK" echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list END_D05_02 break fi done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") + if [ "$bool_EDEPS_FOUND" != "y" ]; then + # EDEPS repository not found, use default. This could happen when building from sub branches of the main package repo + while read l_branch l_repo l_component; do + if [ "$l_branch" = "default" ]; then + bool_EDEPS_FOUND="y" + cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK" +echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list +END_D05_02 + break + fi + done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") + fi IFS=$OLD_IFS fi fi diff --git a/debian/_buildscripts/local/internals/extra_deps.txt b/debian/_buildscripts/local/internals/extra_deps.txt index 0a764d9bc..b19514d84 100644 --- a/debian/_buildscripts/local/internals/extra_deps.txt +++ b/debian/_buildscripts/local/internals/extra_deps.txt @@ -1,9 +1,9 @@ #!/bin/bash -# List of repositories for extra dependency packages +# List of repositories for extra dependency packages. +# The "default" repo will be used in case a match can't be found. EDEPS_REPO=" -# - For the time being use stable builds for extra dependencies -# master http://mirror.ppa.trinitydesktop.org/trinity-testing deps - master http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14 + default http://mirror.ppa.trinitydesktop.org/trinity-testing deps + master http://mirror.ppa.trinitydesktop.org/trinity-testing deps r14.0.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14 " |