Updates to the README for trixie on my raspi 5HEADmaster

2 files changed, 28 insertions, 15 deletions

diff --git a/README b/README
index 477b51e..6cb9241 100644
--- a/README
+++ b/README
@@ -39,34 +39,40 @@ I select during the installation.
 I am building other architectures in a chroot, currently only arm64 on a
 different machine.
 
-For creating a local chroot, I am using (e.g. for bookworm)
+For creating a local chroot, I am using (e.g. for trixie)
 
   cd /var/chroot
-  sudo mkdir bookworm-arm64
-  sudo debootstrap bookworm bookworm-arm64 http://deb.debian.org/debian/
+  sudo mkdir trixie-arm64
+  sudo debootstrap trixie trixie-arm64 http://deb.debian.org/debian/
 
 Then I add a new entry in /etc/schroot/schroot.conf like
 
-  [bookworm]
-  description=Debian bookworm arm64
+  [trixie]
+  description=Debian trixie arm64
   type=directory
   profile=default
-  directory=/var/chroot/bookworm-arm64
+  directory=/var/chroot/trixie-arm64
 
-and use sudo schroot -c bookworm to enter it. Within the chroot I install
+and use sudo schroot -c trixie to enter it. Within the chroot I install
 some necessary or useful stuff
 
-  apt install vim gnupg build-essential devscripts
+  apt install neovim gnupg build-essential devscripts
 
-add the matching local or global r-cran repository to /etc/apt/sources.list like
+add the matching local or global r-cran repository to /etc/apt/sources.list.d/cran.sources
 
-  deb http://localhost/r-cran bookworm-cran46/
-  deb-src http://localhost/r-cran bookworm-cran46/
+  Types: deb deb-src
+  URIs: https://localhost/r-cran trixie-cran46
+  Suites: trixie-cran46/
+  Components:
+  Signed-By: /etc/apt/trusted.gpg.d/cran_debian_key.asc
 
-and tell apt to trust my key (from my Debian CRAN page):
+and put my key to the specified location
 
-  gpg --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'
-  gpg --armor --export '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' > /etc/apt/trusted.gpg.d/cran_debian_key.asc
+  gpg --keyserver keyserver.ubuntu.com \
+      --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'
+
+  gpg --armor --export '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' | \
+    sudo tee /etc/apt/trusted.gpg.d/cran_debian_key.asc
 
 In the chroot, build-essential and devscripts have to be installed
 
diff --git a/move_debs_arm64 b/move_debs_arm64
index bc8129f..e8f3d30 100755
--- a/move_debs_arm64
+++ b/move_debs_arm64
@@ -14,5 +14,12 @@ DIST=$1
 # Validate distribution argument
 if [ $DIST != "bookworm" ] && [ $DIST != "trixie" ]; then usage; exit 1; fi
 
-scp arm64:/var/chroot/$DIST-arm64/root/r-backports/$DIST/*${DIST}cran*_arm64.{deb,build} /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran46
+# This is the line used for the server at Hetzner
+#scp arm64:/var/chroot/$DIST-arm64/root/r-backports/$DIST/*${DIST}cran*_arm64.{deb,build} /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran46
+
+# The following line was used for the first compile that was not done in a chroot, but in the installed trixie system
+#scp raspi5:/home/jranke/r-backports/$DIST/*${DIST}cran*_arm64.{deb,build} /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran46
+
+# This line should suffice in the future, when I do both distributions in a chroot
+scp raspi5:/home/jranke/r-backports/$DIST/*${DIST}cran*_arm64.{deb,build} /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran46
 sudo chown jranke /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran46