TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB build scripts: fixed up spacing/tabs in commit 1ccf2a151.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/94/head
Michele Calgaro 3 years ago
parent 1ccf2a151e
commit b6a6bac01b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File

66
debian/_buildscripts/local/build_module.sh vendored
Unescape View File

@ -131,42 +131,42 @@ bool_PREPARE_ONLY="n"
bool_DEBUG_MODE="n" bool_DEBUG_MODE="n"
bool_INVALID_PARAMETERS="n" bool_INVALID_PARAMETERS="n"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
-d) # build with Debug symbols (used in hook scripts) -d) # build with Debug symbols (used in hook scripts)
bool_DEBUG_MODE="y" bool_DEBUG_MODE="y"
;; ;;
-g) # select code to build from Git repo (-g) or from local build copy -g) # select code to build from Git repo (-g) or from local build copy
bool_BUILD_FROM_GIT="y" bool_BUILD_FROM_GIT="y"
;; ;;
-l) # build module Locally instead of in a clean chroot environment -l) # build module Locally instead of in a clean chroot environment
bool_BUILD_LOCALLY="y" bool_BUILD_LOCALLY="y"
;; ;;
-lr) # Log build Result to file -lr) # Log build Result to file
bool_LOG_RESULT="y" bool_LOG_RESULT="y"
;; ;;
-po) # Prepare build folder Only but do not build -po) # Prepare build folder Only but do not build
bool_PREPARE_ONLY="y" bool_PREPARE_ONLY="y"
;; ;;
-sh) # install Shell Hook for failing builds (only valid if NOT building locally) -sh) # install Shell Hook for failing builds (only valid if NOT building locally)
bool_SHELL_HOOK="y" bool_SHELL_HOOK="y"
;; ;;
-sl) # output the building logs to terminal (ShowLog) -sl) # output the building logs to terminal (ShowLog)
bool_SHOW_BUILD_LOGS="y" bool_SHOW_BUILD_LOGS="y"
;; ;;
*) # module to be built *) # module to be built
if [ -z "$MOD_NAME" ]; then if [ -z "$MOD_NAME" ]; then
MOD_NAME="$1" MOD_NAME="$1"
else else
bool_INVALID_PARAMETERS="y" bool_INVALID_PARAMETERS="y"
fi fi
esac esac
shift shift
done done
if [ "$bool_INVALID_PARAMETERS" != "n" ]; then if [ "$bool_INVALID_PARAMETERS" != "n" ]; then
echo "Invalid arguments." echo "Invalid arguments."
MOD_NAME="N/A" MOD_NAME="N/A"
do_exit 1 do_exit 1
fi fi
echo -e "${CLightCyan}#### Processing module \"$MOD_NAME\" ####${CNone}" echo -e "${CLightCyan}#### Processing module \"$MOD_NAME\" ####${CNone}"

164
debian/_buildscripts/local/internals/_pbuilder.sh vendored
Unescape View File

@ -2,100 +2,100 @@
function run_pdebuild() function run_pdebuild()
{ {
# pbuilder absolute paths # pbuilder absolute paths
PBUILDER_HOOK_DIR="/var/cache/pbuilder/hooks" PBUILDER_HOOK_DIR="/var/cache/pbuilder/hooks"
PBUILDER_SHELL_HOOK_TEMPLATE="$SCRIPT_DIR/internals/C10shell" PBUILDER_SHELL_HOOK_TEMPLATE="$SCRIPT_DIR/internals/C10shell"
PBUILDER_SHELL_HOOK="$PBUILDER_HOOK_DIR/C10shell" PBUILDER_SHELL_HOOK="$PBUILDER_HOOK_DIR/C10shell"
PBUILDER_DEPS_HOOK="$PBUILDER_HOOK_DIR/D05deps" PBUILDER_DEPS_HOOK="$PBUILDER_HOOK_DIR/D05deps"
# Sign packages optino # Sign packages optino
OPT_SIGN_PKG_PBUILDER="" OPT_SIGN_PKG_PBUILDER=""
if [ ! -z "$GPG_SIGN_KEYID" ]; then if [ ! -z "$GPG_SIGN_KEYID" ]; then
OPT_SIGN_PKG_LOCAL="-k$GPG_SIGN_KEYID" OPT_SIGN_PKG_LOCAL="-k$GPG_SIGN_KEYID"
OPT_SIGN_PKG_PBUILDER="--auto-debsign --debsign-k $GPG_SIGN_KEYID" OPT_SIGN_PKG_PBUILDER="--auto-debsign --debsign-k $GPG_SIGN_KEYID"
fi fi
## Build module in a clean chroot environment using pbuilder ## Build module in a clean chroot environment using pbuilder
# Install/remove shell hook # Install/remove shell hook
if [ ! -d "$PBUILDER_HOOK_DIR" ]; then if [ ! -d "$PBUILDER_HOOK_DIR" ]; then
mkdir -p "$PBUILDER_HOOK_DIR" mkdir -p "$PBUILDER_HOOK_DIR"
fi fi
if [ "$bool_SHELL_HOOK" = "y" ]; then if [ "$bool_SHELL_HOOK" = "y" ]; then
cp "$PBUILDER_SHELL_HOOK_TEMPLATE" "$PBUILDER_SHELL_HOOK" cp "$PBUILDER_SHELL_HOOK_TEMPLATE" "$PBUILDER_SHELL_HOOK"
chmod a+x "$PBUILDER_SHELL_HOOK" chmod a+x "$PBUILDER_SHELL_HOOK"
else else
if [ -x "$PBUILDER_SHELL_HOOK" ]; then if [ -x "$PBUILDER_SHELL_HOOK" ]; then
rm "$PBUILDER_SHELL_HOOK" rm "$PBUILDER_SHELL_HOOK"
fi fi
fi fi
# Build using pbuilder # Build using pbuilder
echo -e "${CYellow}> Building using pbuilder${CNone}" echo -e "${CYellow}> Building using pbuilder${CNone}"
# Create pbuilder hook to make sure all available packages are scanned # Create pbuilder hook to make sure all available packages are scanned
# Store any existing D05 hook as a temporary file, this will be reinstated at the end # Store any existing D05 hook as a temporary file, this will be reinstated at the end
cat <<END_D05_01 > "$PBUILDER_DEPS_HOOK" cat <<END_D05_01 > "$PBUILDER_DEPS_HOOK"
#!/bin/sh #!/bin/sh
(cd "$TDE_DEBS_DIR"; apt-ftparchive packages . > Packages) (cd "$TDE_DEBS_DIR"; apt-ftparchive packages . > Packages)
echo "deb [trusted=yes] file:$TDE_DEBS_DIR ./" >> /etc/apt/sources.list echo "deb [trusted=yes] file:$TDE_DEBS_DIR ./" >> /etc/apt/sources.list
END_D05_01 END_D05_01
if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
# Get building branch from .tdescminfo file # Get building branch from .tdescminfo file
if [[ -f "$MOD_BUILD_PATH/.tdescminfo" ]]; then if [[ -f "$MOD_BUILD_PATH/.tdescminfo" ]]; then
BUILD_BRANCH=`sed -n -r "s/^Revision: ([^-]+)-.*/\1/p" "$MOD_BUILD_PATH/.tdescminfo"` BUILD_BRANCH=`sed -n -r "s/^Revision: ([^-]+)-.*/\1/p" "$MOD_BUILD_PATH/.tdescminfo"`
bool_EDEPS_FOUND="n" bool_EDEPS_FOUND="n"
OLD_IFS=$IFS && IFS=$' \t' OLD_IFS=$IFS && IFS=$' \t'
while read l_branch l_repo l_component; do while read l_branch l_repo l_component; do
if [ "$l_branch" = "$BUILD_BRANCH" ]; then if [ "$l_branch" = "$BUILD_BRANCH" ]; then
bool_EDEPS_FOUND="y" bool_EDEPS_FOUND="y"
cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK" cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK"
echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list
END_D05_02 END_D05_02
break break
fi fi
done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$")
if [ "$bool_EDEPS_FOUND" != "y" ]; then 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 # 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 while read l_branch l_repo l_component; do
if [ "$l_branch" = "default" ]; then if [ "$l_branch" = "default" ]; then
bool_EDEPS_FOUND="y" bool_EDEPS_FOUND="y"
cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK" cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK"
echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list
END_D05_02 END_D05_02
break break
fi fi
done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$")
fi fi
IFS=$OLD_IFS IFS=$OLD_IFS
fi fi
fi fi
cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK" cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK"
apt-get update apt-get update
END_D05_03 END_D05_03
chmod a+x "$PBUILDER_DEPS_HOOK" chmod a+x "$PBUILDER_DEPS_HOOK"
# Build # Build
OPT_BUILD_PARALLEL="" OPT_BUILD_PARALLEL=""
if [ ${DEB_BUILD_PARALLEL+x} ]; then if [ ${DEB_BUILD_PARALLEL+x} ]; then
OPT_BUILD_PARALLEL="DEB_BUILD_PARALLEL=$DEB_BUILD_PARALLEL" OPT_BUILD_PARALLEL="DEB_BUILD_PARALLEL=$DEB_BUILD_PARALLEL"
fi fi
eval pdebuild $OPT_SIGN_PKG_PBUILDER \ eval pdebuild $OPT_SIGN_PKG_PBUILDER \
--architecture $ARCHITECTURE \ --architecture $ARCHITECTURE \
--buildresult \"$MOD_DEB_PATH\" \ --buildresult \"$MOD_DEB_PATH\" \
--pbuilderroot \"sudo $OPT_BUILD_PARALLEL DISTRO_NAME=$DISTRO_NAME ARCHITECTURE=$ARCHITECTURE\" \ --pbuilderroot \"sudo $OPT_BUILD_PARALLEL DISTRO_NAME=$DISTRO_NAME ARCHITECTURE=$ARCHITECTURE\" \
--logfile \"$BUILDING_LOG_FILE\" \ --logfile \"$BUILDING_LOG_FILE\" \
-- \ -- \
--bindmounts \"$TDE_DEBS_DIR\" \ --bindmounts \"$TDE_DEBS_DIR\" \
--hookdir \"$PBUILDER_HOOK_DIR\" \ --hookdir \"$PBUILDER_HOOK_DIR\" \
$OPT_SHOW_LOGS\"$BUILDING_LOG_FILE\" $OPT_SHOW_LOGS\"$BUILDING_LOG_FILE\"
PBUILDER_RETVAL=$? PBUILDER_RETVAL=$?
# Remove shell hook if it was installed before the build # Remove shell hook if it was installed before the build
if [ -x "$PBUILDER_SHELL_HOOK" ]; then if [ -x "$PBUILDER_SHELL_HOOK" ]; then
rm "$PBUILDER_SHELL_HOOK" rm "$PBUILDER_SHELL_HOOK"
fi fi
# Remove deps hook # Remove deps hook
if [ -x "$PBUILDER_DEPS_HOOK" ]; then if [ -x "$PBUILDER_DEPS_HOOK" ]; then
rm "$PBUILDER_DEPS_HOOK" rm "$PBUILDER_DEPS_HOOK"
fi fi
# Return pdebuild return value to calling function # Return pdebuild return value to calling function
return $PBUILDER_RETVAL return $PBUILDER_RETVAL
} }

Write Preview
Loading…
Cancel
Save