aboutsummaryrefslogtreecommitdiffstats
path: root/stage5
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-07-17 04:02:01 +0200
committerSven Gothel <[email protected]>2021-07-17 04:02:01 +0200
commit2b4a8503024e3c83ac4ed7380bddc371c8982619 (patch)
tree8b5a15f7b1d053954113be2ac46f47ac4f3a0f5c /stage5
parent5b08e3535f61ab7dde7c7651382b2095e25bc717 (diff)
multi-arch: Support vanilla Debian for 'amd64' and 'i386' architecture incl. loop_rootfs using grub (WIP)
- Generic packages: nn-packages[-RELEASE] (using the optional '-RELEASE' variant) - System packages: nn-packages-sys-(raspi|debian)[-RELEASE] (using the optional '-RELEASE' variant), allow to distinguish not only for the RELEASE but the actual underlying distribution. - On debian amd64, all required usb-storage etc modules are loaded for loop_rootfs/initrd - loop_rootfs works on Raspi (Proprietary Bootloader) as well as on Debian (Grub Bootloader) - loop_rootfs uses the first vfat block-device partition for /boot - /boot will be mounted by loop_rootfs and handed over to new root-mount-point, this avoids issues of using an undefined /boot partition (but the first) - rotatelog_init_rootfs: Rotates /boot/init_rootfs.log if having more than 500 lines - FIX export-image: Copy the rootfs.img to the exported full image, which allows testing the image directly via qemu .. etc.
Diffstat (limited to 'stage5')
-rw-r--r--stage5/00-install-extras/00-packages2
-rw-r--r--stage5/00-install-extras/00-packages-bullseye14
-rw-r--r--stage5/00-install-extras/00-packages-sys-raspi (renamed from stage5/00-install-extras/00-packages-buster)2
-rw-r--r--stage5/00-install-extras/00-packages-sys-raspi-bullseye14
-rw-r--r--stage5/00-install-libreoffice/00-packages5
-rw-r--r--stage5/00-install-libreoffice/00-packages-sys-debian1
-rw-r--r--stage5/00-install-libreoffice/00-packages-sys-raspi1
7 files changed, 20 insertions, 19 deletions
diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages
new file mode 100644
index 0000000..a6aca43
--- /dev/null
+++ b/stage5/00-install-extras/00-packages
@@ -0,0 +1,2 @@
+mu-editor
+claws-mail
diff --git a/stage5/00-install-extras/00-packages-bullseye b/stage5/00-install-extras/00-packages-bullseye
index 7e678e4..a6aca43 100644
--- a/stage5/00-install-extras/00-packages-bullseye
+++ b/stage5/00-install-extras/00-packages-bullseye
@@ -1,16 +1,2 @@
mu-editor
-#sonic-pi
-#scratch nuscratch scratch3
-smartsim
-
-#minecraft-pi python-minecraftpi python-picraft python3-picraft
-python3-sense-emu sense-emu-tools python3-sense-emu-doc
-
-#wolfram-engine
claws-mail
-greenfoot-unbundled bluej
-#nodered
-realvnc-vnc-viewer
-
-python3-games
-code-the-classics
diff --git a/stage5/00-install-extras/00-packages-buster b/stage5/00-install-extras/00-packages-sys-raspi
index edf7b2e..9848de3 100644
--- a/stage5/00-install-extras/00-packages-buster
+++ b/stage5/00-install-extras/00-packages-sys-raspi
@@ -1,4 +1,3 @@
-mu-editor
#sonic-pi
#scratch nuscratch scratch3
smartsim
@@ -7,7 +6,6 @@ smartsim
python-sense-emu sense-emu-tools python-sense-emu-doc
#wolfram-engine
-claws-mail
greenfoot-unbundled bluej
#nodered
realvnc-vnc-viewer
diff --git a/stage5/00-install-extras/00-packages-sys-raspi-bullseye b/stage5/00-install-extras/00-packages-sys-raspi-bullseye
new file mode 100644
index 0000000..2d0c598
--- /dev/null
+++ b/stage5/00-install-extras/00-packages-sys-raspi-bullseye
@@ -0,0 +1,14 @@
+#sonic-pi
+#scratch nuscratch scratch3
+smartsim
+
+#minecraft-pi python-minecraftpi python-picraft python3-picraft
+python3-sense-emu sense-emu-tools python3-sense-emu-doc
+
+#wolfram-engine
+greenfoot-unbundled bluej
+#nodered
+realvnc-vnc-viewer
+
+python3-games
+code-the-classics
diff --git a/stage5/00-install-libreoffice/00-packages b/stage5/00-install-libreoffice/00-packages
index 148e7b9..c3912d7 100644
--- a/stage5/00-install-libreoffice/00-packages
+++ b/stage5/00-install-libreoffice/00-packages
@@ -1,3 +1,2 @@
-libreoffice-pi
-libreoffice-help-en-gb
-libreoffice-l10n-en-gb
+libreoffice-help-en-us
+libreoffice-l10n-en-us
diff --git a/stage5/00-install-libreoffice/00-packages-sys-debian b/stage5/00-install-libreoffice/00-packages-sys-debian
new file mode 100644
index 0000000..63a39a7
--- /dev/null
+++ b/stage5/00-install-libreoffice/00-packages-sys-debian
@@ -0,0 +1 @@
+libreoffice
diff --git a/stage5/00-install-libreoffice/00-packages-sys-raspi b/stage5/00-install-libreoffice/00-packages-sys-raspi
new file mode 100644
index 0000000..0249e8e
--- /dev/null
+++ b/stage5/00-install-libreoffice/00-packages-sys-raspi
@@ -0,0 +1 @@
+libreoffice-pi