summaryrefslogtreecommitdiffstats
path: root/debian/_buildscripts/local/internals/_pbuilder.sh
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-05-04 18:25:19 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-05-04 18:25:19 +0900
commiteb3700be2a32c737346b3cc19cce3b50e6a16700 (patch)
treec316950cb4ee15d8aab22fe575193465dd484b6d /debian/_buildscripts/local/internals/_pbuilder.sh
parent628b3b8262c617857deece3409194e4fda4d1b25 (diff)
downloadtde-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/_pbuilder.sh')
-rwxr-xr-xdebian/_buildscripts/local/internals/_pbuilder.sh14
1 files changed, 14 insertions, 0 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