diff --git a/dirty-upload-synit-config.sh b/dirty-upload-synit-config.sh index bad7da1..fb53678 100755 --- a/dirty-upload-synit-config.sh +++ b/dirty-upload-synit-config.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Upload packages and scripts for converting a plain PostmarketOS system into a Synit system +# Stomp on installed stuff to get latest dev versions on to a running machine without too much fuss set -eu @@ -10,8 +10,14 @@ SUDOPASS=${SUDOPASS:-user} ssh ${HOST} " cp `which rsync` root-rsync; echo ${SUDOPASS} | sudo -S sh -c 'chown root:root root-rsync; chmod +s root-rsync'; - echo ${SUDOPASS} | sudo -S sh -c 'echo \"! >\" > /run/etc/syndicate/throck.pr'; " rsync -avu --rsync-path="./root-rsync" \ packaging/packages/synit-config/files/. \ ${HOST}:/ +rsync -avu --rsync-path="./root-rsync" \ + protocols/schema-bundle.bin \ + protocols/schemas/*.prs \ + ${HOST}:/usr/share/synit/schemas/ +ssh ${HOST} " + echo ${SUDOPASS} | sudo -S sh -c 'echo \"! >\" > /run/etc/syndicate/throck.pr'; +" diff --git a/packaging/packages/py3-preserves/APKBUILD b/packaging/packages/py3-preserves/APKBUILD index 8f92370..3b24abe 100644 --- a/packaging/packages/py3-preserves/APKBUILD +++ b/packaging/packages/py3-preserves/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Tony Garnock-Jones pkgname=py3-preserves _pyname=preserves -pkgver=0.9.0 +pkgver=0.10.2 pkgrel=0 pkgdesc="Preserves serialization format" url="https://preserves.gitlab.io/" @@ -26,5 +26,5 @@ package() { } sha512sums=" -46fae93b094fb07f5d08953d6541f3c3957b67cab6adffad61d936f8b80cee56772b790944c68c9a675842fe0b4ecf169d6e42de026c2d4f9fb3c56662296742 preserves-0.9.0.tar.gz +9f0f62554eddaa66cf6606ddcfb74abd78bbadcd196528af24e526fa3fb9ddba2b00b33606758614a8e987d42eceaf32cf79c708fb745209e668ffbf287a4567 preserves-0.10.2.tar.gz " diff --git a/packaging/packages/py3-syndicate/APKBUILD b/packaging/packages/py3-syndicate/APKBUILD index f2b3b8d..755ec14 100644 --- a/packaging/packages/py3-syndicate/APKBUILD +++ b/packaging/packages/py3-syndicate/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Tony Garnock-Jones pkgname=py3-syndicate _pyname=syndicate-py -pkgver=0.7.2 -pkgrel=1 +pkgver=0.8.4 +pkgrel=0 pkgdesc="Syndicated Actor model for Python" url="https://syndicate-lang.org/" arch="noarch" @@ -26,5 +26,5 @@ package() { } sha512sums=" -b40da571ec10e3a3af26201aff131f26d674252d88803cce0fa89d08702c09482eb146794d8a0e51f60848adb599547796c105504fbb5c07befddca513d0c9d2 syndicate-py-0.7.2.tar.gz +ce0d1337756a1b1f538d1fe73efe8c442c6e932b4eb40daa805bf51490d7f7be2fb8ca5b6d1c74da58fdc2877c2944dd395ab6f0679bcd993647b21467dd0873 syndicate-py-0.8.4.tar.gz " diff --git a/packaging/packages/synit-config/files/usr/lib/synit/python/synit/daemon/interface_monitor.py b/packaging/packages/synit-config/files/usr/lib/synit/python/synit/daemon/interface_monitor.py index 44da22f..de8b9e2 100644 --- a/packaging/packages/synit-config/files/usr/lib/synit/python/synit/daemon/interface_monitor.py +++ b/packaging/packages/synit-config/files/usr/lib/synit/python/synit/daemon/interface_monitor.py @@ -11,7 +11,7 @@ import threading import pyroute2 -schemas = preserves.schema.load_schema_file('/home/tonyg/src/syndicate-system/protocols/schema-bundle.bin') +schemas = preserves.schema.load_schema_file('/usr/share/synit/schemas/schema-bundle.prb') network = schemas.network class LenientFormatter(Formatter): diff --git a/transmogrify.sh b/transmogrify.sh index 4afee5f..b38c421 100755 --- a/transmogrify.sh +++ b/transmogrify.sh @@ -21,7 +21,9 @@ sudo apk add -X `pwd`/packages \ preserves-tools \ squeak-cog-vm \ syndicate-sh \ - synit-config + synit-config \ + \ + docker rm -f /etc/syndicate/squeak.pr cp -p `pwd`/squeak.pr /etc/syndicate/squeak.pr