diff options
Diffstat (limited to 'debian/_buildscripts')
39 files changed, 472 insertions, 389 deletions
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh index 5e4aadc29..82edb1404 100755 --- a/debian/_buildscripts/local/00_extradeps.sh +++ b/debian/_buildscripts/local/00_extradeps.sh @@ -10,16 +10,16 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then 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/htdig" 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 - build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus" - build_module "$CFG_EXTRA_DEPS_DIR/lcms" - build_module "$CFG_EXTRA_DEPS_DIR/wv2" build_module "$CFG_EXTRA_DEPS_DIR/jasper" - build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg" + build_module "$CFG_EXTRA_DEPS_DIR/lcms" build_module "$CFG_EXTRA_DEPS_DIR/mp4v2" + build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg" build_module "$CFG_EXTRA_DEPS_DIR/transcode" + build_module "$CFG_EXTRA_DEPS_DIR/wv2" fi set_log_end diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh index d3aa01808..46b04d832 100755 --- a/debian/_buildscripts/local/01_base_01.sh +++ b/debian/_buildscripts/local/01_base_01.sh @@ -5,19 +5,23 @@ #---------------------------- set_log_start -build_module "common/cmake" +build_module "dependencies/tde-cmake" build_module "dependencies/libr" build_module "dependencies/akode" +build_module "dependencies/libart-lgpl" +build_module "dependencies/libcaldav" +build_module "dependencies/libcarddav" build_module "dependencies/tqt3" build_module "dependencies/tqtinterface" build_module "dependencies/arts" build_module "dependencies/dbus-tqt" build_module "dependencies/dbus-1-tqt" build_module "dependencies/tqca" -build_module "dependencies/libart-lgpl" build_module "dependencies/avahi-tqt" -build_module "dependencies/libcaldav" -build_module "dependencies/libcarddav" +build_module "dependencies/polkit-tqt" +if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then + build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus" +fi build_module "core/tdelibs" build_module "libraries/libtdeldap" build_module "core/tdebase" diff --git a/debian/_buildscripts/local/02_base_02.sh b/debian/_buildscripts/local/02_base_02.sh index 61c500d36..abe995014 100755 --- a/debian/_buildscripts/local/02_base_02.sh +++ b/debian/_buildscripts/local/02_base_02.sh @@ -7,8 +7,8 @@ set_log_start build_module "dependencies/sip4-tqt" build_module "dependencies/tqscintilla" -build_module "dependencies/python-tqt" -build_module "libraries/python-trinity" +build_module "dependencies/pytqt" +build_module "libraries/pytde" build_module "libraries/pytdeextensions" build_module "core/tdebindings" build_module "libraries/libtqt-perl" diff --git a/debian/_buildscripts/local/04_applications_01.sh b/debian/_buildscripts/local/04_applications_01.sh deleted file mode 100755 index b9e97d1e0..000000000 --- a/debian/_buildscripts/local/04_applications_01.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "libraries/libkipi" -build_module "libraries/libkdcraw" -build_module "libraries/libkexiv2" -build_module "libraries/kipi-plugins" -build_module "applications/abakus" -build_module "applications/amarok" -build_module "applications/basket" -build_module "applications/codeine" -build_module "applications/digikam" -build_module "applications/dolphin" -build_module "applications/filelight" -build_module "applications/gtk3-tqt-engine" -build_module "applications/gtk-qt-engine" -build_module "applications/gwenview" -build_module "applications/gwenview-i18n" - -set_log_end diff --git a/debian/_buildscripts/local/04_base_04.sh b/debian/_buildscripts/local/04_base_04.sh new file mode 100755 index 000000000..5dddf0aa8 --- /dev/null +++ b/debian/_buildscripts/local/04_base_04.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "core/tde-i18n" + +set_log_end diff --git a/debian/_buildscripts/local/05_applications_02.sh b/debian/_buildscripts/local/05_applications_02.sh deleted file mode 100755 index ae18cba5c..000000000 --- a/debian/_buildscripts/local/05_applications_02.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "applications/k3b" -build_module "applications/k3b-i18n" -build_module "applications/k9copy" -build_module "applications/kaffeine" -build_module "applications/kaffeine-mozilla" -build_module "applications/kasablanca" -build_module "applications/katapult" -build_module "applications/kbarcode" -build_module "applications/kbfx" -build_module "applications/kbibtex" -build_module "applications/kbiff" -build_module "applications/kbookreader" -build_module "applications/kchmviewer" -build_module "applications/kcmautostart" -# LDAP packages -build_module "applications/kcmldap" -build_module "applications/kcmldapcontroller" -build_module "applications/kcmldapmanager" -build_module "applications/kerberostray" - -set_log_end diff --git a/debian/_buildscripts/local/05_apps_system.sh b/debian/_buildscripts/local/05_apps_system.sh new file mode 100755 index 000000000..a7fdb1c33 --- /dev/null +++ b/debian/_buildscripts/local/05_apps_system.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/system/dolphin" +build_module "applications/system/katapult" +build_module "applications/system/kbfx" +build_module "applications/system/kcmautostart" +build_module "applications/system/kdbusnotification" +build_module "applications/system/klamav" +build_module "applications/system/knemo" +build_module "applications/system/knetload" +build_module "applications/system/knetstats" +build_module "applications/system/kooldock" +build_module "applications/system/krusader" +build_module "applications/system/kshutdown" +build_module "applications/system/ksystemlog" +build_module "applications/system/kvkbd" +build_module "applications/system/polkit-agent-tde" +build_module "applications/system/smartcardauth" +build_module "applications/system/tastymenu" +build_module "applications/system/tdedocker" +build_module "applications/system/tdepowersave" +build_module "applications/system/tdesshaskpass" +build_module "applications/system/yakuake" + +set_log_end diff --git a/debian/_buildscripts/local/06_applications_03.sh b/debian/_buildscripts/local/06_applications_03.sh deleted file mode 100755 index ad02c37d6..000000000 --- a/debian/_buildscripts/local/06_applications_03.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "applications/kcpuload" -build_module "applications/kdbg" -build_module "applications/kdbusnotification" -build_module "applications/kdiff3" -build_module "applications/kdirstat" -build_module "applications/keep" -build_module "applications/kftpgrabber" -build_module "applications/kile" -build_module "applications/kima" -build_module "applications/kkbswitch" -build_module "applications/klamav" -build_module "applications/klcddimmer" -build_module "applications/kmyfirewall" -build_module "applications/kmymoney" -build_module "applications/knemo" -build_module "applications/knetload" -build_module "applications/knetstats" -build_module "applications/knmap" -build_module "applications/knowit" -build_module "applications/knutclient" - -set_log_end diff --git a/debian/_buildscripts/local/06_apps_utilities.sh b/debian/_buildscripts/local/06_apps_utilities.sh new file mode 100755 index 000000000..c90ff66cc --- /dev/null +++ b/debian/_buildscripts/local/06_apps_utilities.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/utilities/abakus" +build_module "applications/utilities/filelight" +build_module "applications/utilities/kbarcode" +build_module "applications/utilities/kchmviewer" +build_module "applications/utilities/kcpuload" +build_module "applications/utilities/kdirstat" +build_module "applications/utilities/keep" +build_module "applications/utilities/knutclient" +build_module "applications/utilities/kompose" +build_module "applications/utilities/krename" +build_module "applications/utilities/ksensors" +build_module "applications/utilities/mathemagics" +build_module "applications/utilities/qalculate-tde" + +set_log_end diff --git a/debian/_buildscripts/local/07_applications_04.sh b/debian/_buildscripts/local/07_applications_04.sh deleted file mode 100755 index c10a94ea2..000000000 --- a/debian/_buildscripts/local/07_applications_04.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "applications/koffice" -build_module "applications/koffice-i18n" -build_module "applications/kmplayer" # depends on koffice-trinity-dev -build_module "applications/keximdb" -build_module "applications/kompose" -build_module "applications/konversation" -build_module "applications/kooldock" -build_module "applications/kopete-otr" -build_module "applications/kpicosim" -build_module "applications/kplayer" - -set_log_end - diff --git a/debian/_buildscripts/local/07_apps_settings.sh b/debian/_buildscripts/local/07_apps_settings.sh new file mode 100755 index 000000000..a637949b9 --- /dev/null +++ b/debian/_buildscripts/local/07_apps_settings.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/settings/kdpkg" +build_module "applications/settings/kima" +build_module "applications/settings/kiosktool" +build_module "applications/settings/kkbswitch" +build_module "applications/settings/klcddimmer" +build_module "applications/settings/kmyfirewall" +build_module "applications/settings/tde-guidance" +build_module "applications/settings/tde-systemsettings" +build_module "applications/settings/tdenetworkmanager" +build_module "applications/settings/tdesudo" +build_module "applications/settings/wlassistant" + +set_log_end diff --git a/debian/_buildscripts/local/08_applications_05.sh b/debian/_buildscripts/local/08_applications_05.sh deleted file mode 100755 index 3a783d828..000000000 --- a/debian/_buildscripts/local/08_applications_05.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "applications/krecipes" -build_module "applications/krename" -build_module "applications/krusader" -build_module "applications/kscope" -build_module "applications/ksensors" -build_module "applications/kshowmail" -build_module "applications/kshutdown" -build_module "applications/ksplash-engine-moodin" -build_module "applications/kstreamripper" -build_module "applications/ksystemlog" -build_module "applications/ktechlab" -build_module "applications/ktorrent" -build_module "applications/kvirc" -build_module "applications/kvkbd" -build_module "applications/kvpnc" -build_module "applications/kxmleditor" -build_module "applications/mplayerthumbs" -build_module "applications/qalculate-tde" -build_module "applications/piklab" -build_module "applications/potracegui" -build_module "applications/soundkonverter" -build_module "applications/tastymenu" -build_module "applications/tdedocker" - -set_log_end diff --git a/debian/_buildscripts/local/08_apps_graphics.sh b/debian/_buildscripts/local/08_apps_graphics.sh new file mode 100755 index 000000000..32c61d575 --- /dev/null +++ b/debian/_buildscripts/local/08_apps_graphics.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "libraries/libkipi" +build_module "libraries/libkdcraw" +build_module "libraries/libkexiv2" +build_module "libraries/kipi-plugins" +build_module "libraries/libksquirrel" + +build_module "applications/graphics/digikam" +build_module "applications/graphics/gwenview" +build_module "applications/graphics/gwenview-i18n" +build_module "applications/graphics/ksquirrel" +build_module "applications/graphics/potracegui" + +set_log_end diff --git a/debian/_buildscripts/local/09_applications_06.sh b/debian/_buildscripts/local/09_applications_06.sh deleted file mode 100755 index 46dc9239c..000000000 --- a/debian/_buildscripts/local/09_applications_06.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "applications/tdeio-apt" -build_module "applications/tdeio-ftps" -build_module "applications/tdeio-gopher" -build_module "applications/tdeio-locate" -build_module "applications/tdeio-umountwrapper" -build_module "applications/tdenetworkmanager" -build_module "applications/tdepacman" -build_module "applications/tdepowersave" -build_module "applications/tderadio" -build_module "applications/tde-guidance" -build_module "applications/tde-style-baghira" -build_module "applications/tde-style-domino" -build_module "applications/tde-style-ia-ora" -build_module "applications/tde-style-lipstik" -build_module "applications/tde-style-qtcurve" -build_module "applications/tde-systemsettings" -build_module "applications/tdmtheme" -build_module "applications/tork" -build_module "applications/twin-style-crystal" -build_module "applications/wlassistant" -build_module "applications/yakuake" - -set_log_end diff --git a/debian/_buildscripts/local/09_apps_development.sh b/debian/_buildscripts/local/09_apps_development.sh new file mode 100755 index 000000000..f5e41d1bf --- /dev/null +++ b/debian/_buildscripts/local/09_apps_development.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/development/kdbg" +build_module "applications/development/kdiff3" +build_module "applications/development/kpicosim" +build_module "applications/development/kscope" +build_module "applications/development/ktechlab" +build_module "applications/development/kxmleditor" +build_module "applications/development/piklab" +build_module "applications/development/tdesvn" + +set_log_end diff --git a/debian/_buildscripts/local/10_apps_games.sh b/debian/_buildscripts/local/10_apps_games.sh new file mode 100755 index 000000000..09290d0c0 --- /dev/null +++ b/debian/_buildscripts/local/10_apps_games.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/games/knights" +build_module "applications/games/tdepacman" + +set_log_end diff --git a/debian/_buildscripts/local/10_others_01.sh b/debian/_buildscripts/local/10_others_01.sh deleted file mode 100755 index 4be92268e..000000000 --- a/debian/_buildscripts/local/10_others_01.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. ./internals/_build_set_common.sh - -#---------------------------- -set_log_start - -build_module "applications/tdeio-sword" -build_module "applications/bibletime" -build_module "applications/desktop-effects-tde" -build_module "applications/fusion-icon" -build_module "applications/kdpkg" -build_module "applications/kgtk-qt3" -build_module "applications/tdesudo" -build_module "applications/kiosktool" -build_module "applications/knights" -build_module "libraries/libksquirrel" -build_module "applications/ksquirrel" -#build_module "applications/qt4-tqt-theme-engine" -build_module "applications/rosegarden" -build_module "applications/mathemagics" -build_module "applications/smartcardauth" -build_module "applications/smb4k" -build_module "applications/tdesvn" -build_module "applications/tellico" - -set_log_end diff --git a/debian/_buildscripts/local/11_apps_internet.sh b/debian/_buildscripts/local/11_apps_internet.sh new file mode 100755 index 000000000..79b6c681d --- /dev/null +++ b/debian/_buildscripts/local/11_apps_internet.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/internet/kasablanca" +build_module "applications/internet/kbiff" +build_module "applications/internet/kftpgrabber" +build_module "applications/internet/knmap" +build_module "applications/internet/konversation" +build_module "applications/internet/kopete-otr" +build_module "applications/internet/kshowmail" +build_module "applications/internet/kstreamripper" +build_module "applications/internet/ktorrent" +build_module "applications/internet/kvirc" +build_module "applications/internet/kvpnc" +build_module "applications/internet/smb4k" +build_module "applications/internet/tork" + +set_log_end diff --git a/debian/_buildscripts/local/12_apps_office.sh b/debian/_buildscripts/local/12_apps_office.sh new file mode 100755 index 000000000..c9baaecd1 --- /dev/null +++ b/debian/_buildscripts/local/12_apps_office.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/office/basket" +build_module "applications/office/kbibtex" +build_module "applications/office/kbookreader" +build_module "applications/office/kile" +build_module "applications/office/kmymoney" +build_module "applications/office/knowit" +build_module "applications/office/koffice" +build_module "applications/office/koffice-i18n" +build_module "applications/office/keximdb" +build_module "applications/office/tellico" + +if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then + build_module "$CFG_EXTRA_DEPS_DIR/pilot-link" +fi +build_module "applications/office/kpilot" + +set_log_end diff --git a/debian/_buildscripts/local/13_apps_multimedia.sh b/debian/_buildscripts/local/13_apps_multimedia.sh new file mode 100755 index 000000000..3c3dc30d4 --- /dev/null +++ b/debian/_buildscripts/local/13_apps_multimedia.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/multimedia/amarok" +build_module "applications/multimedia/codeine" +build_module "applications/multimedia/k3b" +build_module "applications/multimedia/k3b-i18n" +build_module "applications/multimedia/k9copy" +build_module "applications/multimedia/kaffeine" +build_module "applications/multimedia/kaffeine-mozilla" +build_module "applications/multimedia/kmplayer" # depends on koffice-trinity-dev +build_module "applications/multimedia/kplayer" +build_module "applications/multimedia/mplayerthumbs" +build_module "applications/multimedia/rosegarden" +build_module "applications/multimedia/soundkonverter" +build_module "applications/multimedia/tderadio" + +set_log_end diff --git a/debian/_buildscripts/local/14_apps_tdeio.sh b/debian/_buildscripts/local/14_apps_tdeio.sh new file mode 100755 index 000000000..d50b03a5c --- /dev/null +++ b/debian/_buildscripts/local/14_apps_tdeio.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/tdeio/tdeio-appinfo" +build_module "applications/tdeio/tdeio-apt" +build_module "applications/tdeio/tdeio-ftps" +build_module "applications/tdeio/tdeio-gopher" +build_module "applications/tdeio/tdeio-locate" +build_module "applications/tdeio/tdeio-sword" +build_module "applications/tdeio/tdeio-umountwrapper" + +set_log_end diff --git a/debian/_buildscripts/local/15_apps_themes.sh b/debian/_buildscripts/local/15_apps_themes.sh new file mode 100755 index 000000000..8bffc9ab8 --- /dev/null +++ b/debian/_buildscripts/local/15_apps_themes.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +. ./internals/_build_set_common.sh + +#---------------------------- +set_log_start + +build_module "applications/themes/gtk3-tqt-engine" +build_module "applications/themes/gtk-qt-engine" +build_module "applications/themes/kgtk-qt3" +build_module "applications/themes/ksplash-engine-moodin" +# build_module "applications/themes/qt4-tqt-theme-engine" +build_module "applications/themes/tde-style-baghira" +build_module "applications/themes/tde-style-domino" +build_module "applications/themes/tde-style-ia-ora" +build_module "applications/themes/tde-style-lipstik" +build_module "applications/themes/tde-style-qtcurve" +build_module "applications/themes/tdmtheme" +build_module "applications/themes/twin-style-crystal" +build_module "applications/themes/twin-style-dekorator" +build_module "applications/themes/twin-style-suse2" + +set_log_end diff --git a/debian/_buildscripts/local/11_others_02.sh b/debian/_buildscripts/local/16_apps_misc.sh index b5aef0ec6..ee6061311 100755 --- a/debian/_buildscripts/local/11_others_02.sh +++ b/debian/_buildscripts/local/16_apps_misc.sh @@ -5,7 +5,14 @@ #---------------------------- set_log_start -build_module "core/tde-i18n" +build_module "applications/misc/bibletime" +build_module "applications/misc/desktop-effects-tde" +build_module "applications/misc/kcmldap" +build_module "applications/misc/kcmldapcontroller" +build_module "applications/misc/kcmldapmanager" +build_module "applications/misc/kerberostray" +build_module "applications/misc/krecipes" + if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then build_module "$CFG_EXTRA_DEPS_DIR/compiz-trinity" build_module "$CFG_EXTRA_DEPS_DIR/libcompizconfig-trinity" @@ -13,9 +20,7 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-main-trinity" build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-extra-trinity" build_module "$CFG_EXTRA_DEPS_DIR/compizconfig-python-trinity" - build_module "$CFG_EXTRA_DEPS_DIR/pilot-link" fi -build_module "applications/compizconfig-backend-tdeconfig" -build_module "applications/kpilot" +build_module "applications/misc/compizconfig-backend-tdeconfig" set_log_end diff --git a/debian/_buildscripts/local/12_meta_packages.sh b/debian/_buildscripts/local/17_meta_packages.sh index 37d1a670c..37d1a670c 100755 --- a/debian/_buildscripts/local/12_meta_packages.sh +++ b/debian/_buildscripts/local/17_meta_packages.sh diff --git a/debian/_buildscripts/local/91_build_base.sh b/debian/_buildscripts/local/91_build_base.sh index 7dbec8316..b53ba9048 100755 --- a/debian/_buildscripts/local/91_build_base.sh +++ b/debian/_buildscripts/local/91_build_base.sh @@ -6,3 +6,4 @@ fi ./01_base_01.sh ./02_base_02.sh ./03_base_03.sh +./04_base_04.sh diff --git a/debian/_buildscripts/local/92_build_applications.sh b/debian/_buildscripts/local/92_build_applications.sh index 45b26a5f1..d16b5cc54 100755 --- a/debian/_buildscripts/local/92_build_applications.sh +++ b/debian/_buildscripts/local/92_build_applications.sh @@ -1,9 +1,14 @@ #!/bin/bash -./04_applications_01.sh -./05_applications_02.sh -./06_applications_03.sh -./07_applications_04.sh -./08_applications_05.sh -./09_applications_06.sh - +./05_apps_system.sh +./06_apps_utilities.sh +./07_apps_settings.sh +./08_apps_graphics.sh +./09_apps_development.sh +./10_apps_games.sh +./11_apps_internet.sh +./12_apps_office.sh +./13_apps_multimedia.sh +./14_apps_tdeio.sh +./15_apps_themes.sh +./16_apps_misc.sh diff --git a/debian/_buildscripts/local/93_build_others.sh b/debian/_buildscripts/local/93_build_others.sh deleted file mode 100755 index 0272604af..000000000 --- a/debian/_buildscripts/local/93_build_others.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -./10_others_01.sh -./11_others_02.sh -./12_meta_packages.sh
\ No newline at end of file diff --git a/debian/_buildscripts/local/99_build_TDE.sh b/debian/_buildscripts/local/99_build_TDE.sh index 99b72ce05..1a80862a6 100755 --- a/debian/_buildscripts/local/99_build_TDE.sh +++ b/debian/_buildscripts/local/99_build_TDE.sh @@ -1,7 +1,8 @@ #!/bin/bash # Load common code and initialization -. ./internals/_build_common.sh +export SCRIPT_DIR=$(dirname $(readlink -f "$0")) +. ${SCRIPT_DIR}/internals/_build_common.sh init_common _BUILDALL_TIMER=2 @@ -49,6 +50,6 @@ set_log_start ./91_build_base.sh ./92_build_applications.sh -./93_build_others.sh +./17_meta_packages.sh set_log_end diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt index 18d9f3493..d2ed9fc7e 100644 --- a/debian/_buildscripts/local/README.txt +++ b/debian/_buildscripts/local/README.txt @@ -14,6 +14,13 @@ A) Environment preparation It should work for other debian/ubuntu distros as well, but eventually you may run into small differences here and there. - you can change folder names below, as long as you update the "_config.sh" file accordingly. + - you need to choose whether to use standard git repository clones or use git worktrees. + Different instructions will be provided where necessary, based on the choice made. + - you need to choose whether to use standard git repository clones or use git worktrees. + Different instructions will be provided where necessary, based on the choice made. + - you need to choose whether to use pre built extra dependency packages or build them yourself. + Different instructions will be provided where necessary, based on the choice made. + More on this at point 9). 1) Install following packages: bc, cdbs, git, pbuilder, rsync and required dependencies. NOTE: sudo should already be installed. If not, install sudo as well. @@ -41,7 +48,7 @@ A) Environment preparation cd tde ./scripts/switch_all_submodules_to_head_and_clean anonymous - A.2) If you are not using pre-built extra dependencies: + A.2) If you are *not* using pre-built extra dependencies: cd "$TDE_DIR/1_git" git clone https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies.git edeps @@ -50,15 +57,16 @@ A) Environment preparation cd "$TDE_DIR/1_git" git clone --bare --config "remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*" https://mirror.git.trinitydesktop.org/gitea/TDE/tde.git repos/tde.git - B.2) If you are not using pre-built extra dependencies: + B.2) If you are *not* using pre-built extra dependencies: cd "$TDE_DIR/1_git" git clone --bare --config "remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*" https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies.git repos/edeps.git B.3) run the script "update_repositories.sh" once you have completed the setup as described later in this document. -5) Add your user to the sudo group (not required if you are root) - su -c "adduser <username> sudo" - Logout and login again to make sure the new settings are applied. +5) Add your user to the sudo group (not required if you are root). Mind the stand alone "-"! + su - -c "adduser <username> sudo" + Logout and login again to make sure the new settings are applied. If you forget this step, you will have build + errors when you first try to build a module. * Optionally, consider extending your sudo timeout interval to avoid having to type your password too often (this could be quite painful especially during long builds, which would not be able to complete if unattended). To do this, type "sudo visudo" and then add "Defaults timestamp_timeout=<new timeout>", where the value is in @@ -71,9 +79,11 @@ A) Environment preparation sudo pbuilder create If you wish to build for a different distro or architecture, use the command: sudo DISTRO_NAME=<target distro> ARCHITECTURE=<target architecture> pbuilder create + If all goes well there should be no errors reported and a file named "base-<distro name>@<architecture>.tgz" + should be found at location "/var/cache/pbuilder/". 8) Setup the build scripts locally: - - copy build scripts from "TDE_DIR/1_git/tde/packaging/debian/_buildscripts/local" to "TDE_DIR/buildscripts" + - copy the contents of "TDE_DIR/1_git/tde/packaging/debian/_buildscripts/local" to "TDE_DIR/buildscripts" and make sure all shell scripts are executable - cd "TDE_DIR/buildscripts" - cp ./internals/_config_template.sh _config.sh @@ -85,34 +95,36 @@ A) Environment preparation * UPDATE_BRANCHES to the branches you want to keep updated from the main repositories. * DEFAULT_REPO_BRANCH to the branch to check out at the end of the repositories update process. -9) Some additional packages (referred to as extra dependencies) are required to build and install TDE in debian/ubuntu. - These modules can be built locally or alternatively Slavek Banko's pre-built binaries can be used. +9) Some additional packages (referred to as extra dependencies) are required to build and install TDE in debian/devuan/ubuntu. + These modules can be built locally or alternatively pre-built binaries from the TDE archive can be used. 9.1) Using pre-built extra dependencies - open "_config.sh" and set the variable USE_PREBUILD_EXTRA_DEPS to "y" (this is the default initial setting) - - add the following lines to the /etc/apt/sources.list file. This will setup Slavek's repositories in apt for - installing the extra dependency packages when TDE is installed. - * For R14.1.x series (repository branch "master") - # --- SLAVEK BANKO'S EXTRA DEPENDENCIES REPOSITORY --- + - create the file /etc/apt/sources.list.d/tde.list add the following lines to it. This will setup the + correct repository in apt for installing the required extra dependency packages. + * For R14.2.x series (repository branch "master") + # --- TDE EXTRA DEPENDENCIES REPOSITORY --- deb http://mirror.ppa.trinitydesktop.org/trinity-testing <YOUR DISTRO> deps - * For R14.0.x series (repository branch "r14.0.x") - # --- SLAVEK BANKO'S EXTRA DEPENDENCIES REPOSITORY --- + * For R14.1.x series (repository branch "r14.1.x") + # --- TDE EXTRA DEPENDENCIES REPOSITORY --- deb http://mirror.ppa.trinitydesktop.org/trinity-sb <YOUR DISTRO> deps-r14 For example: deb http://mirror.ppa.trinitydesktop.org/trinity-sb buster deps-r14 - install package dirmngr if required - - import TDE Archive Signing key into your apt keyring - sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-key C93AF1698685AD8B + - import the TDE archive signing key into your apt keyring + sudo wget http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-keyring.deb + sudo dpkg -i trinity-keyring.deb 9.2) Building extra dependencies locally (recommended option) - open "_config.sh" and set the variables USE_PREBUILD_EXTRA_DEPS to "n" and CFG_EXTRA_DEPS_DIR to "edeps" - build the extra dependency as any other normal module -10) Add the following lines to the /etc/apt/sources.list file. This will setup your local repo in apt. +10) If needed, create the file /etc/apt/sources.list.d/tde.list. Then add the following lines to it. + This will setup your local repository in apt. # --- LOCAL TDE REPOSITORY --- - deb [trusted=yes] file:TDE_DIR/3_repo <YOUR DISTRO> main + deb [trusted=yes] file:$TDE_DIR/3_repo <YOUR DISTRO> main For example: deb [trusted=yes] file:/home/tde_src/3_repo buster main @@ -178,39 +190,43 @@ When building sets of modules or the whole TDE, a global build summary is automa subfolder edeps/imlib Usage: - build_module.sh [options] module_name + build_module.sh [options] [module_name] Options: -g (Git) : build from git repo sources. If missing, build from the local copy in build folder. -l (Local) : build the module locally. If missing, build in a clean chroot environment + -p <folder> (Path): build from the specified folder. This option cannot be used together with -g. + The path must be a module in the git repository or in the local build folder. + This option is mostly intended to be used when using branches with git worktrees. -sl (Show Log) : output the building logs to terminal while the build is ongoing -lr (Log Result) : log (append) build result (OK, FAILED) to TDE_DIR/0_logs/build_result.log file -sh (Shell Hook) : use a shell hook for failing builds, only valid if building using pbuilder (clean chroot environment) -po (Prepare Only): only prepare the source folder but do not build the module. Useful to prepare the source code before doing local changes/development. The module can then be built from the modified local folder -d (Debug) : enable debug symbols if possible (debian/rules file must contain "RelWithDebInfo" for this to work) + module_name : the module to build. If '-p <folder>' is used, this parameter must not be specified since the module + is derived from the <folder> parameter. - <dd>_<set_name>.sh A number of scripts used to build sets of modules. Each script builds an individual set. Modules are built from the git sources and the build result is automatically appended to TDE_DIR/0_logs/build_result.log. Usage: - <dd>_<set_name>.sh [options] set_name + <dd>_<set_name>.sh [options] Options: -s N: if specified, skip first N modules from the set of modules - The sets are logically grouped as "base system", "applications" and "others" - 00_extradeps.sh : extra dependencies modules - 01_base_01.sh - 03_base_03.sh : TDE base system - 04_application_01.sh - 09_application_06.sh : application modules - 10_others_01.sh - 11_others_02.sh : other modules that are somehow less used - 91_build_base.sh : whole TDE base system in 00_extradeps.sh - 03_base_03.sh - 92_build_applications.sh : all TDE applications in 04_application_01.sh - 09_application_06.sh - 93_build_others.sh : all modules in 10_others_01.sh - 11_others_02.sh + The sets are logically grouped as "base system", "applications" and "meta packages". + 00_extradeps.sh : extra dependencies modules + 01_base_01.sh - 04_base_04.sh : base system + 05_apps_system.sh - 16_apps_misc.sh : application modules + 17_meta_packages.sh : meta package modules + 91_build_base.sh : whole TDE base system in 00_extradeps.sh - 04_base_04.sh + 92_build_applications.sh : all TDE applications in 05_apps_system.sh - 16_apps_misc.sh - 99_build_TDE.sh - Script used to build the complete TDE at once. Calls the dd_setname.sh set scripts in order. + Script used to build the complete TDE at once. Usage: - build_TDE.sh + 99_build_TDE.sh - create_repo.sh Creates a local repository from the .deb files currently stored in TDE_DIR/2_build/debs. diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index 76de919af..52402895e 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -45,35 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz" #-- select apt components case "$DISTRIBUTION" in # debian - jessie) - if [[ "$DISTRO" = "devuan" ]]; then - COMPONENTS="main" - DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) - EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring" - else - COMPONENTS="main contrib non-free" - fi - ;; - - sid|bullseye|buster|stretch) + sid|trixie|bookwork|bullseye|buster) COMPONENTS="main contrib non-free" ;; # devuan - ceres|chimaera|beowulf|ascii) + ceres|daedalus|chimaera|beowulf) COMPONENTS="main" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring" ;; # ubuntu - impish|hirsute|groovy|focal|bionic|xenial|trusty) + mantic|lunar|kinetic|jammy|focal|bionic) COMPONENTS="main restricted universe multiverse" DEBOOTSTRAPOPTS=(--variant=buildd) ;; # raspbian - raspbian-bullseye|raspbian-buster|raspbian-stretch) + raspbian-bookworm|raspbian-bullseye|raspbian-buster) COMPONENTS="main contrib non-free" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) ;; @@ -83,25 +73,17 @@ EXTRAPACKAGES="$EXTRAPACKAGES fakeroot apt-transport-https ca-certificates" #-- select base apt sources case "$DISTRIBUTION" in # debian - sid|bullseye|buster|stretch) + sid|trixie|bookwork|bullseye|buster) MIRRORSITE=http://deb.debian.org/debian ;; - jessie) - if [[ "$DISTRO" = "devuan" ]]; then - MIRRORSITE=http://auto.mirror.devuan.org/merged - else - MIRRORSITE=http://deb.debian.org/debian - fi - ;; - # devuan - ceres|chimaera|beowulf|ascii) - MIRRORSITE=http://auto.mirror.devuan.org/merged + ceres|daedalus|chimaera|beowulf) + MIRRORSITE=http://pkgmaster.devuan.org/merged ;; # ubuntu - impish|hirsute|groovy|focal|bionic|xenial|trusty) + mantic|lunar|kinetic|jammy|focal|bionic) if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then MIRRORSITE=http://archive.ubuntu.com/ubuntu else @@ -110,7 +92,7 @@ case "$DISTRIBUTION" in ;; # raspbian - raspbian-bullseye|raspbian-buster|raspbian-stretch) + raspbian-bookworm|raspbian-bullseye|raspbian-buster) MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian ;; esac @@ -126,12 +108,7 @@ APTCACHE="/var/cache/pbuilder/aptcache/$DISTRO-$DISTRIBUTION/" if [ -n "$APTCACHE" ] && [ ! -d "$APTCACHE" ]; then mkdir $APTCACHE fi -if [ -z "$(stat -L --print "%d\n" $APTCACHE/. /var/cache/pbuilder/build/. | uniq -d)" ]; then - # apt cache for build on tmpfs is managed by hook scripts - BINDMOUNTS="${BINDMOUNTS} ${APTCACHE}" - APTCACHEHARDLINK=no - APTCACHE="" -fi +APTCACHEHARDLINK=no #-- extra options DEBBUILDOPTS="-b" @@ -140,19 +117,5 @@ if [ -z "$DEB_SIGN_KEYID" ]; then AUTO_DEBSIGN=${AUTO_DEBSIGN:-no} fi -#-- choose dependency solver -#-- apt is better if target distribution contains apt >= 1.4~beta3 -#-- aptitude is better if target distribution contains apt < 1.4~beta3 -case "$DISTRIBUTION" in - sid|bullseye|buster|stretch|\ - ceres|chimaera|beowulf|ascii|\ - raspbian-bullseye|raspbian-buster|raspbian-stretch|\ - impish|hirsute|groovy|focal|bionic) - PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" - ;; - - jessie|\ - xenial|trusty) - PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-aptitude" - ;; -esac +#-- dependency solver +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh index c7c6cec0f..e8ccec472 100755 --- a/debian/_buildscripts/local/build_module.sh +++ b/debian/_buildscripts/local/build_module.sh @@ -4,7 +4,8 @@ # # Load common code and initialization -. ./internals/_build_common.sh +export SCRIPT_DIR=$(dirname $(readlink -f "$0")) +. ${SCRIPT_DIR}/internals/_build_common.sh init_common @@ -74,8 +75,12 @@ function search_module() # Unique module MODULE_FOUND="y" MOD_NAME=$LOC_MATCH - MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME" - MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" + if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then + MOD_GIT_PATH="$MOD_PATH" + else + MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME" + fi + MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian" MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME" else # Search for a unique folder with the same name @@ -112,6 +117,7 @@ function search_module() fi fi fi + export MOD_BUILD_PATH MOD_BUILD_PKGING_PATH="$MOD_BUILD_PATH/debian" IFS=$OLDIFS } @@ -122,9 +128,10 @@ function search_module() #---------------------------- MOD_NAME="" # the name of the specified module bool_BUILD_FROM_GIT="n" +bool_BUILD_FROM_PATH="n" +bool_BUILD_LOCALLY="n" bool_EXTRADEP_MOD="n" bool_SHOW_BUILD_LOGS="n" -bool_BUILD_LOCALLY="n" bool_LOG_RESULT="n" bool_SHELL_HOOK="n" bool_PREPARE_ONLY="n" @@ -144,6 +151,15 @@ while [ $# -gt 0 ]; do -lr) # Log build Result to file bool_LOG_RESULT="y" ;; + -p) # build from specific Path + if [ -z "$MOD_NAME" ]; then + shift + MOD_NAME="$1" + bool_BUILD_FROM_PATH="y" + else + bool_INVALID_PARAMETERS="y" + fi + ;; -po) # Prepare build folder Only but do not build bool_PREPARE_ONLY="y" ;; @@ -163,12 +179,42 @@ while [ $# -gt 0 ]; do shift done +if [ "${bool_BUILD_FROM_GIT}" = "y" -a "${bool_BUILD_FROM_PATH}" = "y" ]; then + bool_INVALID_PARAMETERS="y" +fi if [ "$bool_INVALID_PARAMETERS" != "n" ]; then echo "Invalid arguments." MOD_NAME="N/A" do_exit 1 fi +# If building from a given path, look up the module name +if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then + if [ -d "${MOD_NAME}" ]; then + cd "${MOD_NAME}" + MOD_PATH=`pwd` + if [ "${USE_GIT_WORKTREES}" = "y" ]; then + MOD_NAME=`git rev-parse --git-dir 2>/dev/null | sed "s|.*/\([^\/]\+\)\.git.*|\1|"` + else + MOD_NAME=`basename "${MOD_PATH}"` + fi + if [ "${MOD_NAME}" != "" -a "${MOD_NAME}" != "tde" -a "${MOD_NAME}" != ".git" ]; then + # Valid git module + if [[ "${MOD_PATH}" =~ ${TDE_BUILD_DIR} ]]; then + # Module from build folder + bool_BUILD_FROM_GIT="n" + else + # Module from git repo + bool_BUILD_FROM_GIT="y" + fi + else + MOD_NAME="" + fi + else + MOD_NAME="" + fi +fi + echo -e "${CLightCyan}#### Processing module \"$MOD_NAME\" ####${CNone}" if [ "$MOD_NAME" = "" ]; then @@ -176,7 +222,7 @@ if [ "$MOD_NAME" = "" ]; then do_exit 3 fi -# Shell hook is only valid if not building locally +# Shell hooks are only valid if not building locally if [ "bool_BUILD_LOCALLY" = "y" ]; then bool_SHELL_HOOK="n" fi @@ -222,45 +268,36 @@ done #---------------------------- # Check if module is an extra dependency if [[ $MOD_NAME =~ ^$CFG_EXTRA_DEPS_DIR/ ]]; then - bool_EXTRADEP_MOD="y" + bool_EXTRADEP_MOD="y" fi # Make sure the module exists search_module $MOD_NAME if [ "$MODULE_FOUND" != "y" ]; then - echo "Module \"$MOD_NAME\" not found in GIT" - do_exit 5 + echo "Module \"$MOD_NAME\" not found" + do_exit 5 fi if [ "$bool_BUILD_FROM_GIT" = "y" ]; then echo -e "${CYellow}> Building from GIT repo${CNone}" - # source files + bool_COPY_MOD_SRC="y" + bool_COPY_PKGING_FILES="y" # packaging scripts if [ "$bool_EXTRADEP_MOD" != "y" -a ! -d "$MOD_GIT_PKGING_PATH" ]; then echo "Packaging for \"$MOD_NAME\" not found in GIT" do_exit 6 fi - bool_COPY_PKGING_FILES="y" - # else echo -e "${CYellow}> Building from BUILD folder${CNone}" - # source files - bool_COPY_MOD_SRC="n" + if [ ! -d "$MOD_BUILD_PATH" ]; then - bool_COPY_MOD_SRC="y" + echo "Build folder for \"$MOD_NAME\" not found" + do_exit 7 fi - - # packaging scripts + bool_COPY_MOD_SRC="n" bool_COPY_PKGING_FILES="n" - if [ "$bool_EXTRADEP_MOD" != "y" -a ! -d "$MOD_BUILD_PKGING_PATH" ]; then - if [ ! -d "$MOD_GIT_PKGING_PATH" ]; then - echo "Packaging for \"$MOD_NAME\" not found neither in BUILD nor in GIT" - do_exit 8 - fi - bool_COPY_PKGING_FILES="y" - fi fi @@ -273,22 +310,42 @@ if [ -d "$MOD_BUILD_PATH" ]; then $SUDO_CMD rm *.deb *.dsc *.changes *.tar.bz2 *.tar.gz *.tar.xz *.log *.buildinfo &>/dev/null fi +# calculate package version, if needed +if [ "$bool_EXTRADEP_MOD" != "y" ]; then + cd $MOD_GIT_PATH + branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"` + if [[ -z "$branch" ]]; then + branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` + fi + target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1` + tag=`git tag | \ + sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \ + while read t; do \ + git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \ + echo "$t..HEAD" && break; done` + count=`git log $tag --pretty=oneline | wc -l` + pkgver=$TDE_RELEASE + if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then + pkgver=$pkgver~pre$count+$(git rev-parse HEAD | cut -c 1-8) + fi + MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"` + if [[ -z "$MOD_BRANCH" ]]; then + MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` + fi + COMMIT_HASH=`git rev-parse HEAD` +fi + # copy main repo source files, if needed if [ "$bool_COPY_MOD_SRC" = "y" ]; then bool_COPY_PKGING_FILES="y" recreate_folder "$MOD_BUILD_PATH" if [ "$bool_EXTRADEP_MOD" != "y" ]; then # Normal module - cp -R "$MOD_GIT_PATH" "$MOD_BUILD_PATH/.." + cp -R "$MOD_GIT_PATH/." "$MOD_BUILD_PATH" # Add GIT information echo "# TDE SCM module information" > "$MOD_BUILD_PATH/.tdescminfo" echo "Name: $MOD_NAME" >> "$MOD_BUILD_PATH/.tdescminfo" - cd "$MOD_GIT_PATH" - MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"` - if [[ -z "$MOD_BRANCH" ]]; then - MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` - fi - COMMIT_HASH=`git rev-parse HEAD` + echo "Version: R$pkgver" >> "$MOD_BUILD_PATH/.tdescminfo" echo "Revision: $MOD_BRANCH-$COMMIT_HASH" >> "$MOD_BUILD_PATH/.tdescminfo" git log -1 --pretty=format:"DateTime: %cd%n" --date=format:"%m/%d/%Y %H:%M" >> "$MOD_BUILD_PATH/.tdescminfo" else @@ -319,28 +376,10 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH" # Default package name - # Calculate package version - cd $MOD_GIT_PATH - branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"` - if [[ -z "$branch" ]]; then - branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` - fi - target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1` - tag=`git tag | \ - sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \ - while read t; do \ - git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \ - echo "$t..HEAD" && break; done` - count=`git log $tag --pretty=oneline | wc -l` - package=$(basename $PWD)-trinity-$TDE_RELEASE - if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then - package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8) - fi + package=$(basename $PWD)-trinity-$pkgver REL=4:$TDE_RELEASE${package#*$TDE_RELEASE} REL=${REL%+*} REL=${REL/4:14.0.0/4:14.0.0-s} - REL=${REL/4:14.0.0-s~pre/4:14.0.0-s~} - REL=${REL/.0~pre/.0~s} # Get package name and packaging release PKG_NAME=$(head -n1 $MOD_BUILD_PKGING_PATH/changelog) PKG_NAME=${PKG_NAME%% *} @@ -448,11 +487,11 @@ if [ "$bool_BUILD_LOCALLY" = "y" ]; then build_retval=$? if [ $build_retval -eq 0 ]; then eval dpkg-buildpackage -b $OPT_SIGN_PKG_LOCAL $OPT_SHOW_LOGS\"$BUILDING_LOG_FILE\" + build_retval=$? fi - build_retval=$? else ## Build module in a clean chroot environment using pbuilder - $SUDO_CMD . "$SCRIPT_DIR/internals/_pbuilder.sh" + $SUDO_CMD "$SCRIPT_DIR/internals/_pbuilder.sh" build_retval=$? if [ "`whoami`" != "root" ]; then cd "$MOD_DEB_PATH" diff --git a/debian/_buildscripts/local/create_repo.sh b/debian/_buildscripts/local/create_repo.sh index f03f92e84..222cb7740 100755 --- a/debian/_buildscripts/local/create_repo.sh +++ b/debian/_buildscripts/local/create_repo.sh @@ -4,7 +4,8 @@ # # Load common code and initialization -. ./internals/_build_common.sh +export SCRIPT_DIR=$(dirname $(readlink -f "$0")) +. ${SCRIPT_DIR}/internals/_build_common.sh init_common #---------------------------- diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh index be1b520ec..0a17cb700 100755 --- a/debian/_buildscripts/local/internals/_build_common.sh +++ b/debian/_buildscripts/local/internals/_build_common.sh @@ -89,6 +89,8 @@ function _set_path_variables() #---------------------------- function init_common() { + local CURR_DIR=`pwd` + # Check script folder export SCRIPT_DIR=$(dirname $(readlink -f "$0")) @@ -230,7 +232,7 @@ function init_common() exit 10 fi - cd "$SCRIPT_DIR" + cd "${CURR_DIR}" } diff --git a/debian/_buildscripts/local/internals/_build_set_common.sh b/debian/_buildscripts/local/internals/_build_set_common.sh index 4bc1ea3e8..82e7e8bba 100755 --- a/debian/_buildscripts/local/internals/_build_set_common.sh +++ b/debian/_buildscripts/local/internals/_build_set_common.sh @@ -1,7 +1,8 @@ #!/bin/bash # Load common code and initialization -. ./internals/_build_common.sh +export SCRIPT_DIR=$(dirname $(readlink -f "$0")) +. ${SCRIPT_DIR}/internals/_build_common.sh init_common _BUILDSET_TIMER=1 @@ -52,7 +53,7 @@ function build_module() if [ $parm_SKIP_N -gt 0 -a $SKIP_cnt -lt $parm_SKIP_N ]; then SKIP_cnt=$((SKIP_cnt+1)) else - ./build_module.sh "$BUILD_DEFAULT_OPTIONS $@" + ./build_module.sh ${BUILD_DEFAULT_OPTIONS} "$@" echo fi } diff --git a/debian/_buildscripts/local/internals/_config_template.sh b/debian/_buildscripts/local/internals/_config_template.sh index 232d99799..7c1e929c6 100644 --- a/debian/_buildscripts/local/internals/_config_template.sh +++ b/debian/_buildscripts/local/internals/_config_template.sh @@ -5,8 +5,8 @@ set -a #---------------------------- # Repo information #---------------------------- -TDE_DIR="" # TDE root folder -UPDATE_BRANCHES="master" # Space separated list. Available choices: master, r14.0.x +TDE_DIR="" # TDE root folder +UPDATE_BRANCHES="master" # Space separated list. Available choices: master, r14.1.x DEFAULT_REPO_BRANCH="master" # After update in completed, switch repo to this branch. Must be # one of the branches specified in UPDATE_BRANCHES @@ -14,12 +14,12 @@ DEFAULT_REPO_BRANCH="master" # After update in completed, switch repo to th # Build information #---------------------------- TDE_RELEASE="14.1.0" # TDE release number -DISTRO="" # Distro family (leave empty for auto-detection). For ex. debian -DISTRO_NAME="" # Distro name of specific version (leave empty for auto-detection). For ex. buster -ARCHITECTURE="" # Build for this architecture (leave empty for auto-detection). For ex. amd64 +DISTRO="" # Distro family (leave empty for auto-detection). For ex. debian +DISTRO_NAME="" # Distro name of specific version (leave empty for auto-detection). For ex. buster +ARCHITECTURE="" # Build for this architecture (leave empty for auto-detection). For ex. amd64 USE_PREBUILD_EXTRA_DEPS="y" # If == "y", use pre-built extra dependency packages BUILD_DEFAULT_OPTIONS="-g -lr" # Default building options (pbuilder) -GPG_SIGN_KEYID="" # Use this GPG key to sign packages. If null, packages will not be signed +GPG_SIGN_KEYID="" # Use this GPG key to sign packages. If null, packages will not be signed #---------------------------- # Base directories @@ -28,7 +28,7 @@ CFG_SCRIPT_LOG_DIR="0_logs" CFG_GIT_DIR="1_git" CFG_BUILD_DIR="2_build" CFG_REPO_DIR="3_repo" -CFG_EXTRA_DEPS_DIR="edeps" # Relative to CFG_GIT_DIR folder. Only required if USE_PREBUILD_EXTRA_DEPS != "y" -CFG_HOOKS_DIR="hooks" # Relative to CFG_GIT_DIR folder +CFG_EXTRA_DEPS_DIR="edeps" # Relative to CFG_GIT_DIR folder. Only required if USE_PREBUILD_EXTRA_DEPS != "y" +CFG_HOOKS_DIR="hooks" # Relative to CFG_GIT_DIR folder set +a diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh index 5f00e718a..b520a93af 100755 --- a/debian/_buildscripts/local/internals/_pbuilder.sh +++ b/debian/_buildscripts/local/internals/_pbuilder.sh @@ -57,9 +57,9 @@ END_D05_02 while read l_branch l_repo l_component; do if [ "$l_branch" = "default" ]; then bool_EDEPS_FOUND="y" - cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK" + cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK" echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list -END_D05_02 +END_D05_03 break fi done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$") @@ -67,9 +67,9 @@ END_D05_02 IFS=$OLD_IFS fi fi - cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK" + cat <<END_D05_04 >> "$PBUILDER_DEPS_HOOK" apt-get update -END_D05_03 +END_D05_04 chmod a+x "$PBUILDER_DEPS_HOOK" # Build OPT_BUILD_PARALLEL="" diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt index 84184c1b0..ba1dab204 100644 --- a/debian/_buildscripts/local/internals/distro_list.txt +++ b/debian/_buildscripts/local/internals/distro_list.txt @@ -10,31 +10,27 @@ # # debian -debian 7.0 wheezy - - -debian 8.0 jessie - - -debian 9.0 stretch - - -debian 10.0 buster - - -debian 11.0 bullseye ~a - -debian 12.0 sid ~b - +debian 10.0 buster - - +debian 11.0 bullseye - - +debian 12.0 bookworm - - +debian 13.0 trixie ~a - +debian 14.0 sid ~b - # devuan -devuan 1.0 jessie - debian/jessie -devuan 2.0 ascii - debian/stretch -devuan 3.0 beowulf - debian/buster -devuan 4.0 chimaera ~a debian/bullseye -devuan 5.0 ceres ~b debian/sid +devuan 3.0 beowulf - debian/buster +devuan 4.0 chimaera - debian/bullseye +devuan 5.0 daedalus ~a debian/bookwork +devuan 6.0 ceres ~b debian/sid # raspbian -raspbian 8.0 raspbian-jessie - - -raspbian 9.0 raspbian-stretch - - -raspbian 10.0 raspbian-buster - - -raspbian 11.0 raspbian-bullseye ~a - +raspbian 10.0 raspbian-buster - - +raspbian 11.0 raspbian-bullseye - - +raspbian 12.0 raspbian-bookworm ~a - # ubuntu -ubuntu 14.04 trusty - - -ubuntu 16.04 xenial - - -ubuntu 18.04 bionic - - -ubuntu 19.04 disco - - -ubuntu 19.10 eoan - - -ubuntu 20.04 focal - - -ubuntu 20.10 groovy ~a - +ubuntu 18.04 bionic - - +ubuntu 20.04 focal - - +ubuntu 22.04 jammy - - +ubuntu 22.10 kinetic - - +ubuntu 23.04 lunar - - +ubuntu 23.10 mantic ~a - diff --git a/debian/_buildscripts/local/internals/extra_deps.txt b/debian/_buildscripts/local/internals/extra_deps.txt index b19514d84..521b16d0c 100644 --- a/debian/_buildscripts/local/internals/extra_deps.txt +++ b/debian/_buildscripts/local/internals/extra_deps.txt @@ -5,5 +5,5 @@ EDEPS_REPO=" default http://mirror.ppa.trinitydesktop.org/trinity-testing deps master http://mirror.ppa.trinitydesktop.org/trinity-testing deps - r14.0.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14 + r14.1.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14 " diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh index 934a5a1b1..57305c59d 100755 --- a/debian/_buildscripts/local/update_repositories.sh +++ b/debian/_buildscripts/local/update_repositories.sh @@ -35,7 +35,8 @@ for ((idx=1; idx<=$#; idx++)); do done # Load common code -. ./internals/_build_common.sh +export SCRIPT_DIR=$(dirname $(readlink -f "$0")) +. ${SCRIPT_DIR}/internals/_build_common.sh init_common UPDATE_LOCK_FILENAME="/var/lock/TDE_update_repo_lock" # Lock file for incremental update @@ -282,6 +283,12 @@ function _do_worktree_update() git branch -u "origin/${CURR_BR}" &>/dev/null #$ git reset --hard "origin/${CURR_BR}" &>/dev/null fi + # If this is a clone of a local repository, make sure to do a fetch + # operation first, otherwise this clone won't see the latest changes + if [ "`git config --get remote.origin.url`" = "${MOD_REPO_PATH}" ]; then + eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG + eval git worktree prune $OPT_VERBOSE_LOG + fi # Update eval git reset --hard HEAD $OPT_VERBOSE_LOG eval git clean -dxff $OPT_VERBOSE_LOG |