diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-12-24 13:34:19 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-12-24 13:34:19 +0900 |
| commit | 21add6f4932d847e979909e413c6d7d03d71b402 (patch) | |
| tree | 06298d99d107a5ea8f453d423bbce96a189c94c6 | |
| parent | ee07bdff05f47e1d1fa81ac84ccd9e9c1521ff7c (diff) | |
| download | tde-packaging-21add6f4932d847e979909e413c6d7d03d71b402.tar.gz tde-packaging-21add6f4932d847e979909e413c6d7d03d71b402.zip | |
DEB build scripts:
1) added uncrustify-trinity.
2) make sure to exclude only specific .git files, not all .git* ones.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rwxr-xr-x | debian/_buildscripts/local/00_extradeps.sh | 1 | ||||
| -rwxr-xr-x | debian/_buildscripts/local/build_module.sh | 2 | ||||
| -rwxr-xr-x | debian/_buildscripts/local/update_repositories.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh index a1b35d8e7..804afe4ea 100755 --- a/debian/_buildscripts/local/00_extradeps.sh +++ b/debian/_buildscripts/local/00_extradeps.sh @@ -9,6 +9,7 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then echo -e "${CBrown}#### Use of pre-built extra dependency packages is currently configured. Nothing to do. ####\n${CNone}" echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME" else + build_module "$CFG_EXTRA_DEPS_DIR/uncrustify-trinity" build_module "$CFG_EXTRA_DEPS_DIR/fireflies" build_module "$CFG_EXTRA_DEPS_DIR/imlib" # build_module "$CFG_EXTRA_DEPS_DIR/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0 diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh index 6799e2fa7..30d0facd6 100755 --- a/debian/_buildscripts/local/build_module.sh +++ b/debian/_buildscripts/local/build_module.sh @@ -377,7 +377,7 @@ MOD_UP_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(([ MOD_DEB_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(.*+-([^\)]+).*/\1/"` REPO_DATE=`dpkg-parsechangelog -l "$MOD_BUILD_PKGING_PATH/changelog" | sed -n -e 's|^Date: ||p'` -tar cJf "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz" --exclude="debian" --exclude=".git*" \ +tar cJf "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz" --exclude="debian" --exclude .git --exclude .gitmodules \ --mtime "$REPO_DATE" --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime . touch -d "$REPO_DATE" "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz" diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh index fb0c5aeca..7c415cc4c 100755 --- a/debian/_buildscripts/local/update_repositories.sh +++ b/debian/_buildscripts/local/update_repositories.sh @@ -31,7 +31,7 @@ for ((idx=1; idx<=$#; idx++)); do else ((idx--)) fi - fi + fi done # Load common code |