diff --git a/BuildFiles/Packaging/dependencies/backend-default b/BuildFiles/Packaging/dependencies/backend-default new file mode 100644 index 00000000..7a52b550 --- /dev/null +++ b/BuildFiles/Packaging/dependencies/backend-default @@ -0,0 +1 @@ +libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8),libmono-system-numerics4.0-cil diff --git a/BuildFiles/Packaging/dependencies/common-default b/BuildFiles/Packaging/dependencies/common-default new file mode 100644 index 00000000..f6a79aa3 --- /dev/null +++ b/BuildFiles/Packaging/dependencies/common-default @@ -0,0 +1 @@ +libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),libmono-system-web-services4.0-cil (>= 3.2.8),libmono-system-web-extensions4.0-cil (>= 3.2.8),libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),fonts-liberation,libmono-system-numerics4.0-cil diff --git a/BuildFiles/Packaging/dependencies/frontend-default b/BuildFiles/Packaging/dependencies/frontend-default new file mode 100644 index 00000000..5ef3f84b --- /dev/null +++ b/BuildFiles/Packaging/dependencies/frontend-default @@ -0,0 +1 @@ +apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript diff --git a/BuildFiles/Packaging/scripts/repackage-build-package b/BuildFiles/Packaging/scripts/repackage-build-package index d349bf83..c523cc86 100755 --- a/BuildFiles/Packaging/scripts/repackage-build-package +++ b/BuildFiles/Packaging/scripts/repackage-build-package @@ -166,7 +166,7 @@ fi cd ../.. -scripts/repackage-build-package-distro $DROPFOLDER $PACKAGENAME squeeze,trusty,xenial,jessie +scripts/repackage-build-package-distro $DROPFOLDER $PACKAGENAME squeeze,trusty,xenial,jessie $PACKAGE # TODO: FIX INTERNAL INSTALL? diff --git a/BuildFiles/Packaging/scripts/repackage-build-package-distro b/BuildFiles/Packaging/scripts/repackage-build-package-distro index b15c86a5..cb3a72c8 100644 --- a/BuildFiles/Packaging/scripts/repackage-build-package-distro +++ b/BuildFiles/Packaging/scripts/repackage-build-package-distro @@ -7,6 +7,7 @@ $PACKAGENAME=$1 $DROPFOLDER=$2 $DISTROS=$3 +$PACKAGE=$4 IFS=',' read -r -a distros <<< "$DISTROS" unset IFS @@ -15,9 +16,20 @@ for DISTRO in "${distros[@]}" do echo "Packaging for $DISTRO..." + if [ -e dependencies/$PACKAGE-$DISTRO ]; then + DEPENDENCIES=$(cat dependencies/$PACKAGE-$DISTRO | tr -d ' \r') + else + DEPENDENCIES=$(cat dependencies/$PACKAGE-default | tr -d ' \r') + fi + + cp $DROPFOLDER/payload/DEBIAN/control $DROPFOLDER/controlbackup + sed -i "s/--Dependencies--/$DEPENDENCIES/g" $DROPFOLDER/payload/DEBIAN/control + # Calculating new checksums echo "Creating MD5 checksum file ($DISTRO)..." - scripts/create-md5 + cd $DROPFOLDER/payload + ../../scripts/create-md5 + cd ../.. echo "Creating package 'swarmops-$PACKAGENAME-$DISTRO-latest.deb'..." if [ -e swarmops-$PACKAGENAME-latest.deb ]; then @@ -30,7 +42,10 @@ do echo "Updating repositories ($DISTRO)..." scripts/update-repos swarmops-$PACKAGENAME-$DISTRO-latest.deb $DISTRO -rm swarmops-$PACKAGENAME-$DISTRO-latest.deb + echo "Restoring control file, cleaning up ($DISTRO)..." + cp $DROPFOLDER/controlbackup $DROPFOLDER/payload/DEBIAN/control + rm $DROPFOLDER/controlbackup + rm swarmops-$PACKAGENAME-$DISTRO-latest.deb done diff --git a/BuildFiles/Packaging/templates/control-backend-sprint.template b/BuildFiles/Packaging/templates/control-backend-sprint.template index aea5ed10..867c866f 100644 --- a/BuildFiles/Packaging/templates/control-backend-sprint.template +++ b/BuildFiles/Packaging/templates/control-backend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-backend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common (>= --BuildNumber--),mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8),libmono-system-numerics4.0-cil +Depends: swarmops-common (>= --BuildNumber--),mono-runtime (>= 3.2.8),--Dependencies-- Conflicts: swarmops-backend-internal,swarmops-backend-stable Homepage: http://swarmops.com/ Description: Swarmops Backend diff --git a/BuildFiles/Packaging/templates/control-common-internal.template b/BuildFiles/Packaging/templates/control-common-internal.template index bc7fe2af..b2e50708 100644 --- a/BuildFiles/Packaging/templates/control-common-internal.template +++ b/BuildFiles/Packaging/templates/control-common-internal.template @@ -2,7 +2,7 @@ Package: swarmops-common-internal Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog (>= 1.1), libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),libmono-system-web-services4.0-cil (>= 3.2.8),libmono-system-web-extensions4.0-cil (>= 3.2.8),libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),fonts-liberation,libmono-system-numerics4.0-cil +Depends: dialog (>= 1.1), --Dependencies-- Conflicts: swarmops-common,swarmops-common-stable Homepage: http://swarmops.com/ Description: Swarmops Common (Internal) diff --git a/BuildFiles/Packaging/templates/control-common-sprint.template b/BuildFiles/Packaging/templates/control-common-sprint.template index a5489468..138721ae 100644 --- a/BuildFiles/Packaging/templates/control-common-sprint.template +++ b/BuildFiles/Packaging/templates/control-common-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-common Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog (>= 1.1), libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),libmono-system-web-services4.0-cil (>= 3.2.8),libmono-system-web-extensions4.0-cil (>= 3.2.8),libmono-system-componentmodel-composition4.0-cil (>= 3.2.8),fonts-liberation,libmono-system-numerics4.0-cil +Depends: dialog (>= 1.1), --Dependencies-- Conflicts: swarmops-common-internal,swarmops-common-stable Homepage: http://swarmops.com/ Description: Swarmops Common diff --git a/BuildFiles/Packaging/templates/control-frontend-internal.template b/BuildFiles/Packaging/templates/control-frontend-internal.template index 5c74d801..a25bd83d 100644 --- a/BuildFiles/Packaging/templates/control-frontend-internal.template +++ b/BuildFiles/Packaging/templates/control-frontend-internal.template @@ -2,7 +2,7 @@ Package: swarmops-frontend-internal Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: dialog (>= 1.1), swarmops-common-internal (>= --BuildNumber--), swarmops-frontend-external-scripts, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript +Depends: dialog (>= 1.1), swarmops-common-internal (>= --BuildNumber--), swarmops-frontend-external-scripts, --Dependencies-- Conflicts: swarmops-frontend,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend (Internal) diff --git a/BuildFiles/Packaging/templates/control-frontend-sprint.template b/BuildFiles/Packaging/templates/control-frontend-sprint.template index 145402f5..d3b90561 100644 --- a/BuildFiles/Packaging/templates/control-frontend-sprint.template +++ b/BuildFiles/Packaging/templates/control-frontend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-frontend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common (>= --BuildNumber--), swarmops-frontend-external-scripts (>= --BuildNumber--), apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript +Depends: swarmops-common (>= --BuildNumber--), swarmops-frontend-external-scripts (>= --BuildNumber--), --Dependencies-- Conflicts: swarmops-frontend-internal,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend