diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-04-02 17:06:19 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-04-02 17:06:19 +0900 |
| commit | e38296a3737847d1dea30dab9c40b27b2d2cf61f (patch) | |
| tree | 12d51e46cc1271f3dec408d05e08966b9b096949 /debian/_buildscripts/local/internals | |
| parent | bdb138cf15ba2fe6a3a2016cc17dce985b32ab5c (diff) | |
| download | tde-packaging-e38296a3737847d1dea30dab9c40b27b2d2cf61f.tar.gz tde-packaging-e38296a3737847d1dea30dab9c40b27b2d2cf61f.zip | |
DEB build scripts: adapted to latest repository structure (packaging
folder is now part of main TDE repository)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian/_buildscripts/local/internals')
| -rwxr-xr-x | debian/_buildscripts/local/internals/_build_common.sh | 18 | ||||
| -rw-r--r-- | debian/_buildscripts/local/internals/distro_list.txt | 6 |
2 files changed, 7 insertions, 17 deletions
diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh index 28f3fb2bf..76c27e142 100755 --- a/debian/_buildscripts/local/internals/_build_common.sh +++ b/debian/_buildscripts/local/internals/_build_common.sh @@ -63,7 +63,7 @@ function _set_path_variables() REPO_DIR="$TDE_DIR/$CFG_GIT_DIR" REPO_TDE="$TDE_DIR/$CFG_GIT_DIR/tde" REPO_TDE_MAIN="$REPO_TDE/main" - REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$DISTRO/$DISTRO_NAME" + REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde/packaging/$DISTRO/$DISTRO_NAME" REPO_EXTRA_DEPENDENCIES="$TDE_DIR/$CFG_GIT_DIR/$CFG_EXTRA_DEPS_DIR" BUILD_DIR="$TDE_DIR/$CFG_BUILD_DIR" @@ -86,7 +86,7 @@ function init_common() # Prevent the script to be run from TDE packaging repo REPO_URL=$(git config --get remote.origin.url 2>/dev/null) - if [ ! -z "$REPO_URL" ] && [ -z "${REPO_URL##*tde-packaging}" ]; then + if [ ! -z "$REPO_URL" ] && [ -z "${REPO_URL##*tde/packaging}" ]; then echo -e "${CLightRed} --- ERROR ---${CNone}" echo "This script cannot be run from the TDE packaging repository." echo "Please follow the instructions provided, then rerun this script." @@ -126,7 +126,7 @@ function init_common() export DISTRO_VERSION="$l_version" export REL_SUFFIX="$l_rel_suffix" if [[ ! -z "$l_packaging_path" ]]; then - REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$l_packaging_path" + REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde/packaging/$l_packaging_path" fi break fi @@ -162,18 +162,6 @@ function init_common() exit 6 fi - # Search for TDE packaging repo - CURR_DIR="" - [ -d "$REPO_TDE_PACKAGING" ] && cd "$REPO_TDE_PACKAGING" &>/dev/null && \ - CURR_DIR=$(git rev-parse --show-toplevel 2>/dev/null) - if [ -z "$CURR_DIR" ]; then - echo -e "${CLightRed} --- ERROR ---${CNone}" - echo "The TDE packaging repo could not be located. Something is wrong with your configuration" - echo -e "in the config file ${CLightPurple}$CFG_FILE${CNone}" - echo -e "Please check and modify the ${CLightCyan}TDE_DIR${CNone} variable as required, then rerun this script." - exit 7 - fi - # Check branch configuration # - branch existance UPDATE_BRANCHES="${OVERRIDE_UPDATE_BRANCHES:-$UPDATE_BRANCHES}" diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt index 3d6eb05ef..a9a4a9785 100644 --- a/debian/_buildscripts/local/internals/distro_list.txt +++ b/debian/_buildscripts/local/internals/distro_list.txt @@ -7,7 +7,7 @@ # distro version number # distro version name # package suffix if required -# tde-packaging corresponding path if required +# tde/packaging corresponding path if required # DISTROS=" # -- debian -- @@ -42,5 +42,7 @@ DISTROS=" ubuntu 16.10 yakkety '' '' ubuntu 17.04 zesty '' '' ubuntu 17.10 artful '' '' - ubuntu 18.04 bionic ~a '' + ubuntu 18.04 bionic '' '' + ubuntu 18.10 cosmic '' '' + ubuntu 19.04 disco ~a '' " |