summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-04-27 18:37:21 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-04-27 18:37:21 +0900
commit932b8df2bd686af558692b8b61aee1243d7bad50 (patch)
treeb553a62015e651daf5f9c5ee66c63d05e9d6e369
parent3998e3cd8681091727ec71ddf74a43fcbf25582e (diff)
downloadtde-packaging-932b8df2bd686af558692b8b61aee1243d7bad50.zip
tde-packaging-932b8df2bd686af558692b8b61aee1243d7bad50.tar.gz
DEB build scripts:
1. drop unsupported distros 2. minor improvements Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--debian/_buildscripts/local/additional_files/etc/pbuilderrc35
-rwxr-xr-xdebian/_buildscripts/local/build_module.sh15
-rw-r--r--debian/_buildscripts/local/internals/distro_list.txt12
-rwxr-xr-xdebian/_buildscripts/local/update_repositories.sh4
4 files changed, 21 insertions, 45 deletions
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index 00ed2cd..b216320 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -52,7 +52,7 @@ case "$DISTRIBUTION" in
fi
;;
- sid|buster|stretch|wheezy|squeeze)
+ sid|buster|stretch|wheezy)
COMPONENTS="main contrib non-free"
;;
@@ -62,12 +62,12 @@ case "$DISTRIBUTION" in
EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
;;
- bionic|artful|zesty|yakkety|xenial|wily|vivid|utopic|trusty|saucy|raring|quantal|precise|oneiric|natty|maverick)
+ cosmic|bionic|artful|xenial|trusty|precise)
COMPONENTS="main restricted universe multiverse"
DEBOOTSTRAPOPTS=(--variant=buildd)
;;
- raspbian-jessie|raspbian-wheezy)
+ raspbian-stretch|raspbian-jessie|raspbian-wheezy)
COMPONENTS="main contrib non-free"
DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
;;
@@ -88,36 +88,19 @@ case "$DISTRIBUTION" in
MIRRORSITE=http://deb.debian.org/debian
;;
- squeeze)
- MIRRORSITE=http://archive.debian.org/debian
- ;;
-
ceres|beowulf|ascii)
MIRRORSITE=http://auto.mirror.devuan.org/merged
;;
- bionic|artful|zesty|yakkety|wily|vivid|trusty|precise)
- if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
- MIRRORSITE=http://archive.ubuntu.com/ubuntu
- else
- MIRRORSITE=http://ports.ubuntu.com
- fi
- ;;
-
- xenial)
+ cosmic|bionic|artful|xenial|trusty|precise)
if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
MIRRORSITE=http://archive.ubuntu.com/ubuntu
else
MIRRORSITE=http://ports.ubuntu.com
fi
- OTHERMIRROR="deb $MIRRORSITE $DISTRIBUTION-updates $COMPONENTS"
- ;;
-
- utopic|saucy|raring|quantal|oneiric|natty|maverick)
- MIRRORSITE=http://old-releases.ubuntu.com/ubuntu
;;
- raspbian-jessie|raspbian-wheezy)
+ raspbian-stretch|raspbian-jessie|raspbian-wheezy)
MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian
;;
esac
@@ -159,12 +142,14 @@ fi
case "$DISTRIBUTION" in
sid|buster|stretch|\
ceres|beowulf|ascii|\
- bionic|artful|zesty)
+ raspbian-stretch|\
+ cosmic|bionic|artful)
PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
;;
- jessie|wheezy|squeeze|raspbian-jessie|raspbian-wheezy|\
- yakkety|xenial|wily|vivid|utopic|trusty|saucy|raring|quantal|precise|oneiric|natty|maverick)
+ jessie|wheezy|\
+ raspbian-jessie|raspbian-wheezy|\
+ xenial|trusty|precise)
PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-aptitude"
;;
esac
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index 50c9c3a..969a67a 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -343,12 +343,6 @@ fi
grep -q "^include.*/usr/share/cdbs/1/rules/patchsys-quilt\.mk" "$MOD_BUILD_PKGING_PATH/rules" && \
sed -i "s/^\(include.*\/usr\/share\/cdbs\/1\/rules\/patchsys-quilt\.mk\)/#\1/" "$MOD_BUILD_PKGING_PATH/rules"
-if [ "$bool_PREPARE_ONLY" = "y" ]; then
- echo -e "${CBrown}Source code prepared for building${CNone}"
- do_exit 0
-fi
-
-
#----------------------------
# Enable debug mode if required
#----------------------------
@@ -359,6 +353,15 @@ fi
#----------------------------
+# Exit if only preparation was required
+#----------------------------
+if [ "$bool_PREPARE_ONLY" = "y" ]; then
+ echo -e "${CBrown}Source code prepared for building${CNone}"
+ do_exit 0
+fi
+
+
+#----------------------------
# Build
#----------------------------
export BUILDING_LOG_FILE="$MOD_DEBSRC_PATH/__build__.log"
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index a9a4a97..71d1c60 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -11,7 +11,6 @@
#
DISTROS="
# -- debian --
- debian 6.0 squeeze '' ''
debian 7.0 wheezy '' ''
debian 8.0 jessie '' ''
debian 9.0 stretch '' ''
@@ -27,20 +26,9 @@ DISTROS="
raspbian 8.0 raspbian-jessie '' ''
raspbian 9.0 raspbian-stretch '' ''
# -- ubuntu --
- ubuntu 10.10 maverick '' ''
- ubuntu 11.04 natty '' ''
- ubuntu 11.10 oneiric '' ''
ubuntu 12.04 precise '' ''
- ubuntu 12.10 quantal '' ''
- ubuntu 13.04 raring '' ''
- ubuntu 13.10 saucy '' ''
ubuntu 14.04 trusty '' ''
- ubuntu 14.10 utopic '' ''
- ubuntu 15.04 vivid '' ''
- ubuntu 15.10 wily '' ''
ubuntu 16.04 xenial '' ''
- ubuntu 16.10 yakkety '' ''
- ubuntu 17.04 zesty '' ''
ubuntu 17.10 artful '' ''
ubuntu 18.04 bionic '' ''
ubuntu 18.10 cosmic '' ''
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh
index 5f0b575..91425f8 100755
--- a/debian/_buildscripts/local/update_repositories.sh
+++ b/debian/_buildscripts/local/update_repositories.sh
@@ -68,7 +68,7 @@ function _do_update()
"fetch")
if [[ -z `grep "^$BRANCH - $MOD_PATH$" "$UPDATE_LOCK_FILENAME"` ]]; then
cd "$MOD_PATH" &>/dev/null
- eval git fetch --all --prune $OPT_VERBOSE_LOG
+ eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
if [ $? -eq 0 ]; then
RESULT="OK"
else
@@ -104,7 +104,7 @@ function _do_update()
eval git reset --hard HEAD $OPT_VERBOSE_LOG
eval git clean -dxff $OPT_VERBOSE_LOG
if [[ $(git rev-parse HEAD) != $(git rev-parse "origin/$BRANCH") ]]; then
- eval git pull --rebase $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
+ eval git rebase $OPT_VERBOSE_LOG
if [[ `git rev-parse HEAD` == `git rev-parse "origin/$BRANCH"` ]]; then
RESULT="UPDATE"
else