diff --git a/.gitignore b/.gitignore index f01ee89098..4f9dc2984e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ deploy/* work/* -config postrun.sh -SKIP -SKIP_IMAGES .pc *-pc diff --git a/README.md b/README.md index 71be938e20..407d38a722 100644 --- a/README.md +++ b/README.md @@ -1,447 +1,50 @@ -# pi-gen +# Sugar RPi OS -Tool used to create Raspberry Pi OS images, and custom images based on Raspberry Pi OS, -which was in turn derived from the Raspbian project. +This repository lets you generate a Raspberry Pi OS equipped with Sugar shell and add some additional activities. -**Note**: Raspberry Pi OS 32 bit images are based primarily on Raspbian, while -Raspberry Pi OS 64 bit images are based primarily on Debian. +**Activities that are pre-installed:** +- Flappy +- RPI Control Center +- Number Guessing +- Tower of Hanoi +- Turtle Art +- Default activities (Calculate, Chat, Image Viewer, Pippy, Read, Terminal, Write and Browse) -## Dependencies - -pi-gen runs on Debian-based operating systems released after 2017, and we -always advise you use the latest OS for security reasons. - -On other Linux distributions it may be possible to use the Docker build described -below. - -To install the required dependencies for `pi-gen` you should run: - -```bash -apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \ -dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc \ -gpg pigz xxd arch-test -``` - -The file `depends` contains a list of tools needed. The format of this -package is `[:]`. - -## Getting started with building your images - -Getting started is as simple as cloning this repository on your build machine. You -can do so with: - -```bash -git clone https://github.com/RPI-Distro/pi-gen.git -``` - -`--depth 1` can be added afer `git clone` to create a shallow clone, only containing -the latest revision of the repository. Do not do this on your development machine. - -Also, be careful to clone the repository to a base path **NOT** containing spaces. -This configuration is not supported by debootstrap and will lead to `pi-gen` not -running. - -After cloning the repository, you can move to the next step and start configuring -your build. - -## Config - -Upon execution, `build.sh` will source the file `config` in the current -working directory. This bash shell fragment is intended to set needed -environment variables. - -The following environment variables are supported: - - * `IMG_NAME` (Default: `raspios-$RELEASE-$ARCH`, for example: `raspios-bookworm-armhf`) - - The name of the image to build with the current stage directories. Use this - variable to set the root name of your OS, eg `IMG_NAME=Frobulator`. - Export files in stages may add suffixes to `IMG_NAME`. - - * `PI_GEN_RELEASE` (Default: `Raspberry Pi reference`) - - The release name to use in `/etc/issue.txt`. The default should only be used - for official Raspberry Pi builds. - -* `RELEASE` (Default: `bookworm`) - - The release version to build images against. Valid values are any supported - Debian release. However, since different releases will have different sets of - packages available, you'll need to either modify your stages accordingly, or - checkout the appropriate branch. For example, if you'd like to build a - `bullseye` image, you should do so from the `bullseye` branch. - - * `APT_PROXY` (Default: unset) - - If you require the use of an apt proxy, set it here. This proxy setting - will not be included in the image, making it safe to use an `apt-cacher` or - similar package for development. - - * `BASE_DIR` (Default: location of `build.sh`) - - **CAUTION**: Currently, changing this value will probably break build.sh - - Top-level directory for `pi-gen`. Contains stage directories, build - scripts, and by default both work and deployment directories. - - * `WORK_DIR` (Default: `$BASE_DIR/work`) - - Directory in which `pi-gen` builds the target system. This value can be - changed if you have a suitably large, fast storage location for stages to - be built and cached. Note, `WORK_DIR` stores a complete copy of the target - system for each build stage, amounting to tens of gigabytes in the case of - Raspbian. - - **CAUTION**: If your working directory is on an NTFS partition you probably won't be able to build: make sure this is a proper Linux filesystem. - - * `DEPLOY_DIR` (Default: `$BASE_DIR/deploy`) - - Output directory for target system images and NOOBS bundles. - - * `DEPLOY_COMPRESSION` (Default: `zip`) - - Set to: - * `none` to deploy the actual image (`.img`). - * `zip` to deploy a zipped image (`.zip`). - * `gz` to deploy a gzipped image (`.img.gz`). - * `xz` to deploy a xzipped image (`.img.xz`). +## Generating OS +You must have *"Raspberry Pi Lite OS 32-bit OS"* installed on your Raspberry Pi to generate an OS. Yes, you need a Raspberry Pi to build an OS. - * `DEPLOY_ZIP` (Deprecated) +Once you have that, you can proceed to generate OS by following these steps: +- Clone this repo on your Raspberry Pi +- `cd sugar-rpi-os` +- Install the dependencies (from below) +- Run `sudo ./build.sh` - This option has been deprecated in favor of `DEPLOY_COMPRESSION`. +If build process finishes successfully, you will find your sugar OS under `sugar-rpi-os/deploy` folder - If `DEPLOY_ZIP=0` is still present in your config file, the behavior is the - same as with `DEPLOY_COMPRESSION=none`. +If you wish to use docker, you can do so by `sudo ./build-docker.sh`\ +([reference for docker usage](https://github.com/RPi-Distro/pi-gen/#:~:text=for%20finer%20details.-,Docker%20Build,are%20already%20set%20by%20the%20script%20and%20should%20not%20be%20redefined.,-Stage%20Anatomy)). - * `COMPRESSION_LEVEL` (Default: `6`) - - Compression level to be used when using `zip`, `gz` or `xz` for - `DEPLOY_COMPRESSION`. From 0 to 9 (refer to the tool man page for more - information on this. Usually 0 is no compression but very fast, up to 9 with - the best compression but very slow ). - - * `USE_QEMU` (Default: `0`) - - Setting to '1' enables the QEMU mode - creating an image that can be mounted via QEMU for an emulated - environment. These images include "-qemu" in the image file name. - - * `LOCALE_DEFAULT` (Default: 'en_GB.UTF-8' ) - - Default system locale. - - * `TARGET_HOSTNAME` (Default: 'raspberrypi' ) - - Setting the hostname to the specified value. - - * `KEYBOARD_KEYMAP` (Default: 'gb' ) - - Default keyboard keymap. - - To get the current value from a running system, run `debconf-show - keyboard-configuration` and look at the - `keyboard-configuration/xkb-keymap` value. - - * `KEYBOARD_LAYOUT` (Default: 'English (UK)' ) - - Default keyboard layout. - - To get the current value from a running system, run `debconf-show - keyboard-configuration` and look at the - `keyboard-configuration/variant` value. - - * `TIMEZONE_DEFAULT` (Default: 'Europe/London' ) - - Default keyboard layout. - - To get the current value from a running system, look in - `/etc/timezone`. - - * `FIRST_USER_NAME` (Default: `pi`) - - Username for the first user. This user only exists during the image creation process. Unless - `DISABLE_FIRST_BOOT_USER_RENAME` is set to `1`, this user will be renamed on the first boot with - a name chosen by the final user. This security feature is designed to prevent shipping images - with a default username and help prevent malicious actors from taking over your devices. - - * `FIRST_USER_PASS` (Default: unset) - - Password for the first user. If unset, the account is locked. - - * `DISABLE_FIRST_BOOT_USER_RENAME` (Default: `0`) - - Disable the renaming of the first user during the first boot. This make it so `FIRST_USER_NAME` - stays activated. `FIRST_USER_PASS` must be set for this to work. Please be aware of the implied - security risk of defining a default username and password for your devices. - - * `WPA_COUNTRY` (Default: unset) - - Sets the default WLAN regulatory domain and unblocks WLAN interfaces. This should be a 2-letter ISO/IEC 3166 country Code, i.e. `GB` - - * `ENABLE_SSH` (Default: `0`) - - Setting to `1` will enable ssh server for remote log in. Note that if you are using a common password such as the defaults there is a high risk of attackers taking over you Raspberry Pi. - - * `PUBKEY_SSH_FIRST_USER` (Default: unset) - - Setting this to a value will make that value the contents of the FIRST_USER_NAME's ~/.ssh/authorized_keys. Obviously the value should - therefore be a valid authorized_keys file. Note that this does not - automatically enable SSH. - - * `PUBKEY_ONLY_SSH` (Default: `0`) - - * Setting to `1` will disable password authentication for SSH and enable - public key authentication. Note that if SSH is not enabled this will take - effect when SSH becomes enabled. - - * `SETFCAP` (Default: unset) - - * Setting to `1` will prevent pi-gen from dropping the "capabilities" - feature. Generating the root filesystem with capabilities enabled and running - it from a filesystem that does not support capabilities (like NFS) can cause - issues. Only enable this if you understand what it is. - - * `STAGE_LIST` (Default: `stage*`) - - If set, then instead of working through the numeric stages in order, this list will be followed. For example setting to `"stage0 stage1 mystage stage2"` will run the contents of `mystage` before stage2. Note that quotes are needed around the list. An absolute or relative path can be given for stages outside the pi-gen directory. - -A simple example for building Raspberry Pi OS: - -```bash -IMG_NAME='raspios' -``` -The config file can also be specified on the command line as an argument the `build.sh` or `build-docker.sh` scripts. - -``` -./build.sh -c myconfig -``` - -This is parsed after `config` so can be used to override values set there. - -## How the build process works - -The following process is followed to build images: - - * Interate through all of the stage directories in alphanumeric order - - * Bypass a stage directory if it contains a file called - "SKIP" - - * Run the script ```prerun.sh``` which is generally just used to copy the build - directory between stages. - - * In each stage directory iterate through each subdirectory and then run each of the - install scripts it contains, again in alphanumeric order. **These need to be named - with a two digit padded number at the beginning.** - There are a number of different files and directories which can be used to - control different parts of the build process: - - - **00-run.sh** - A unix shell script. Needs to be made executable for it to run. - - - **00-run-chroot.sh** - A unix shell script which will be run in the chroot - of the image build directory. Needs to be made executable for it to run. - - - **00-debconf** - Contents of this file are passed to debconf-set-selections - to configure things like locale, etc. - - - **00-packages** - A list of packages to install. Can have more than one, space - separated, per line. - - - **00-packages-nr** - As 00-packages, except these will be installed using - the ```--no-install-recommends -y``` parameters to apt-get. - - - **00-patches** - A directory containing patch files to be applied, using quilt. - If a file named 'EDIT' is present in the directory, the build process will - be interrupted with a bash session, allowing an opportunity to create/revise - the patches. - - * If the stage directory contains files called "EXPORT_NOOBS" or "EXPORT_IMAGE" then - add this stage to a list of images to generate - - * Generate the images for any stages that have specified them - -It is recommended to examine build.sh for finer details. - - -## Docker Build - -Docker can be used to perform the build inside a container. This partially isolates -the build from the host system, and allows using the script on non-debian based -systems (e.g. Fedora Linux). The isolation is not complete due to the need to use -some kernel level services for arm emulation (binfmt) and loop devices (losetup). - -To build: - -```bash -vi config # Edit your config file. See above. -./build-docker.sh -``` - -If everything goes well, your finished image will be in the `deploy/` folder. -You can then remove the build container with `docker rm -v pigen_work` - -If you encounter errors during the build, you can edit the corresponding scripts, and -continue: - -```bash -CONTINUE=1 ./build-docker.sh -``` - -To examine the container after a failure you can enter a shell within it using: - -```bash -sudo docker run -it --privileged --volumes-from=pigen_work pi-gen /bin/bash -``` - -After successful build, the build container is by default removed. This may be undesired when making incremental changes to a customized build. To prevent the build script from remove the container add - -```bash -PRESERVE_CONTAINER=1 ./build-docker.sh -``` - -There is a possibility that even when running from a docker container, the -installation of `qemu-user-static` will silently fail when building the image -because `binfmt-support` _must be enabled on the underlying kernel_. An easy -fix is to ensure `binfmt-support` is installed on the host machine before -starting the `./build-docker.sh` script (or using your own docker build -solution). - -### Passing arguments to Docker - -When the docker image is run various required command line arguments are provided. For example the system mounts the `/dev` directory to the `/dev` directory within the docker container. If other arguments are required they may be specified in the PIGEN_DOCKER_OPTS environment variable. For example setting `PIGEN_DOCKER_OPTS="--add-host foo:192.168.0.23"` will add '192.168.0.23 foo' to the `/etc/hosts` file in the container. The `--name` -and `--privileged` options are already set by the script and should not be redefined. - -## Stage Anatomy - -### Raspbian Stage Overview - -The build of Raspbian is divided up into several stages for logical clarity -and modularity. This causes some initial complexity, but it simplifies -maintenance and allows for more easy customization. - - - **Stage 0** - bootstrap. The primary purpose of this stage is to create a - usable filesystem. This is accomplished largely through the use of - `debootstrap`, which creates a minimal filesystem suitable for use as a - base.tgz on Debian systems. This stage also configures apt settings and - installs `raspberrypi-bootloader` which is missed by debootstrap. The - minimal core is installed but not configured. As a result, this stage will not boot. - - - **Stage 1** - truly minimal system. This stage makes the system bootable by - installing system files like `/etc/fstab`, configures the bootloader, makes - the network operable, and installs packages like raspi-config. At this - stage the system should boot to a local console from which you have the - means to perform basic tasks needed to configure and install the system. - - - **Stage 2** - lite system. This stage produces the Raspberry Pi OS Lite image. - Stage 2 installs some optimized memory functions, sets timezone and charmap - defaults, installs fake-hwclock and ntp, wireless LAN and bluetooth support, - dphys-swapfile, and other basics for managing the hardware. It also - creates necessary groups and gives the pi user access to sudo and the - standard console hardware permission groups. - - Note: Raspberry Pi OS Lite contains a number of tools for development, - including `Python`, `Lua` and the `build-essential` package. If you are - creating an image to deploy in products, be sure to remove extraneous development - tools before deployment. - - - **Stage 3** - desktop system. Here's where you get the full desktop system - with X11 and LXDE, web browsers, git for development, Raspberry Pi OS custom UI - enhancements, etc. This is a base desktop system, with some development - tools installed. - - - **Stage 4** - Normal Raspberry Pi OS image. System meant to fit on a 4GB card. - This is the stage that installs most things that make Raspberry Pi OS friendly - to new users - e.g. system documentation. - - - **Stage 5** - The Raspberry Pi OS Full image. More development - tools, an email client, learning tools like Scratch, specialized packages - like sonic-pi, office productivity, etc. - -### Stage specification - -If you wish to build up to a specified stage (such as building up to stage 2 -for a lite system), place an empty file named `SKIP` in each of the `./stage` -directories you wish not to include. - -Then add an empty file named `SKIP_IMAGES` to `./stage4` and `./stage5` (if building up to stage 2) or -to `./stage2` (if building a minimal system). - -```bash -# Example for building a lite system -echo "IMG_NAME='raspios'" > config -touch ./stage3/SKIP ./stage4/SKIP ./stage5/SKIP -touch ./stage4/SKIP_IMAGES ./stage5/SKIP_IMAGES -sudo ./build.sh # or ./build-docker.sh -``` - -If you wish to build further configurations upon (for example) the lite -system, you can also delete the contents of `./stage3` and `./stage4` and -replace with your own contents in the same format. - - -## Skipping stages to speed up development - -If you're working on a specific stage the recommended development process is as -follows: - - * Add a file called SKIP_IMAGES into the directories containing EXPORT_* files - (currently stage2, stage4 and stage5) - * Add SKIP files to the stages you don't want to build. For example, if you're - basing your image on the lite image you would add these to stages 3, 4 and 5. - * Run build.sh to build all stages - * Add SKIP files to the earlier successfully built stages - * Modify the last stage - * Rebuild just the last stage using ```sudo CLEAN=1 ./build.sh``` (or, for docker builds - ```PRESERVE_CONTAINER=1 CONTINUE=1 CLEAN=1 ./build-docker.sh```) - * Once you're happy with the image you can remove the SKIP_IMAGES files and - export your image to test - -# Troubleshooting +## Dependencies -## `64 Bit Systems` -Please note there is currently an issue when compiling with a 64 Bit OS. See -https://github.com/RPi-Distro/pi-gen/issues/271 +To run the script one must install the required dependencies by running: -A 64 bit image can be generated from the `arm64` branch in this repository. Just -replace the command from [this section](#getting-started-with-building-your-images) -by the one below, and follow the rest of the documentation: ```bash -git clone --branch arm64 https://github.com/RPI-Distro/pi-gen.git +sudo apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \ +dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc \ +gpg pigz xxd arch-test ``` -If you want to generate a 64 bits image from a Raspberry Pi running a 32 bits -version, you need to add `arm_64bit=1` to your `config.txt` file and reboot your -machine. This will restart your machine with a 64 bits kernel. This will only -work from a Raspberry Pi with a 64-bit capable processor (i.e. Raspberry Pi Zero -2, Raspberry Pi 3 or Raspberry Pi 4). +## Installation of the sugar OS -## `binfmt_misc` +After the zip image is built under `deploy` folder. The image can then be flashed onto a microSD card using [rpi-imager](https://www.raspberrypi.com/software). -Linux is able execute binaries from other architectures, meaning that it should be -possible to make use of `pi-gen` on an x86_64 system, even though it will be running -ARM binaries. This requires support from the [`binfmt_misc`](https://en.wikipedia.org/wiki/Binfmt_misc) -kernel module. +In rpi-imager, under "Operating System" select "Use custom" option and then select the generated OS to flash. Username and password is also required to be set under Advanced option in the rpi-imager when prompted. -You may see one of the following errors: - -``` -update-binfmts: warning: Couldn't load the binfmt_misc module. -``` -``` -W: Failure trying to run: chroot "/pi-gen/work/test/stage0/rootfs" /bin/true -and/or -chroot: failed to run command '/bin/true': Exec format error -``` - -To resolve this, ensure that the following files are available (install them if necessary): - -``` -/lib/modules/$(uname -r)/kernel/fs/binfmt_misc.ko -/usr/bin/qemu-arm-static -``` -You may also need to load the module by hand - run `modprobe binfmt_misc`. +## Development -If you are using WSL to build you may have to enable the service `sudo update-binfmts --enable` +You can check the original repo [here](https://github.com/RPi-Distro/pi-gen/) to learn more about the structure and how to build upon it.\ +`Stage3` is concerned with the setup of Sugar on top of the RPi-Lite OS. diff --git a/config b/config new file mode 100644 index 0000000000..02cf6da301 --- /dev/null +++ b/config @@ -0,0 +1,2 @@ +IMG_NAME='sugarOS' +DEPLOY_COMPRESSION='zip' diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 93a69be89f..9a2cb8c473 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -37,3 +37,5 @@ unzip zip p7zip-full file kms++-utils python3-venv +python3-pip +gir1.2-webkit2-4.1 diff --git a/stage3/00-install-packages/00-debconf b/stage3/00-install-packages/00-debconf deleted file mode 100644 index 7dbd12eb28..0000000000 --- a/stage3/00-install-packages/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -# Adobe Flash Player. Copyright 1996-2015. Adobe Systems Incorporated. All Rights Reserved. -rpi-chromium-mods rpi-chromium-mods/adobe note diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages deleted file mode 100644 index 69f8c456aa..0000000000 --- a/stage3/00-install-packages/00-packages +++ /dev/null @@ -1,20 +0,0 @@ -gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav -evince gtk2-engines alsa-utils -desktop-base -git -policykit-1 -gvfs -rfkill -chromium-browser rpi-chromium-mods libwidevinecdm0 -firefox rpi-firefox-mods -gldriver-test -fonts-droid-fallback -fonts-liberation2 -obconf -arandr -libcamera-tools -rpicam-apps -python3-picamera2 -python3-pyqt5 -python3-opengl -vulkan-tools mesa-vulkan-drivers diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr deleted file mode 100644 index bd310cf545..0000000000 --- a/stage3/00-install-packages/00-packages-nr +++ /dev/null @@ -1,8 +0,0 @@ -xserver-xorg-video-fbdev xserver-xorg xinit -mousepad -eom -lxde lxtask menu-xdg -zenity xdg-utils -gvfs-backends gvfs-fuse -lightdm gnome-themes-extra-data gnome-icon-theme -gnome-keyring diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh deleted file mode 100755 index 0e8248dc10..0000000000 --- a/stage3/00-install-packages/01-run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF -update-alternatives --install /usr/bin/x-www-browser \ - x-www-browser /usr/bin/chromium-browser 86 -update-alternatives --install /usr/bin/gnome-www-browser \ - gnome-www-browser /usr/bin/chromium-browser 86 - apt-mark auto python3-pyqt5 python3-opengl -EOF diff --git a/stage3/00-setup-sugar/00-packages b/stage3/00-setup-sugar/00-packages new file mode 100644 index 0000000000..0c33c2ff72 --- /dev/null +++ b/stage3/00-setup-sugar/00-packages @@ -0,0 +1,2 @@ +i2c-tools +gir1.2-gtk-3.0 python3-pygame-sdl2 diff --git a/stage3/00-setup-sugar/00-run.sh b/stage3/00-setup-sugar/00-run.sh new file mode 100755 index 0000000000..fb8c0ffc37 --- /dev/null +++ b/stage3/00-setup-sugar/00-run.sh @@ -0,0 +1,33 @@ +#!/bin/bash -e + +on_chroot << EOF +sudo -u root apt install lightdm xserver-xorg sucrose -y +sudo -u root dpkg-reconfigure lightdm +sudo -u root raspi-config nonint do_boot_behaviour B3 +sudo -u root apt remove sugar-browse-activity -y +EOF + +# Temporary fix for browse-activity: installing gir1.2-webkit2-4.1 in stage2/01-sys-tweaks/00-packages L41 + +# Set the default session to Sugar +CONFIG_FILE=${ROOTFS_DIR}/etc/lightdm/lightdm.conf +if grep -q "\[Seat:\*\]" "$CONFIG_FILE"; then + sudo sed -i '/^\[Seat:\*\]/a user-session=sugar' "$CONFIG_FILE" +else + echo -e "[Seat:*]\nuser-session=sugar" | sudo tee -a "$CONFIG_FILE" +fi +echo "Default session set to Sugar." + +mkdir ${ROOTFS_DIR}/home/pi/Activities +cd ${ROOTFS_DIR}/home/pi/Activities + +# Cloning the Sugar activities +git clone https://github.com/44yu5h/rpi_control_center +git clone https://github.com/44yu5h/turtleart-activity +git clone https://github.com/sugarlabs/browse-activity # removed v207 above; added latest (v208 as of now) +git clone https://github.com/sugarlabs/flappy +git clone https://github.com/sugarlabs/number-guessing +git clone https://github.com/sugarlabs/tower-of-hanoi + +echo "Sugar is successfully installed." + diff --git a/stage2/EXPORT_IMAGE b/stage3/EXPORT_IMAGE similarity index 100% rename from stage2/EXPORT_IMAGE rename to stage3/EXPORT_IMAGE diff --git a/stage3/prerun.sh b/stage3/prerun.sh index 9acd13cbd3..e0ecdecd66 100755 --- a/stage3/prerun.sh +++ b/stage3/prerun.sh @@ -3,3 +3,4 @@ if [ ! -d "${ROOTFS_DIR}" ]; then copy_previous fi + diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf deleted file mode 100644 index 87932e2080..0000000000 --- a/stage4/00-install-packages/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -# Enable realtime process priority? -jackd2 jackd/tweak_rt_limits boolean true diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages deleted file mode 100644 index ebd1af4d1c..0000000000 --- a/stage4/00-install-packages/00-packages +++ /dev/null @@ -1,26 +0,0 @@ -python3-pygame -python3-tk thonny -python3-pgzero -python3-serial -debian-reference-en dillo -raspberrypi-net-mods raspberrypi-ui-mods -python3-pip -python3-numpy -alacarte rc-gui sense-hat -tree -libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr -geany -piclone -python3-twython -python3-flask -pprompt -piwiz -rp-prefapps -ffmpeg -vlc -rpi-connect -rpi-imager -labwc - -# ninja-build and openocd needed for vscode pico extension -meson openocd diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr deleted file mode 100644 index b904b8081f..0000000000 --- a/stage4/00-install-packages/00-packages-nr +++ /dev/null @@ -1,2 +0,0 @@ -pi-package -realvnc-vnc-server diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages deleted file mode 100644 index fc43d17313..0000000000 --- a/stage4/00-install-packages/02-packages +++ /dev/null @@ -1,4 +0,0 @@ -hunspell-en-gb -hyphen-en-gb -wamerican -wbritish diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh deleted file mode 100755 index 665dcdb7a1..0000000000 --- a/stage4/01-console-autologin/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4 -EOF diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh deleted file mode 100755 index 6a24f8254f..0000000000 --- a/stage4/02-extras/00-run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -#Alacarte fixes -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/applications" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/desktop-directories" diff --git a/stage4/03-bookshelf/00-run.sh b/stage4/03-bookshelf/00-run.sh deleted file mode 100755 index d62e70ead8..0000000000 --- a/stage4/03-bookshelf/00-run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e - -BOOKSHELF_URL="https://magpi.raspberrypi.com/bookshelf.xml" -GUIDE_URL="$(curl -s "$BOOKSHELF_URL" | awk -F '[<>]' "/Raspberry Pi Beginner's Guide .*<\/TITLE>/ {f=1; next} f==1 && /PDF/ {print \$3; exit}")" -OUTPUT="$(basename "$GUIDE_URL" | cut -f1 -d'?')" - -if [ ! -f "files/$OUTPUT" ]; then - rm files/*.pdf -f - curl -s "$GUIDE_URL" -o "files/$OUTPUT" -fi - -file "files/$OUTPUT" | grep -q "PDF document" - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf" -install -v -o 1000 -g 1000 -m 644 "files/$OUTPUT" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf/" diff --git a/stage4/03-bookshelf/files/.gitignore b/stage4/03-bookshelf/files/.gitignore deleted file mode 100644 index a136337994..0000000000 --- a/stage4/03-bookshelf/files/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pdf diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh deleted file mode 100755 index ad6298df7b..0000000000 --- a/stage4/04-enable-xcompmgr/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - raspi-config nonint do_xcompmgr 0 -EOF diff --git a/stage4/05-print-support/00-packages b/stage4/05-print-support/00-packages deleted file mode 100644 index e9c36bda29..0000000000 --- a/stage4/05-print-support/00-packages +++ /dev/null @@ -1,2 +0,0 @@ -cups -system-config-printer diff --git a/stage4/05-print-support/01-run.sh b/stage4/05-print-support/01-run.sh deleted file mode 100755 index dc9e2b2c3c..0000000000 --- a/stage4/05-print-support/01-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot <<EOF -adduser "$FIRST_USER_NAME" lpadmin -EOF diff --git a/stage4/06-enable-wayland/00-run.sh b/stage4/06-enable-wayland/00-run.sh deleted file mode 100755 index bd8bbc3bcc..0000000000 --- a/stage4/06-enable-wayland/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W2 -EOF diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE deleted file mode 100644 index 79ec11a3d0..0000000000 --- a/stage4/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage4/prerun.sh b/stage4/prerun.sh deleted file mode 100755 index 9acd13cbd3..0000000000 --- a/stage4/prerun.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -if [ ! -d "${ROOTFS_DIR}" ]; then - copy_previous -fi diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages deleted file mode 100644 index 85474ddb2f..0000000000 --- a/stage5/00-install-extras/00-packages +++ /dev/null @@ -1,7 +0,0 @@ -mu-editor -scratch nuscratch scratch3 -wolfram-engine -claws-mail -realvnc-vnc-viewer -code-the-classics -kicad diff --git a/stage5/00-install-libreoffice/00-packages b/stage5/00-install-libreoffice/00-packages deleted file mode 100644 index dc1b8d770b..0000000000 --- a/stage5/00-install-libreoffice/00-packages +++ /dev/null @@ -1,3 +0,0 @@ -libreoffice-pi openjdk-11-jre- -libreoffice-help-en-gb -libreoffice-l10n-en-gb diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE deleted file mode 100644 index a81a844fe4..0000000000 --- a/stage5/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="-full" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage5/prerun.sh b/stage5/prerun.sh deleted file mode 100755 index 9acd13cbd3..0000000000 --- a/stage5/prerun.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -if [ ! -d "${ROOTFS_DIR}" ]; then - copy_previous -fi