summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-11-23 22:50:17 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-11-23 22:50:17 +0900
commita9cef411ca143413d48fee956364097a05f67a71 (patch)
treed391fabb1878ccfdb1557186a14ea5c42738a0f2 /debian
parent78f69187ea9a11644b16f87a4cee1a11415244b9 (diff)
downloadtde-packaging-a9cef411ca143413d48fee956364097a05f67a71.tar.gz
tde-packaging-a9cef411ca143413d48fee956364097a05f67a71.zip
DEB build scripts: fixed code for cross-building. Remove extra
dependency on gettext-kde Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh1
-rw-r--r--debian/_buildscripts/local/README.txt2
-rwxr-xr-xdebian/_buildscripts/local/internals/_pbuilder.sh2
3 files changed, 2 insertions, 3 deletions
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 763b5091c..c3a7cc1de 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -9,7 +9,6 @@ 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 "edeps/gettext-kde"
build_module "edeps/fireflies"
build_module "edeps/imlib"
# build_module "edeps/opensync" # deprecated - no longer required in R14.1 series. To remove in R14.2.0
diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt
index 4d0595031..650d515bd 100644
--- a/debian/_buildscripts/local/README.txt
+++ b/debian/_buildscripts/local/README.txt
@@ -58,7 +58,7 @@ A) Environment preparation
7) Create pbuilder base package with the command:
sudo pbuilder create
If you wish to build for a different distro or architecture, use the command:
- sudo DISTRIBUTION=<target distro> ARCHITECTURE=<target architecture> pbuilder create
+ sudo DISTRO_NAME=<target distro> ARCHITECTURE=<target architecture> pbuilder create
8) Setup the build scripts locally:
- copy build scripts from "TDE_DIR/1_git/tde-packaging/debian/_buildscripts/local" to "TDE_DIR/buildscripts"
diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh
index d2b176ded..9c36ac219 100755
--- a/debian/_buildscripts/local/internals/_pbuilder.sh
+++ b/debian/_buildscripts/local/internals/_pbuilder.sh
@@ -67,7 +67,7 @@ END_D05_03
eval pdebuild $OPT_INTERNAL_PBUILDER $OPT_SIGN_PKG_PBUILDER \
--architecture $ARCHITECTURE \
--buildresult \"$MOD_DEB_PATH\" \
- --pbuilderroot \"sudo DIST=$DISTRO_NAME ARCH=$ARCHITECTURE\" \
+ --pbuilderroot \"sudo DISTRO_NAME=$DISTRO_NAME ARCHITECTURE=$ARCHITECTURE\" \
--logfile \"$BUILDING_LOG_FILE\" \
-- \
--bindmounts \"$TDE_DEBS_DIR\" \