summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-08-30 22:23:14 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-08-30 22:23:14 +0900
commit39219462dbeb906d33c78a34332d9cce7d6ef395 (patch)
treec9ac9ab31c5ca1f560716a8db08666b36a92f6af /debian
parentb4c78632fdef6ee9d9639eb1d7c73fa9d65dda50 (diff)
downloadtde-packaging-39219462dbeb906d33c78a34332d9cce7d6ef395.tar.gz
tde-packaging-39219462dbeb906d33c78a34332d9cce7d6ef395.zip
DEB build scripts:
- make opensync extra dependency deprecated in R14.1 series - update_repositories.sh will not mark a new package as UPDATE anymore. This because when updating multiple branches, modules only present in one branch would cause a lot of false UPDATE messages at each branch switch. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh2
-rw-r--r--debian/_buildscripts/local/README.txt4
-rwxr-xr-xdebian/_buildscripts/local/update_repositories.sh25
3 files changed, 9 insertions, 22 deletions
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 3a101d049..763b5091c 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -12,7 +12,7 @@ else
build_module "edeps/gettext-kde"
build_module "edeps/fireflies"
build_module "edeps/imlib"
- build_module "edeps/opensync"
+# build_module "edeps/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
build_module "edeps/libbeagle"
build_module "edeps/pcsc-lite-nodbus"
build_module "edeps/lcms"
diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt
index f2eb1a2b2..4d0595031 100644
--- a/debian/_buildscripts/local/README.txt
+++ b/debian/_buildscripts/local/README.txt
@@ -34,14 +34,14 @@ A) Environment preparation
4) Clone TDE git repositories
- TDE main repo
- cd "TDE_DIR/1_git"
+ cd "$TDE_DIR/1_git"
git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde
cd tde
git submodule init -- scripts
git submodule update -- scripts
./scripts/switch_all_submodules_to_head_and_clean anonymous
- TDE packaging repo
- cd "TDE_DIR/1_git"
+ cd "$TDE_DIR/1_git"
git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
5) Add your user to the sudo group (not required if you are root)
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh
index 197a3e86c..b07220085 100755
--- a/debian/_buildscripts/local/update_repositories.sh
+++ b/debian/_buildscripts/local/update_repositories.sh
@@ -56,13 +56,11 @@ declare -A COLOR_STRINGS=(
# $1 - module folder
# $2 - operation type
# $3 - branch to update
-# $4 - new branch flag (only for reporting)
function _do_update()
{
local MOD_PATH=$1
local OP_TYPE=$2
local BRANCH=$3
- local NEW_BRANCH=$4
local RESULT=""
local LINE_CTRL_SUFFIX=""
@@ -93,14 +91,12 @@ function _do_update()
fi
# Make sure the local branch exists
if [[ -z `git branch | grep -E "\b$BRANCH\b"` ]]; then
- NEW_BRANCH="y"
eval git checkout -b \"$BRANCH\" \"origin/$BRANCH\" $OPT_VERBOSE_LOG
else
eval git checkout \"$BRANCH\" $OPT_VERBOSE_LOG
fi
# Make sure the local branch is a tracking branch
if [[ -z `git config branch."$BRANCH".remote` ]]; then
- NEW_BRANCH="y"
git branch -u "origin/$BRANCH" &>/dev/null #$
git reset --hard "origin/$BRANCH" &>/dev/null
fi
@@ -115,11 +111,7 @@ function _do_update()
RESULT="FAIL"
fi
else
- if [[ "$NEW_BRANCH" = "y" ]]; then
- RESULT="UPDATE"
- else
- RESULT="OK"
- fi
+ RESULT="OK"
fi
else
RESULT="FAIL"
@@ -156,7 +148,6 @@ function _do_update()
# $1 - module folder
# $2 - operation type
# $3 - branch to update
-# $4 - new branch flag (only for reporting)
function _update_module()
{
local MOD_PATH=$1
@@ -166,22 +157,18 @@ function _update_module()
# Current module
_do_update "$@"
# Submodules
- local NEW_BRANCH="n"
local SUBMOD_LIST="$MOD_PATH/.gitmodules"
if [[ -e "$SUBMOD_LIST" ]]; then
sed -n "s|^\[submodule \"\([^\"]*\)\"\]$|\1|p" <$SUBMOD_LIST |\
while read -r SUBMOD_PATH; do
- NEW_BRANCH="n"
cd "$MOD_PATH" &>/dev/null
if [[ -z "`git config --get submodule.$SUBMOD_PATH.url`" ]]; then
- NEW_BRANCH="y" # if a submodule is missing, need to report "update" status
eval git submodule init -- \"$SUBMOD_PATH\" $OPT_VERBOSE_LOG
fi
if [[ ! -e "$MOD_PATH/$SUBMOD_PATH/.git" ]]; then
- NEW_BRANCH="y" # if a submodule is incomplete, need to report "update" status
eval git submodule update -- \"$SUBMOD_PATH\" $OPT_VERBOSE_LOG
fi
- _update_module "$MOD_PATH/$SUBMOD_PATH" "$OP_TYPE" "$BRANCH" "$NEW_BRANCH"
+ _update_module "$MOD_PATH/$SUBMOD_PATH" "$OP_TYPE" "$BRANCH"
done
fi
}
@@ -238,10 +225,10 @@ if [[ "$flag_SWITCH_ONLY" != "y" ]]; then
echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
# Update TDE main repository
- _update_module "$REPO_TDE" "update" "$branch" "n"
+ _update_module "$REPO_TDE" "update" "$branch"
# Update TDE packaging repository
- _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "update" "$branch" "n"
+ _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "update" "$branch"
echo -e "\033[2K"
echo "" >> "$LOG_UPDATE_REPO_FILENAME"
@@ -255,10 +242,10 @@ if [[ "$DEFAULT_REPO_BRANCH" != "$_LAST_BRANCH" ]]; then
echo_and_tee "${CLightCyan}---------------------------------------${CNone}" "$LOG_UPDATE_REPO_FILENAME"
# Switch TDE main repository
- _update_module "$REPO_TDE" "switch-to" "$DEFAULT_REPO_BRANCH" "n"
+ _update_module "$REPO_TDE" "switch-to" "$DEFAULT_REPO_BRANCH"
# Switch TDE packaging repository
- _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "switch-to" "$DEFAULT_REPO_BRANCH" "n"
+ _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "switch-to" "$DEFAULT_REPO_BRANCH"
echo -e "\033[2K"
echo "" >> "$LOG_UPDATE_REPO_FILENAME"