chore: cleanup and adjust tests to changes

silitics · Jun 6, 2024 · c51cb52 · c51cb52
1 parent 940548c
commit c51cb52
Show file tree

Hide file tree

Showing 31 changed files with 46 additions and 398 deletions.
diff --git a/bakery/Dockerfile b/bakery/Dockerfile
@@ -2,8 +2,28 @@ FROM debian:latest
 
 ARG TARGETPLATFORM
 
-COPY bakery/layers/bakery/00-base.sh /tmp/rugpi-docker/00-base.sh
-RUN /tmp/rugpi-docker/00-base.sh
+RUN apt-get -y update \
+    && apt-get -y install \
+        btrfs-progs \
+        curl \
+        dosfstools \
+        fdisk \
+        file \
+        git \
+        gpg \
+        mmdebstrap \
+        mtools \
+        proot \
+        python3 \
+        qemu-utils \
+        wget \
+        xz-utils \
+        zip \
+        zsh \
+    && apt-get -y clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && wget -O /etc/zsh/zshrc https://git.grml.org/f/grml-etc-core/etc/zsh/zshrc \
+    && touch /root/.zshrc
 
 RUN mkdir -p /usr/share/rugpi \
     && cd /usr/share/rugpi \

diff --git a/bakery/layers/bakery/00-base.sh b/bakery/layers/bakery/00-base.sh
diff --git a/bakery/repositories/core/recipes/rpi-alpine-setup/files/boot/config.txt b/bakery/repositories/core/recipes/rpi-alpine-setup/files/boot/config.txt
@@ -1,7 +1,4 @@
 # Enable DRM VC4 V3D driver.
-#
-# MX: This has been enabled by default and is required for 3D graphics
-# hardware acceleration. We just leave it enabled.
 dtoverlay=vc4-kms-v3d
 max_framebuffers=2
 

diff --git a/bakery/repositories/core/recipes/rpi-include-firmware/steps/00-run.sh b/bakery/repositories/core/recipes/rpi-include-firmware/steps/00-run.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-CONFIG_DIR="${RUGPI_BUNDLE_DIR}/config"
+CONFIG_DIR="${RUGPI_BUNDLE_DIR}/roots/config"
 
 RPI_EEPROM_DIGEST="/usr/share/rugpi/rpi-eeprom/rpi-eeprom-digest"
 

diff --git a/bakery/repositories/core/recipes/rpi-raspios-setup/recipe.toml b/bakery/repositories/core/recipes/rpi-raspios-setup/recipe.toml
@@ -1,2 +1,2 @@
-description = "Raspberry Pi meta recipe"
+description = "setup Raspberry Pi OS for Rugpi"
 dependencies = ["rugpi-ctrl", "rpi-raspios-cleanup", "persist-fake-hwclock"]
diff --git a/bakery/repositories/core/recipes/rugpi-ctrl/files/reboot.sh b/bakery/repositories/core/recipes/rugpi-ctrl/files/reboot.sh
diff --git a/bakery/repositories/core/rugpi-repository.toml b/bakery/repositories/core/rugpi-repository.toml
@@ -1,2 +1,2 @@
-name = "rugpi"
+name = "core"
 description = "Rugpi core recipes, collections, and layers."
diff --git a/bakery/run-bakery b/bakery/run-bakery
@@ -9,7 +9,7 @@ RUGPI_DEV=${RUGPI_DEV:-"false"}
 
 if [ "${RUGPI_DEV}" = "false" ]; then
     DOCKER_FLAGS="${DOCKER_FLAGS} --pull always"
-    RUGPI_VERSION=${RUGPI_VERSION:-"v0.6"}
+    RUGPI_VERSION=${RUGPI_VERSION:-"v0.7"}
 else
     RUGPI_VERSION=${RUGPI_VERSION:-"dev"}
 fi

diff --git a/tests/bootstrap/layers/generic-boot.toml b/tests/bootstrap/layers/generic-boot.toml
diff --git a/tests/bootstrap/layers/generic.toml b/tests/bootstrap/layers/generic.toml
diff --git a/tests/bootstrap/layers/raspberrypi.toml b/tests/bootstrap/layers/raspberrypi.toml
diff --git a/tests/bootstrap/layers/update-rugpi.toml b/tests/bootstrap/layers/update-rugpi.toml
diff --git a/tests/bootstrap/layers/with-thin-edge.toml b/tests/bootstrap/layers/with-thin-edge.toml
diff --git a/tests/bootstrap/recipes/setup-boot/files/ctrl.toml b/tests/bootstrap/recipes/setup-boot/files/ctrl.toml
diff --git a/tests/bootstrap/recipes/setup-boot/recipe.toml b/tests/bootstrap/recipes/setup-boot/recipe.toml
diff --git a/tests/bootstrap/recipes/setup-boot/steps/00-install.sh b/tests/bootstrap/recipes/setup-boot/steps/00-install.sh
diff --git a/tests/bootstrap/recipes/setup-boot/steps/01-packages b/tests/bootstrap/recipes/setup-boot/steps/01-packages
diff --git a/tests/bootstrap/recipes/setup-boot/steps/02-run.sh b/tests/bootstrap/recipes/setup-boot/steps/02-run.sh
diff --git a/tests/bootstrap/recipes/setup-network/files/dhcp.network b/tests/bootstrap/recipes/setup-network/files/dhcp.network
diff --git a/tests/bootstrap/recipes/setup-network/recipe.toml b/tests/bootstrap/recipes/setup-network/recipe.toml
diff --git a/tests/bootstrap/recipes/setup-network/steps/00-install.sh b/tests/bootstrap/recipes/setup-network/steps/00-install.sh
diff --git a/tests/bootstrap/recipes/tedge-hacks/recipe.toml b/tests/bootstrap/recipes/tedge-hacks/recipe.toml
diff --git a/tests/bootstrap/recipes/tedge-hacks/steps/00-install.sh b/tests/bootstrap/recipes/tedge-hacks/steps/00-install.sh