Compare commits
No commits in common. "yunohost-bullseye" and "2016-05-27-raspbian-jessie" have entirely different histories.
yunohost-b
...
2016-05-27
127 changed files with 790 additions and 2851 deletions
|
|
@ -1,5 +0,0 @@
|
|||
output/
|
||||
work/
|
||||
deploy/
|
||||
apt-cacher-ng/
|
||||
.git/objects/*
|
||||
39
.github/workflows/main.yml
vendored
39
.github/workflows/main.yml
vendored
|
|
@ -1,39 +0,0 @@
|
|||
# This is a basic workflow to help you get started with Actions
|
||||
|
||||
name: Build yunohost rpi image
|
||||
|
||||
# Controls when the workflow will run
|
||||
on:
|
||||
# Triggers the workflow on push or pull request events but only for the "yunohost-buster" branch
|
||||
push:
|
||||
branches: [ "yunohost-bullseye" ]
|
||||
pull_request:
|
||||
branches: [ "yunohost-bullseye" ]
|
||||
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
|
||||
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||
jobs:
|
||||
# This workflow contains a single job called "build"
|
||||
build:
|
||||
# The type of runner that the job will run on
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
# Steps represent a sequence of tasks that will be executed as part of the job
|
||||
steps:
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
# Runs a set of commands using the runners shell
|
||||
- name: Run a multi-line script
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt-get -y install coreutils quilt parted qemu-user-static debootstrap zerofree zip dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc qemu-utils kpartx gpg pigz
|
||||
sudo curl -fsSL https://get.docker.com -o get-docker.sh
|
||||
sudo sh ./get-docker.sh
|
||||
sudo ./build-docker.sh
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Upload deploy directory as artifact
|
||||
path: deploy/
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,8 +1,6 @@
|
|||
deploy/*
|
||||
work/*
|
||||
postrun.sh
|
||||
config
|
||||
SKIP
|
||||
SKIP_IMAGES
|
||||
.pc
|
||||
*-pc
|
||||
apt-cacher-ng/
|
||||
|
|
|
|||
17
Dockerfile
17
Dockerfile
|
|
@ -1,17 +0,0 @@
|
|||
ARG BASE_IMAGE=debian:bullseye
|
||||
FROM ${BASE_IMAGE}
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
RUN apt-get -y update && \
|
||||
apt-get -y install --no-install-recommends \
|
||||
git vim parted \
|
||||
quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
|
||||
libarchive-tools libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
|
||||
binfmt-support ca-certificates qemu-utils kpartx fdisk gpg pigz\
|
||||
procps lsof\
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY . /pi-gen/
|
||||
|
||||
VOLUME [ "/pi-gen/work", "/pi-gen/deploy"]
|
||||
13
LICENSE
13
LICENSE
|
|
@ -1,13 +0,0 @@
|
|||
Copyright (c) 2015 Raspberry Pi (Trading) Ltd.
|
||||
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
516
README.md
516
README.md
|
|
@ -1,512 +1,10 @@
|
|||
# pi-gen
|
||||
#TODO
|
||||
|
||||
Tool used to create Raspberry Pi OS images. (Previously known as Raspbian).
|
||||
1. Image export
|
||||
1. NOOBS export
|
||||
1. Simplify running a single stage
|
||||
1. Documentation
|
||||
|
||||
#Dependencies
|
||||
|
||||
## Dependencies
|
||||
|
||||
pi-gen runs on Debian-based operating systems. Currently it is only supported on
|
||||
either Debian Buster or Ubuntu Xenial and is known to have issues building on
|
||||
earlier releases of these systems. 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 \
|
||||
qemu-utils kpartx gpg pigz
|
||||
```
|
||||
|
||||
The file `depends` contains a list of tools needed. The format of this
|
||||
package is `<tool>[:<debian-package>]`.
|
||||
|
||||
## 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 --depth 1 https://github.com/RPI-Distro/pi-gen.git
|
||||
```
|
||||
|
||||
Using `--depth 1` with `git clone` will 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` **required** (Default: unset)
|
||||
|
||||
The name of the image to build with the current stage directories. Setting
|
||||
`IMG_NAME=Raspbian` is logical for an unmodified RPi-Distro/pi-gen build,
|
||||
but you should use something else for a customized version. Export files
|
||||
in stages may add suffixes to `IMG_NAME`.
|
||||
|
||||
* `USE_QCOW2` **EXPERIMENTAL** (Default: `0` )
|
||||
|
||||
Instead of using traditional way of building the rootfs of every stage in
|
||||
single subdirectories and copying over the previous one to the next one,
|
||||
qcow2 based virtual disks with backing images are used in every stage.
|
||||
This speeds up the build process and reduces overall space consumption
|
||||
significantly.
|
||||
|
||||
<u>Additional optional parameters regarding qcow2 build:</u>
|
||||
|
||||
* `BASE_QCOW2_SIZE` (Default: 12G)
|
||||
|
||||
Size of the virtual qcow2 disk.
|
||||
Note: it will not actually use that much of space at once but defines the
|
||||
maximum size of the virtual disk. If you change the build process by adding
|
||||
a lot of bigger packages or additional build stages, it can be necessary to
|
||||
increase the value because the virtual disk can run out of space like a normal
|
||||
hard drive would.
|
||||
|
||||
**CAUTION:** Although the qcow2 build mechanism will run fine inside Docker, it can happen
|
||||
that the network block device is not disconnected correctly after the Docker process has
|
||||
ended abnormally. In that case see [Disconnect an image if something went wrong](#Disconnect-an-image-if-something-went-wrong)
|
||||
|
||||
* `RELEASE` (Default: bullseye)
|
||||
|
||||
The release version to build images against. Valid values are jessie, stretch,
|
||||
buster, bullseye, and testing.
|
||||
|
||||
* `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.
|
||||
|
||||
If you have Docker installed, you can set up a local apt caching proxy to
|
||||
like speed up subsequent builds like this:
|
||||
|
||||
docker-compose up -d
|
||||
echo 'APT_PROXY=http://172.17.0.1:3142' >> config
|
||||
|
||||
* `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`).
|
||||
|
||||
|
||||
* `DEPLOY_ZIP` (Deprecated)
|
||||
|
||||
This option has been deprecated in favor of `DEPLOY_COMPRESSION`.
|
||||
|
||||
If `DEPLOY_ZIP=0` is still present in your config file, the behavior is the
|
||||
same as with `DEPLOY_COMPRESSION=none`.
|
||||
|
||||
* `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`.
|
||||
|
||||
* `WPA_ESSID`, `WPA_PASSWORD` and `WPA_COUNTRY` (Default: unset)
|
||||
|
||||
If these are set, they are use to configure `wpa_supplicant.conf`, so that the Raspberry Pi can automatically connect to a wireless network on first boot. If `WPA_ESSID` is set and `WPA_PASSWORD` is unset an unprotected wireless network will be configured. If set, `WPA_PASSWORD` must be between 8 and 63 characters.
|
||||
|
||||
* `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.
|
||||
|
||||
* `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 Raspbian:
|
||||
|
||||
```bash
|
||||
IMG_NAME='Raspbian'
|
||||
```
|
||||
|
||||
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:
|
||||
|
||||
* Loop through all of the stage directories in alphanumeric order
|
||||
|
||||
* Move on to the next directory if this stage directory 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 loop 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 isolate 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 something breaks along the line, 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, and the system will not quite
|
||||
boot yet.
|
||||
|
||||
- **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.
|
||||
This is as minimal as a system can possibly get, and its arguably not
|
||||
really usable yet in a traditional sense yet. Still, if you want minimal,
|
||||
this is minimal and the rest you could reasonably do yourself as sysadmin.
|
||||
|
||||
- **Stage 2** - lite system. This stage produces the Raspbian-Lite image. It
|
||||
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.
|
||||
|
||||
There are a few tools that may not make a whole lot of sense here for
|
||||
development purposes on a minimal system such as basic Python and Lua
|
||||
packages as well as the `build-essential` package. They are lumped right
|
||||
in with more essential packages presently, though they need not be with
|
||||
pi-gen. These are understandable for Raspbian's target audience, but if
|
||||
you were looking for something between truly minimal and Raspbian-Lite,
|
||||
here's where you start trimming.
|
||||
|
||||
- **Stage 3** - desktop system. Here's where you get the full desktop system
|
||||
with X11 and LXDE, web browsers, git for development, Raspbian custom UI
|
||||
enhancements, etc. This is a base desktop system, with some development
|
||||
tools installed.
|
||||
|
||||
- **Stage 4** - Normal Raspbian image. System meant to fit on a 4GB card. This is the
|
||||
stage that installs most things that make Raspbian friendly to new
|
||||
users like system documentation.
|
||||
|
||||
- **Stage 5** - The Raspbian 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='Raspbian'" > 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```
|
||||
* Once you're happy with the image you can remove the SKIP_IMAGES files and
|
||||
export your image to test
|
||||
|
||||
# Regarding Qcow2 image building
|
||||
|
||||
### Get infos about the image in use
|
||||
|
||||
If you issue the two commands shown in the example below in a second command shell while a build
|
||||
is running you can find out, which network block device is currently being used and which qcow2 image
|
||||
is bound to it.
|
||||
|
||||
Example:
|
||||
|
||||
```bash
|
||||
root@build-machine:~/$ lsblk | grep nbd
|
||||
nbd1 43:32 0 10G 0 disk
|
||||
├─nbd1p1 43:33 0 10G 0 part
|
||||
└─nbd1p1 253:0 0 10G 0 part
|
||||
|
||||
root@build-machine:~/$ ps xa | grep qemu-nbd
|
||||
2392 pts/6 S+ 0:00 grep --color=auto qemu-nbd
|
||||
31294 ? Ssl 0:12 qemu-nbd --discard=unmap -c /dev/nbd1 image-stage4.qcow2
|
||||
```
|
||||
|
||||
Here you can see, that the qcow2 image `image-stage4.qcow2` is currently connected to `/dev/nbd1` with
|
||||
the associated partition map `/dev/mapper/nbd1p1`. Don't worry that `lsblk` shows two entries. It is totally fine, because the device map is accessible via `/dev/mapper/nbd1p1` and also via `/dev/dm-0`. This is all part of the device mapper functionality of the kernel. See `dmsetup` for further information.
|
||||
|
||||
### Mount a qcow2 image
|
||||
|
||||
If you want to examine the content of a a single stage, you can simply mount the qcow2 image found in the `WORK_DIR` directory with the tool `./imagetool.sh`.
|
||||
|
||||
See `./imagetool.sh -h` for further details on how to use it.
|
||||
|
||||
### Disconnect an image if something went wrong
|
||||
|
||||
It can happen, that your build stops in case of an error. Normally `./build.sh` should handle image disconnection appropriately, but in rare cases, especially during a Docker build, this may not work as expected. If that happens, starting a new build will fail and you may have to disconnect the image and/or device yourself.
|
||||
|
||||
A typical message indicating that there are some orphaned device mapper entries is this:
|
||||
|
||||
```
|
||||
Failed to set NBD socket
|
||||
Disconnect client, due to: Unexpected end-of-file before all bytes were read
|
||||
```
|
||||
|
||||
If that happens go through the following steps:
|
||||
|
||||
1. First, check if the image is somehow mounted to a directory entry and umount it as you would any other block device, like i.e. a hard disk or USB stick.
|
||||
|
||||
2. Second, to disconnect an image from `qemu-nbd`, the QEMU Disk Network Block Device Server, issue the following command (be sure to change the device name to the one actually used):
|
||||
|
||||
```bash
|
||||
sudo qemu-nbd -d /dev/nbd1
|
||||
```
|
||||
|
||||
Note: if you use Docker build, normally no active `qemu-nbd` process exists anymore as it will be terminated when the Docker container stops.
|
||||
|
||||
3. To disconnect a device partition map from the network block device, execute:
|
||||
|
||||
```bash
|
||||
sudo kpartx -d /dev/nbd1
|
||||
or
|
||||
sudo ./imagetool.sh --cleanup
|
||||
```
|
||||
|
||||
Note: The `imagetool.sh` command will cleanup any /dev/nbdX that is not connected to a running `qemu-nbd` daemon. Be careful if you use network block devices for other tasks utilizing NBDs on your build machine as well.
|
||||
|
||||
Now you should be able to start a new build without running into troubles again. Most of the time, especially when using Docker build, you will only need no. 3 to get everything up and running again.
|
||||
|
||||
# Troubleshooting
|
||||
|
||||
## `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
|
||||
|
||||
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 --depth 1 --branch arm64 https://github.com/RPI-Distro/pi-gen.git
|
||||
```
|
||||
|
||||
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).
|
||||
|
||||
|
||||
## `binfmt_misc`
|
||||
|
||||
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.
|
||||
|
||||
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`.
|
||||
|
||||
If you are using WSL to build you may have to enable the service `sudo update-binfmts --enable`
|
||||
`quilt kpartx realpath qemu-user-static debootstrap zerofree`
|
||||
|
|
|
|||
124
build-docker.sh
124
build-docker.sh
|
|
@ -1,124 +0,0 @@
|
|||
#!/bin/bash -eu
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
BUILD_OPTS="$*"
|
||||
|
||||
DOCKER="docker"
|
||||
|
||||
if ! ${DOCKER} ps >/dev/null 2>&1; then
|
||||
DOCKER="sudo docker"
|
||||
fi
|
||||
if ! ${DOCKER} ps >/dev/null; then
|
||||
echo "error connecting to docker:"
|
||||
${DOCKER} ps
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CONFIG_FILE=""
|
||||
if [ -f "${DIR}/config" ]; then
|
||||
CONFIG_FILE="${DIR}/config"
|
||||
fi
|
||||
|
||||
while getopts "c:" flag
|
||||
do
|
||||
case "${flag}" in
|
||||
c)
|
||||
CONFIG_FILE="${OPTARG}"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Ensure that the configuration file is an absolute path
|
||||
if test -x /usr/bin/realpath; then
|
||||
CONFIG_FILE=$(realpath -s "$CONFIG_FILE" || realpath "$CONFIG_FILE")
|
||||
fi
|
||||
|
||||
# Ensure that the confguration file is present
|
||||
if test -z "${CONFIG_FILE}"; then
|
||||
echo "Configuration file need to be present in '${DIR}/config' or path passed as parameter"
|
||||
exit 1
|
||||
else
|
||||
# shellcheck disable=SC1090
|
||||
source ${CONFIG_FILE}
|
||||
fi
|
||||
|
||||
CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
|
||||
CONTINUE=${CONTINUE:-0}
|
||||
PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0}
|
||||
PIGEN_DOCKER_OPTS=${PIGEN_DOCKER_OPTS:-""}
|
||||
|
||||
if [ -z "${IMG_NAME}" ]; then
|
||||
echo "IMG_NAME not set in 'config'" 1>&2
|
||||
echo 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Ensure the Git Hash is recorded before entering the docker container
|
||||
GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
|
||||
|
||||
CONTAINER_EXISTS=$(${DOCKER} ps -a --filter name="${CONTAINER_NAME}" -q)
|
||||
CONTAINER_RUNNING=$(${DOCKER} ps --filter name="${CONTAINER_NAME}" -q)
|
||||
if [ "${CONTAINER_RUNNING}" != "" ]; then
|
||||
echo "The build is already running in container ${CONTAINER_NAME}. Aborting."
|
||||
exit 1
|
||||
fi
|
||||
if [ "${CONTAINER_EXISTS}" != "" ] && [ "${CONTINUE}" != "1" ]; then
|
||||
echo "Container ${CONTAINER_NAME} already exists and you did not specify CONTINUE=1. Aborting."
|
||||
echo "You can delete the existing container like this:"
|
||||
echo " ${DOCKER} rm -v ${CONTAINER_NAME}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Modify original build-options to allow config file to be mounted in the docker container
|
||||
BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
|
||||
|
||||
${DOCKER} build --build-arg BASE_IMAGE=debian:bullseye -t pi-gen "${DIR}"
|
||||
|
||||
if [ "${CONTAINER_EXISTS}" != "" ]; then
|
||||
trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM
|
||||
time ${DOCKER} run --rm --privileged \
|
||||
--cap-add=ALL \
|
||||
-v /dev:/dev \
|
||||
-v /lib/modules:/lib/modules \
|
||||
${PIGEN_DOCKER_OPTS} \
|
||||
--volume "${CONFIG_FILE}":/config:ro \
|
||||
-e "GIT_HASH=${GIT_HASH}" \
|
||||
--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
|
||||
pi-gen \
|
||||
bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
|
||||
# binfmt_misc is sometimes not mounted with debian bullseye image
|
||||
(mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true) &&
|
||||
cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
|
||||
rsync -av work/*/build.log deploy/" &
|
||||
wait "$!"
|
||||
else
|
||||
trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}' SIGINT SIGTERM
|
||||
time ${DOCKER} run --name "${CONTAINER_NAME}" --privileged \
|
||||
--cap-add=ALL \
|
||||
-v /dev:/dev \
|
||||
-v /lib/modules:/lib/modules \
|
||||
${PIGEN_DOCKER_OPTS} \
|
||||
--volume "${CONFIG_FILE}":/config:ro \
|
||||
-e "GIT_HASH=${GIT_HASH}" \
|
||||
pi-gen \
|
||||
bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
|
||||
# binfmt_misc is sometimes not mounted with debian bullseye image
|
||||
(mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true) &&
|
||||
cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
|
||||
rsync -av work/*/build.log deploy/" &
|
||||
wait "$!"
|
||||
fi
|
||||
|
||||
echo "copying results from deploy/"
|
||||
${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy .
|
||||
ls -lah deploy
|
||||
|
||||
# cleanup
|
||||
if [ "${PRESERVE_CONTAINER}" != "1" ]; then
|
||||
${DOCKER} rm -v "${CONTAINER_NAME}"
|
||||
fi
|
||||
|
||||
echo "Done! Your image(s) should be in deploy/"
|
||||
340
build.sh
340
build.sh
|
|
@ -1,67 +1,54 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
# shellcheck disable=SC2119
|
||||
run_sub_stage()
|
||||
{
|
||||
log "Begin ${SUB_STAGE_DIR}"
|
||||
pushd "${SUB_STAGE_DIR}" > /dev/null
|
||||
pushd ${SUB_STAGE_DIR} > /dev/null
|
||||
for i in {00..99}; do
|
||||
if [ -f "${i}-debconf" ]; then
|
||||
if [ -f ${i}-debconf ]; then
|
||||
log "Begin ${SUB_STAGE_DIR}/${i}-debconf"
|
||||
on_chroot << EOF
|
||||
on_chroot sh -e - << EOF
|
||||
debconf-set-selections <<SELEOF
|
||||
$(cat "${i}-debconf")
|
||||
`cat ${i}-debconf`
|
||||
SELEOF
|
||||
EOF
|
||||
|
||||
log "End ${SUB_STAGE_DIR}/${i}-debconf"
|
||||
log "End ${SUB_STAGE_DIR}/${i}-debconf"
|
||||
fi
|
||||
if [ -f "${i}-packages-nr" ]; then
|
||||
if [ -f ${i}-packages-nr ]; then
|
||||
log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr"
|
||||
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")"
|
||||
PACKAGES=`cat $i-packages-nr | tr '\n' ' '`
|
||||
if [ -n "$PACKAGES" ]; then
|
||||
on_chroot << EOF
|
||||
apt-get -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES
|
||||
on_chroot sh -e - << EOF
|
||||
apt-get install --no-install-recommends -y $PACKAGES
|
||||
EOF
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
on_chroot << EOF
|
||||
apt-get clean
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
|
||||
fi
|
||||
if [ -f "${i}-packages" ]; then
|
||||
if [ -f ${i}-packages ]; then
|
||||
log "Begin ${SUB_STAGE_DIR}/${i}-packages"
|
||||
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")"
|
||||
PACKAGES=`cat $i-packages | tr '\n' ' '`
|
||||
if [ -n "$PACKAGES" ]; then
|
||||
on_chroot << EOF
|
||||
apt-get -o APT::Acquire::Retries=3 install -y $PACKAGES
|
||||
on_chroot sh -e - << EOF
|
||||
apt-get install -y $PACKAGES
|
||||
EOF
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
on_chroot << EOF
|
||||
apt-get clean
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
log "End ${SUB_STAGE_DIR}/${i}-packages"
|
||||
fi
|
||||
if [ -d "${i}-patches" ]; then
|
||||
if [ -d ${i}-patches ]; then
|
||||
log "Begin ${SUB_STAGE_DIR}/${i}-patches"
|
||||
pushd "${STAGE_WORK_DIR}" > /dev/null
|
||||
pushd ${STAGE_WORK_DIR} > /dev/null
|
||||
if [ "${CLEAN}" = "1" ]; then
|
||||
rm -rf .pc
|
||||
rm -rf ./*-pc
|
||||
rm -rf *-pc
|
||||
fi
|
||||
QUILT_PATCHES="${SUB_STAGE_DIR}/${i}-patches"
|
||||
SUB_STAGE_QUILT_PATCH_DIR="$(basename "$SUB_STAGE_DIR")-pc"
|
||||
mkdir -p "$SUB_STAGE_QUILT_PATCH_DIR"
|
||||
ln -snf "$SUB_STAGE_QUILT_PATCH_DIR" .pc
|
||||
quilt upgrade
|
||||
if [ -e "${SUB_STAGE_DIR}/${i}-patches/EDIT" ]; then
|
||||
QUILT_PATCHES=${SUB_STAGE_DIR}/${i}-patches
|
||||
mkdir -p ${i}-pc
|
||||
ln -sf ${i}-pc .pc
|
||||
if [ -e ${SUB_STAGE_DIR}/${i}-patches/EDIT ]; then
|
||||
echo "Dropping into bash to edit patches..."
|
||||
bash
|
||||
fi
|
||||
quilt upgrade
|
||||
RC=0
|
||||
quilt push -a || RC=$?
|
||||
case "$RC" in
|
||||
|
|
@ -79,46 +66,30 @@ EOF
|
|||
./${i}-run.sh
|
||||
log "End ${SUB_STAGE_DIR}/${i}-run.sh"
|
||||
fi
|
||||
if [ -f ${i}-run-chroot.sh ]; then
|
||||
log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot.sh"
|
||||
on_chroot < ${i}-run-chroot.sh
|
||||
log "End ${SUB_STAGE_DIR}/${i}-run-chroot.sh"
|
||||
if [ -f ${i}-run-chroot ]; then
|
||||
log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot"
|
||||
on_chroot sh -e - < ${i}-run-chroot
|
||||
log "End ${SUB_STAGE_DIR}/${i}-run-chroot"
|
||||
fi
|
||||
done
|
||||
popd > /dev/null
|
||||
log "End ${SUB_STAGE_DIR}"
|
||||
}
|
||||
|
||||
|
||||
run_stage(){
|
||||
log "Begin ${STAGE_DIR}"
|
||||
STAGE="$(basename "${STAGE_DIR}")"
|
||||
|
||||
pushd "${STAGE_DIR}" > /dev/null
|
||||
|
||||
STAGE_WORK_DIR="${WORK_DIR}/${STAGE}"
|
||||
ROOTFS_DIR="${STAGE_WORK_DIR}"/rootfs
|
||||
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
if [ ! -f SKIP ]; then
|
||||
load_qimage
|
||||
fi
|
||||
else
|
||||
# make sure we are not umounting during export-image stage
|
||||
if [ "${USE_QCOW2}" = "0" ] && [ "${NO_PRERUN_QCOW2}" = "0" ]; then
|
||||
unmount "${WORK_DIR}/${STAGE}"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -f SKIP_IMAGES ]; then
|
||||
if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then
|
||||
EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
|
||||
fi
|
||||
STAGE=$(basename ${STAGE_DIR})
|
||||
pushd ${STAGE_DIR} > /dev/null
|
||||
unmount ${WORK_DIR}/${STAGE}
|
||||
STAGE_WORK_DIR=${WORK_DIR}/${STAGE}
|
||||
ROOTFS_DIR=${STAGE_WORK_DIR}/rootfs
|
||||
if [ -f ${STAGE_DIR}/EXPORT_IMAGE ]; then
|
||||
EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
|
||||
fi
|
||||
if [ ! -f SKIP ]; then
|
||||
if [ "${CLEAN}" = "1" ] && [ "${USE_QCOW2}" = "0" ] ; then
|
||||
if [ -d "${ROOTFS_DIR}" ]; then
|
||||
rm -rf "${ROOTFS_DIR}"
|
||||
if [ "${CLEAN}" = "1" ]; then
|
||||
if [ -d ${ROOTFS_DIR} ]; then
|
||||
rm -rf ${ROOTFS_DIR}
|
||||
fi
|
||||
fi
|
||||
if [ -x prerun.sh ]; then
|
||||
|
|
@ -126,25 +97,17 @@ run_stage(){
|
|||
./prerun.sh
|
||||
log "End ${STAGE_DIR}/prerun.sh"
|
||||
fi
|
||||
for SUB_STAGE_DIR in "${STAGE_DIR}"/*; do
|
||||
if [ -d "${SUB_STAGE_DIR}" ] && [ ! -f "${SUB_STAGE_DIR}/SKIP" ]; then
|
||||
for SUB_STAGE_DIR in ${STAGE_DIR}/*; do
|
||||
if [ -d ${SUB_STAGE_DIR} ] &&
|
||||
[ ! -f ${SUB_STAGE_DIR}/SKIP ]; then
|
||||
run_sub_stage
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
unload_qimage
|
||||
else
|
||||
# make sure we are not umounting during export-image stage
|
||||
if [ "${USE_QCOW2}" = "0" ] && [ "${NO_PRERUN_QCOW2}" = "0" ]; then
|
||||
unmount "${WORK_DIR}/${STAGE}"
|
||||
fi
|
||||
fi
|
||||
|
||||
PREV_STAGE="${STAGE}"
|
||||
PREV_STAGE_DIR="${STAGE_DIR}"
|
||||
PREV_ROOTFS_DIR="${ROOTFS_DIR}"
|
||||
unmount ${WORK_DIR}/${STAGE}
|
||||
PREV_STAGE=${STAGE}
|
||||
PREV_STAGE_DIR=${STAGE_DIR}
|
||||
PREV_ROOTFS_DIR=${ROOTFS_DIR}
|
||||
popd > /dev/null
|
||||
log "End ${STAGE_DIR}"
|
||||
}
|
||||
|
|
@ -154,93 +117,23 @@ if [ "$(id -u)" != "0" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
if [[ $BASE_DIR = *" "* ]]; then
|
||||
echo "There is a space in the base path of pi-gen"
|
||||
echo "This is not a valid setup supported by debootstrap."
|
||||
echo "Please remove the spaces, or move pi-gen directory to a base path without spaces" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export BASE_DIR
|
||||
|
||||
if [ -f config ]; then
|
||||
# shellcheck disable=SC1091
|
||||
source config
|
||||
fi
|
||||
|
||||
while getopts "c:" flag
|
||||
do
|
||||
case "$flag" in
|
||||
c)
|
||||
EXTRA_CONFIG="$OPTARG"
|
||||
# shellcheck disable=SC1090
|
||||
source "$EXTRA_CONFIG"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
term() {
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
log "Unloading image"
|
||||
unload_qimage
|
||||
fi
|
||||
}
|
||||
|
||||
trap term EXIT INT TERM
|
||||
|
||||
export PI_GEN=${PI_GEN:-pi-gen}
|
||||
export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
|
||||
|
||||
if [ -z "${IMG_NAME}" ]; then
|
||||
echo "IMG_NAME not set" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export USE_QEMU="${USE_QEMU:-0}"
|
||||
export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"
|
||||
export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}"}"
|
||||
export ARCHIVE_FILENAME="${ARCHIVE_FILENAME:-"image_${IMG_DATE}-${IMG_NAME}"}"
|
||||
export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"}
|
||||
|
||||
export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
export SCRIPT_DIR="${BASE_DIR}/scripts"
|
||||
export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_NAME}"}"
|
||||
export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"}
|
||||
|
||||
# DEPLOY_ZIP was deprecated in favor of DEPLOY_COMPRESSION
|
||||
# This preserve the old behavior with DEPLOY_ZIP=0 where no archive was created
|
||||
if [ -z "${DEPLOY_COMPRESSION}" ] && [ "${DEPLOY_ZIP:-1}" = "0" ]; then
|
||||
echo "DEPLOY_ZIP has been deprecated in favor of DEPLOY_COMPRESSION"
|
||||
echo "Similar behavior to DEPLOY_ZIP=0 can be obtained with DEPLOY_COMPRESSION=none"
|
||||
echo "Please update your config file"
|
||||
DEPLOY_COMPRESSION=none
|
||||
fi
|
||||
export DEPLOY_COMPRESSION=${DEPLOY_COMPRESSION:-zip}
|
||||
export COMPRESSION_LEVEL=${COMPRESSION_LEVEL:-6}
|
||||
export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"
|
||||
export DEPLOY_DIR="${BASE_DIR}/deploy"
|
||||
export LOG_FILE="${WORK_DIR}/build.log"
|
||||
|
||||
export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi}
|
||||
|
||||
export RELEASE=${RELEASE:-bullseye}
|
||||
export WPA_ESSID
|
||||
export WPA_PASSWORD
|
||||
export WPA_COUNTRY
|
||||
export ENABLE_SSH="${ENABLE_SSH:-0}"
|
||||
export PUBKEY_ONLY_SSH="${PUBKEY_ONLY_SSH:-0}"
|
||||
|
||||
export LOCALE_DEFAULT="${LOCALE_DEFAULT:-en_GB.UTF-8}"
|
||||
|
||||
export KEYBOARD_KEYMAP="${KEYBOARD_KEYMAP:-gb}"
|
||||
export KEYBOARD_LAYOUT="${KEYBOARD_LAYOUT:-English (UK)}"
|
||||
|
||||
export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-Europe/London}"
|
||||
|
||||
export GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
|
||||
|
||||
export PUBKEY_SSH_FIRST_USER
|
||||
|
||||
export CLEAN
|
||||
export IMG_NAME
|
||||
export APT_PROXY
|
||||
|
|
@ -253,8 +146,6 @@ export PREV_STAGE_DIR
|
|||
export ROOTFS_DIR
|
||||
export PREV_ROOTFS_DIR
|
||||
export IMG_SUFFIX
|
||||
export NOOBS_NAME
|
||||
export NOOBS_DESCRIPTION
|
||||
export EXPORT_DIR
|
||||
export EXPORT_ROOTFS_DIR
|
||||
|
||||
|
|
@ -263,148 +154,25 @@ export QUILT_NO_DIFF_INDEX=1
|
|||
export QUILT_NO_DIFF_TIMESTAMPS=1
|
||||
export QUILT_REFRESH_ARGS="-p ab"
|
||||
|
||||
# shellcheck source=scripts/common
|
||||
source "${SCRIPT_DIR}/common"
|
||||
# shellcheck source=scripts/dependencies_check
|
||||
source "${SCRIPT_DIR}/dependencies_check"
|
||||
source ${SCRIPT_DIR}/common
|
||||
|
||||
export NO_PRERUN_QCOW2="${NO_PRERUN_QCOW2:-1}"
|
||||
export USE_QCOW2="${USE_QCOW2:-0}"
|
||||
export BASE_QCOW2_SIZE=${BASE_QCOW2_SIZE:-12G}
|
||||
source "${SCRIPT_DIR}/qcow2_handling"
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
NO_PRERUN_QCOW2=1
|
||||
else
|
||||
NO_PRERUN_QCOW2=0
|
||||
fi
|
||||
|
||||
export NO_PRERUN_QCOW2="${NO_PRERUN_QCOW2:-1}"
|
||||
|
||||
dependencies_check "${BASE_DIR}/depends"
|
||||
|
||||
if [[ -n "${APT_PROXY}" ]] && ! curl --silent "${APT_PROXY}" >/dev/null ; then
|
||||
echo "Could not reach APT_PROXY server: ${APT_PROXY}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -n "${WPA_PASSWORD}" && ${#WPA_PASSWORD} -lt 8 || ${#WPA_PASSWORD} -gt 63 ]] ; then
|
||||
echo "WPA_PASSWORD" must be between 8 and 63 characters
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${PUBKEY_ONLY_SSH}" = "1" && -z "${PUBKEY_SSH_FIRST_USER}" ]]; then
|
||||
echo "Must set 'PUBKEY_SSH_FIRST_USER' to a valid SSH public key if using PUBKEY_ONLY_SSH"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${WORK_DIR}"
|
||||
mkdir -p ${WORK_DIR}
|
||||
log "Begin ${BASE_DIR}"
|
||||
|
||||
STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*}
|
||||
|
||||
for STAGE_DIR in $STAGE_LIST; do
|
||||
STAGE_DIR=$(realpath "${STAGE_DIR}")
|
||||
for STAGE_DIR in ${BASE_DIR}/stage*; do
|
||||
run_stage
|
||||
done
|
||||
|
||||
CLEAN=1
|
||||
for EXPORT_DIR in ${EXPORT_DIRS}; do
|
||||
STAGE_DIR=${BASE_DIR}/export-image
|
||||
# shellcheck source=/dev/null
|
||||
source "${EXPORT_DIR}/EXPORT_IMAGE"
|
||||
EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename "${EXPORT_DIR}")/rootfs
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
USE_QCOW2=0
|
||||
EXPORT_NAME="${IMG_FILENAME}${IMG_SUFFIX}"
|
||||
echo "------------------------------------------------------------------------"
|
||||
echo "Running export stage for ${EXPORT_NAME}"
|
||||
rm -f "${WORK_DIR}/export-image/${EXPORT_NAME}.img" || true
|
||||
rm -f "${WORK_DIR}/export-image/${EXPORT_NAME}.qcow2" || true
|
||||
rm -f "${WORK_DIR}/${EXPORT_NAME}.img" || true
|
||||
rm -f "${WORK_DIR}/${EXPORT_NAME}.qcow2" || true
|
||||
EXPORT_STAGE=$(basename "${EXPORT_DIR}")
|
||||
for s in $STAGE_LIST; do
|
||||
TMP_LIST=${TMP_LIST:+$TMP_LIST }$(basename "${s}")
|
||||
done
|
||||
FIRST_STAGE=${TMP_LIST%% *}
|
||||
FIRST_IMAGE="image-${FIRST_STAGE}.qcow2"
|
||||
|
||||
pushd "${WORK_DIR}" > /dev/null
|
||||
echo "Creating new base "${EXPORT_NAME}.qcow2" from ${FIRST_IMAGE}"
|
||||
cp "./${FIRST_IMAGE}" "${EXPORT_NAME}.qcow2"
|
||||
|
||||
ARR=($TMP_LIST)
|
||||
# rebase stage images to new export base
|
||||
for CURR_STAGE in "${ARR[@]}"; do
|
||||
if [ "${CURR_STAGE}" = "${FIRST_STAGE}" ]; then
|
||||
PREV_IMG="${EXPORT_NAME}"
|
||||
continue
|
||||
fi
|
||||
echo "Rebasing image-${CURR_STAGE}.qcow2 onto ${PREV_IMG}.qcow2"
|
||||
qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
|
||||
if [ "${CURR_STAGE}" = "${EXPORT_STAGE}" ]; then
|
||||
break
|
||||
fi
|
||||
PREV_IMG="image-${CURR_STAGE}"
|
||||
done
|
||||
|
||||
# commit current export stage into base export image
|
||||
echo "Committing image-${EXPORT_STAGE}.qcow2 to ${EXPORT_NAME}.qcow2"
|
||||
qemu-img commit -f qcow2 -p -b "${EXPORT_NAME}.qcow2" image-${EXPORT_STAGE}.qcow2
|
||||
|
||||
# rebase stage images back to original first stage for easy re-run
|
||||
for CURR_STAGE in "${ARR[@]}"; do
|
||||
if [ "${CURR_STAGE}" = "${FIRST_STAGE}" ]; then
|
||||
PREV_IMG="image-${CURR_STAGE}"
|
||||
continue
|
||||
fi
|
||||
echo "Rebasing back image-${CURR_STAGE}.qcow2 onto ${PREV_IMG}.qcow2"
|
||||
qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
|
||||
if [ "${CURR_STAGE}" = "${EXPORT_STAGE}" ]; then
|
||||
break
|
||||
fi
|
||||
PREV_IMG="image-${CURR_STAGE}"
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
mkdir -p "${WORK_DIR}/export-image/rootfs"
|
||||
mv "${WORK_DIR}/${EXPORT_NAME}.qcow2" "${WORK_DIR}/export-image/"
|
||||
echo "Mounting image ${WORK_DIR}/export-image/${EXPORT_NAME}.qcow2 to rootfs ${WORK_DIR}/export-image/rootfs"
|
||||
mount_qimage "${WORK_DIR}/export-image/${EXPORT_NAME}.qcow2" "${WORK_DIR}/export-image/rootfs"
|
||||
|
||||
CLEAN=0
|
||||
IMG_SUFFIX=$(cat ${EXPORT_DIR}/EXPORT_IMAGE)
|
||||
EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename ${EXPORT_DIR})/rootfs
|
||||
run_stage
|
||||
if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then
|
||||
STAGE_DIR=${BASE_DIR}/export-noobs
|
||||
run_stage
|
||||
CLEAN=1
|
||||
USE_QCOW2=1
|
||||
|
||||
else
|
||||
run_stage
|
||||
fi
|
||||
if [ "${USE_QEMU}" != "1" ]; then
|
||||
if [ -e "${EXPORT_DIR}/EXPORT_NOOBS" ]; then
|
||||
# shellcheck source=/dev/null
|
||||
source "${EXPORT_DIR}/EXPORT_NOOBS"
|
||||
STAGE_DIR="${BASE_DIR}/export-noobs"
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
USE_QCOW2=0
|
||||
run_stage
|
||||
USE_QCOW2=1
|
||||
else
|
||||
run_stage
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -x postrun.sh ]; then
|
||||
log "Begin postrun.sh"
|
||||
cd "${BASE_DIR}"
|
||||
./postrun.sh
|
||||
log "End postrun.sh"
|
||||
fi
|
||||
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
unload_qimage
|
||||
fi
|
||||
|
||||
log "End ${BASE_DIR}"
|
||||
|
|
|
|||
7
config
7
config
|
|
@ -1,7 +0,0 @@
|
|||
IMG_NAME="yunohost"
|
||||
RELEASE="bullseye"
|
||||
USE_QEMU="0"
|
||||
LOCALE_DEFAULT="en_US.UTF-8"
|
||||
TARGET_HOSTNAME="yunohost"
|
||||
KEYBOARD_KEYMAP="us"
|
||||
ENABLE_SSH="1"
|
||||
23
depends
23
depends
|
|
@ -1,23 +0,0 @@
|
|||
quilt
|
||||
parted
|
||||
realpath:coreutils
|
||||
qemu-arm-static:qemu-user-static
|
||||
debootstrap
|
||||
zerofree
|
||||
zip
|
||||
mkdosfs:dosfstools
|
||||
capsh:libcap2-bin
|
||||
bsdtar:libarchive-tools
|
||||
grep
|
||||
rsync
|
||||
xz:xz-utils
|
||||
curl
|
||||
xxd
|
||||
file
|
||||
git
|
||||
lsmod:kmod
|
||||
bc
|
||||
qemu-nbd:qemu-utils
|
||||
kpartx
|
||||
gpg
|
||||
pigz
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
version: '2'
|
||||
|
||||
services:
|
||||
apt-cacher-ng:
|
||||
restart: unless-stopped
|
||||
image: sameersbn/apt-cacher-ng:latest
|
||||
ports:
|
||||
- "3142:3142"
|
||||
volumes:
|
||||
- ./apt-cacher-ng:/var/cache/apt-cacher-ng
|
||||
|
|
@ -1,9 +1,13 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
|
||||
cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
|
||||
if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then
|
||||
mv ${ROOTFS_DIR}/etc/ld.so.preload ${ROOTFS_DIR}/etc/ld.so.preload.disabled
|
||||
fi
|
||||
|
||||
if [ -e "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
|
||||
mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
|
||||
if [ ! -e ${ROOTFS_DIR}/usr/sbin/policy-rc.d ]; then
|
||||
install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/
|
||||
fi
|
||||
|
||||
if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then
|
||||
cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
|
||||
fi
|
||||
|
|
|
|||
2
export-image/00-allow-rerun/files/policy-rc.d
Normal file
2
export-image/00-allow-rerun/files/policy-rc.d
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
exit 101
|
||||
9
export-image/01-set-sources/00-patches/0-sources.diff
Normal file
9
export-image/01-set-sources/00-patches/0-sources.diff
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
Index: export-jessie/rootfs/etc/apt/sources.list.d/raspi.list
|
||||
===================================================================
|
||||
--- export-jessie.orig/rootfs/etc/apt/sources.list.d/raspi.list
|
||||
+++ export-jessie/rootfs/etc/apt/sources.list.d/raspi.list
|
||||
@@ -1,3 +1,3 @@
|
||||
-deb http://archive.raspberrypi.org/debian/ jessie main ui staging
|
||||
+deb http://archive.raspberrypi.org/debian/ jessie main ui
|
||||
# Uncomment line below then 'apt-get update' to enable 'apt-get source'
|
||||
#deb-src http://archive.raspberrypi.org/debian/ jessie main ui
|
||||
1
export-image/01-set-sources/00-patches/series
Normal file
1
export-image/01-set-sources/00-patches/series
Normal file
|
|
@ -0,0 +1 @@
|
|||
0-sources.diff
|
||||
7
export-image/01-set-sources/01-run.sh
Executable file
7
export-image/01-set-sources/01-run.sh
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
on_chroot sh -e - <<EOF
|
||||
apt-get update
|
||||
apt-get -y dist-upgrade
|
||||
apt-get clean
|
||||
EOF
|
||||
|
|
@ -1 +0,0 @@
|
|||
userconf-pi
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
on_chroot << EOF
|
||||
SUDO_USER="${FIRST_USER_NAME}" rename-user -f -s
|
||||
EOF
|
||||
3
export-image/02-network/01-run.sh
Executable file
3
export-image/02-network/01-run.sh
Executable file
|
|
@ -0,0 +1,3 @@
|
|||
#/bin/bash -e
|
||||
|
||||
install -m 644 files/resolv.conf ${ROOTFS_DIR}/etc/
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
|
||||
find "${ROOTFS_DIR}/var/lib/apt/lists/" -type f -delete
|
||||
on_chroot << EOF
|
||||
apt-get update
|
||||
apt-get -y dist-upgrade
|
||||
apt-get clean
|
||||
EOF
|
||||
35
export-image/03-finalise/01-run.sh
Executable file
35
export-image/03-finalise/01-run.sh
Executable file
|
|
@ -0,0 +1,35 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
|
||||
|
||||
on_chroot sh -e - <<EOF
|
||||
/etc/init.d/fake-hwclock stop
|
||||
hardlink -t /usr/share/doc
|
||||
EOF
|
||||
|
||||
rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
|
||||
rm -f ${ROOTFS_DIR}/usr/sbin/policy-rc.d
|
||||
rm -f ${ROOTFS_DIR}/usr/bin/qemu-arm-static
|
||||
if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then
|
||||
mv ${ROOTFS_DIR}/etc/ld.so.preload.disabled ${ROOTFS_DIR}/etc/ld.so.preload
|
||||
fi
|
||||
|
||||
update_issue $(basename ${EXPORT_DIR})
|
||||
install -m 644 ${ROOTFS_DIR}/etc/rpi-issue ${ROOTFS_DIR}/boot/issue.txt
|
||||
install files/LICENSE.oracle ${ROOTFS_DIR}/boot/
|
||||
|
||||
ROOT_DEV=$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')
|
||||
|
||||
unmount ${ROOTFS_DIR}
|
||||
zerofree -v ${ROOT_DEV}
|
||||
|
||||
unmount_image ${IMG_FILE}
|
||||
|
||||
mkdir -p ${DEPLOY_DIR}
|
||||
|
||||
rm -f ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip
|
||||
|
||||
echo zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip ${IMG_FILE}
|
||||
pushd ${STAGE_WORK_DIR} > /dev/null
|
||||
zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE})
|
||||
popd > /dev/null
|
||||
72
export-image/03-finalise/files/LICENSE.oracle
Normal file
72
export-image/03-finalise/files/LICENSE.oracle
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
Taken from http://www.java.com/license
|
||||
|
||||
Oracle Binary Code License Agreement for the Java SE Platform Products and JavaFX
|
||||
|
||||
ORACLE AMERICA, INC. ("ORACLE"), FOR AND ON BEHALF OF ITSELF AND ITS SUBSIDIARIES AND AFFILIATES UNDER COMMON CONTROL, IS WILLING TO LICENSE THE SOFTWARE TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS BINARY CODE LICENSE AGREEMENT AND SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT"). PLEASE READ THE AGREEMENT CAREFULLY. BY SELECTING THE "ACCEPT LICENSE AGREEMENT" (OR THE EQUIVALENT) BUTTON AND/OR BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU ARE AGREEING TO THESE TERMS ON BEHALF OF A COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS. IF YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN SELECT THE "DECLINE LICENSE AGREEMENT" (OR THE EQUIVALENT) BUTTON AND YOU MUST NOT USE THE SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE SOFTWARE IS CONTAINED.
|
||||
|
||||
1. DEFINITIONS. "Software" means the software identified above in binary form that you selected for download, install or use (in the version You selected for download, install or use) from Oracle or its authorized licensees, any other machine readable materials (including, but not limited to, libraries, source files, header files, and data files), any updates or error corrections provided by Oracle, and any user manuals, programming guides and other documentation provided to you by Oracle under this Agreement. "General Purpose Desktop Computers and Servers" means computers, including desktop and laptop computers, or servers, used for general computing functions under end user control (such as but not specifically limited to email, general purpose Internet browsing, and office suite productivity tools). The use of Software in systems and solutions that provide dedicated functionality (other than as mentioned above) or designed for use in embedded or function-specific software applications, for example but not limited to: Software embedded in or bundled with industrial control systems, wireless mobile telephones, wireless handheld devices, kiosks, TV/STB, Blu-ray Disc devices, telematics and network control switching equipment, printers and storage management systems, and other related systems are excluded from this definition and not licensed under this Agreement. "Programs" means (a) Java technology applets and applications intended to run on the Java Platform, Standard Edition platform on Java-enabled General Purpose Desktop Computers and Servers; and (b) JavaFX technology applications intended to run on the JavaFX Runtime on JavaFX-enabled General Purpose Desktop Computers and Servers. “Commercial Features” means those features identified in Table 1-1 (Commercial Features In Java SE Product Editions) of the Java SE documentation accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html. “README File” means the README file for the Software accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html.
|
||||
|
||||
2. LICENSE TO USE. Subject to the terms and conditions of this Agreement including, but not limited to, the Java Technology Restrictions of the Supplemental License Terms, Oracle grants you a non-exclusive, non-transferable, limited license without license fees to reproduce and use internally the Software complete and unmodified for the sole purpose of running Programs. THE LICENSE SET FORTH IN THIS SECTION 2 DOES NOT EXTEND TO THE COMMERCIAL FEATURES. YOUR RIGHTS AND OBLIGATIONS RELATED TO THE COMMERCIAL FEATURES ARE AS SET FORTH IN THE SUPPLEMENTAL TERMS ALONG WITH ADDITIONAL LICENSES FOR DEVELOPERS AND PUBLISHERS.
|
||||
|
||||
3. RESTRICTIONS. Software is copyrighted. Title to Software and all associated intellectual property rights is retained by Oracle and/or its licensors. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software. You acknowledge that the Software is developed for general use in a variety of information management applications; it is not developed or intended for use in any inherently dangerous applications, including applications that may create a risk of personal injury. If you use the Software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure its safe use. Oracle disclaims any express or implied warranty of fitness for such uses. No right, title or interest in or to any trademark, service mark, logo or trade name of Oracle or its licensors is granted under this Agreement. Additional restrictions for developers and/or publishers licenses are set forth in the Supplemental License Terms.
|
||||
|
||||
4. DISCLAIMER OF WARRANTY. THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
|
||||
|
||||
5. LIMITATION OF LIABILITY. IN NO EVENT SHALL ORACLE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ORACLE'S ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).
|
||||
|
||||
6. TERMINATION. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of Software. This Agreement will terminate immediately without notice from Oracle if you fail to comply with any provision of this Agreement. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. Upon termination, you must destroy all copies of Software.
|
||||
|
||||
7. EXPORT REGULATIONS. You agree that U.S. export control laws and other applicable export and import laws govern your use of the Software, including technical data; additional information can be found on Oracle's Global Trade Compliance web site (http://www.oracle.com/products/export). You agree that neither the Software nor any direct product thereof will be exported, directly, or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation.
|
||||
|
||||
8. TRADEMARKS AND LOGOS. You acknowledge and agree as between you
|
||||
and Oracle that Oracle owns the ORACLE and JAVA trademarks and all ORACLE- and JAVA-related trademarks, service marks, logos and other brand
|
||||
designations ("Oracle Marks"), and you agree to comply with the Third
|
||||
Party Usage Guidelines for Oracle Trademarks currently located at
|
||||
http://www.oracle.com/us/legal/third-party-trademarks/index.html . Any use you make of the Oracle Marks inures to Oracle's benefit.
|
||||
|
||||
9. U.S. GOVERNMENT LICENSE RIGHTS. If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation shall be only those set forth in this Agreement.
|
||||
|
||||
10. GOVERNING LAW. This agreement is governed by the substantive and procedural laws of California. You and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts of San Francisco, or Santa Clara counties in California in any dispute arising out of or relating to this agreement.
|
||||
|
||||
11. SEVERABILITY. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
|
||||
|
||||
12. INTEGRATION. This Agreement is the entire agreement between you and Oracle relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
|
||||
|
||||
SUPPLEMENTAL LICENSE TERMS
|
||||
|
||||
These Supplemental License Terms add to or modify the terms of the Binary Code License Agreement. Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Binary Code License Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Binary Code License Agreement, or in any license contained within the Software.
|
||||
|
||||
A. COMMERCIAL FEATURES. You may not use the Commercial Features for running Programs, Java applets or applications in your internal business operations or for any commercial or production purpose, or for any purpose other than as set forth in Sections B, C, D and E of these Supplemental Terms. If You want to use the Commercial Features for any purpose other than as permitted in this Agreement, You must obtain a separate license from Oracle.
|
||||
|
||||
B. SOFTWARE INTERNAL USE FOR DEVELOPMENT LICENSE GRANT. Subject to the terms and conditions of this Agreement and restrictions and exceptions set forth in the README File incorporated herein by reference, including, but not limited to the Java Technology Restrictions of these Supplemental Terms, Oracle grants you a non-exclusive, non-transferable, limited license without fees to reproduce internally and use internally the Software complete and unmodified for the purpose of designing, developing, and testing your Programs.
|
||||
|
||||
C. LICENSE TO DISTRIBUTE SOFTWARE. Subject to the terms and conditions of this Agreement and restrictions and exceptions set forth in the README File, including, but not limited to the Java Technology Restrictions and Limitations on Redistribution of these Supplemental Terms, Oracle grants you a non-exclusive, non-transferable, limited license without fees to reproduce and distribute the Software, provided that (i) you distribute the Software complete and unmodified and only bundled as part of, and for the sole purpose of running, your Programs, (ii) the Programs add significant and primary functionality to the Software, (iii) you do not distribute additional software intended to replace any component(s) of the Software, (iv) you do not remove or alter any proprietary legends or notices contained in the Software, (v) you only distribute the Software subject to a license agreement that: (a) is a complete, unmodified reproduction of this Agreement; or (b) protects Oracle's interests consistent with the terms contained in this Agreement and that includes the notice set forth in Section H, and (vi) you agree to defend and indemnify Oracle and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. The license set forth in this Section C does not extend to the Software identified in Section G.
|
||||
|
||||
D. LICENSE TO DISTRIBUTE REDISTRIBUTABLES. Subject to the terms and conditions of this Agreement and restrictions and exceptions set forth in the README File, including but not limited to the Java Technology Restrictions and Limitations on Redistribution of these Supplemental Terms, Oracle grants you a non-exclusive, non-transferable, limited license without fees to reproduce and distribute those files specifically identified as redistributable in the README File ("Redistributables") provided that: (i) you distribute the Redistributables complete and unmodified, and only bundled as part of Programs, (ii) the Programs add significant and primary functionality to the Redistributables, (iii) you do not distribute additional software intended to supersede any component(s) of the Redistributables (unless otherwise specified in the applicable README File), (iv) you do not remove or alter any proprietary legends or notices contained in or on the Redistributables, (v) you only distribute the Redistributables pursuant to a license agreement that: (a) is a complete, unmodified reproduction of this Agreement; or (b) protects Oracle's interests consistent with the terms contained in the Agreement and includes the notice set forth in Section H, (vi) you agree to defend and indemnify Oracle and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. The license set forth in this Section D does not extend to the Software identified in Section G.
|
||||
|
||||
E. DISTRIBUTION BY PUBLISHERS. This section pertains to your distribution of the JavaTM SE Development Kit Software (“JDK”) with your printed book or magazine (as those terms are commonly used in the industry) relating to Java technology ("Publication"). Subject to and conditioned upon your compliance with the restrictions and obligations contained in the Agreement, Oracle hereby grants to you a non-exclusive, nontransferable limited right to reproduce complete and unmodified copies of the JDK on electronic media (the "Media") for the sole purpose of inclusion and distribution with your Publication(s), subject to the following terms: (i) You may not distribute the JDK on a stand-alone basis; it must be distributed with your Publication(s); (ii) You are responsible for downloading the JDK from the applicable Oracle web site; (iii) You must refer to the JDK as JavaTM SE Development Kit; (iv) The JDK must be reproduced in its entirety and without any modification whatsoever (including with respect to all proprietary notices) and distributed with your Publication subject to a license agreement that is a complete, unmodified reproduction of this Agreement; (v) The Media label shall include the following information: “Copyright [YEAR], Oracle America, Inc. All rights reserved. Use is subject to license terms. ORACLE and JAVA trademarks and all ORACLE- and JAVA-related trademarks, service marks, logos and other brand designations are trademarks or registered trademarks of Oracle in the U.S. and other countries.” [YEAR] is the year of Oracle's release of the Software; the year information can typically be found in the Software’s “About” box or screen. This information must be placed on the Media label in such a manner as to only apply to the JDK; (vi) You must clearly identify the JDK as Oracle's product on the Media holder or Media label, and you may not state or imply that Oracle is responsible for any third-party software contained on the Media; (vii) You may not include any third party software on the Media which is intended to be a replacement or substitute for the JDK; (viii) You agree to defend and indemnify Oracle and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of the JDK and/or the Publication; ; and (ix) You shall provide Oracle with a written notice for each Publication; such notice shall include the following information: (1) title of Publication, (2) author(s), (3) date of Publication, and (4) ISBN or ISSN numbers. Such notice shall be sent to Oracle America, Inc., 500 Oracle Parkway, Redwood Shores, California 94065 U.S.A , Attention: General Counsel.
|
||||
|
||||
F. JAVA TECHNOLOGY RESTRICTIONS. You may not create, modify, or change the behavior of, or authorize your licensees to create, modify, or change the behavior of, classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun", “oracle” or similar convention as specified by Oracle in any naming convention designation.
|
||||
|
||||
G. LIMITATIONS ON REDISTRIBUTION. You may not redistribute or otherwise transfer patches, bug fixes or updates made available by Oracle through Oracle Premier Support, including those made available under Oracle's Java SE Support program.
|
||||
|
||||
H. COMMERCIAL FEATURES NOTICE. For purpose of complying with Supplemental Term Section C.(v)(b) and D.(v)(b), your license agreement shall include the following notice, where the notice is displayed in a manner that anyone using the Software will see the notice:
|
||||
|
||||
Use of the Commercial Features for any commercial or production purpose requires a separate license from Oracle. “Commercial Features” means those features identified Table 1-1 (Commercial Features In Java SE Product Editions) of the Java SE documentation accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html
|
||||
|
||||
|
||||
|
||||
I. SOURCE CODE. Software may contain source code that, unless expressly licensed for other purposes, is provided solely for reference purposes pursuant to the terms of this Agreement. Source code may not be redistributed unless expressly provided for in this Agreement.
|
||||
|
||||
J. THIRD PARTY CODE. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME file accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html. In addition to any terms and conditions of any third party opensource/freeware license identified in the THIRDPARTYLICENSEREADME file, the disclaimer of warranty and limitation of liability provisions in paragraphs 4 and 5 of the Binary Code License Agreement shall apply to all Software in this distribution.
|
||||
|
||||
K. TERMINATION FOR INFRINGEMENT. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
|
||||
|
||||
L. INSTALLATION AND AUTO-UPDATE. The Software's installation and auto-update processes transmit a limited amount of data to Oracle (or its service provider) about those specific processes to help Oracle understand and optimize them. Oracle does not associate the data with personally identifiable information. You can find more information about the data Oracle collects as a result of your Software download at http://www.oracle.com/technetwork/java/javase/documentation/index.html.
|
||||
|
||||
For inquiries please contact: Oracle America, Inc., 500 Oracle Parkway,
|
||||
|
||||
Redwood Shores, California 94065, USA.
|
||||
|
||||
Last updated 02 April 2013
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -m 644 files/resolv.conf "${ROOTFS_DIR}/etc/"
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
if [ "${NO_PRERUN_QCOW2}" = "0" ]; then
|
||||
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
|
||||
|
||||
IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
|
||||
|
||||
BOOT_PARTUUID="${IMGID}-01"
|
||||
ROOT_PARTUUID="${IMGID}-02"
|
||||
|
||||
sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
|
||||
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/boot/cmdline.txt"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
|
||||
INFO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.info"
|
||||
|
||||
on_chroot << EOF
|
||||
if [ -x /etc/init.d/fake-hwclock ]; then
|
||||
/etc/init.d/fake-hwclock stop
|
||||
fi
|
||||
if hash hardlink 2>/dev/null; then
|
||||
hardlink -t /usr/share/doc
|
||||
fi
|
||||
EOF
|
||||
|
||||
if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then
|
||||
chmod 700 "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config"
|
||||
fi
|
||||
|
||||
rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
|
||||
|
||||
if [ "${USE_QEMU}" != "1" ]; then
|
||||
if [ -e "${ROOTFS_DIR}/etc/ld.so.preload.disabled" ]; then
|
||||
mv "${ROOTFS_DIR}/etc/ld.so.preload.disabled" "${ROOTFS_DIR}/etc/ld.so.preload"
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -f "${ROOTFS_DIR}/etc/network/interfaces.dpkg-old"
|
||||
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/trusted.gpg~"
|
||||
|
||||
rm -f "${ROOTFS_DIR}/etc/passwd-"
|
||||
rm -f "${ROOTFS_DIR}/etc/group-"
|
||||
rm -f "${ROOTFS_DIR}/etc/shadow-"
|
||||
rm -f "${ROOTFS_DIR}/etc/gshadow-"
|
||||
rm -f "${ROOTFS_DIR}/etc/subuid-"
|
||||
rm -f "${ROOTFS_DIR}/etc/subgid-"
|
||||
|
||||
rm -f "${ROOTFS_DIR}"/var/cache/debconf/*-old
|
||||
rm -f "${ROOTFS_DIR}"/var/lib/dpkg/*-old
|
||||
|
||||
rm -f "${ROOTFS_DIR}"/usr/share/icons/*/icon-theme.cache
|
||||
|
||||
rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id"
|
||||
|
||||
true > "${ROOTFS_DIR}/etc/machine-id"
|
||||
|
||||
ln -nsf /proc/mounts "${ROOTFS_DIR}/etc/mtab"
|
||||
|
||||
find "${ROOTFS_DIR}/var/log/" -type f -exec cp /dev/null {} \;
|
||||
|
||||
rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
|
||||
rm -f "${ROOTFS_DIR}/etc/vnc/updateid"
|
||||
|
||||
update_issue "$(basename "${EXPORT_DIR}")"
|
||||
install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt"
|
||||
|
||||
cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
|
||||
|
||||
|
||||
{
|
||||
if [ -f "$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" ]; then
|
||||
firmware=$(zgrep "firmware as of" \
|
||||
"$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
|
||||
head -n1 | sed -n 's|.* \([^ ]*\)$|\1|p')
|
||||
printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware"
|
||||
|
||||
kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")"
|
||||
printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel"
|
||||
|
||||
uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")"
|
||||
printf "Uname string: %s\n" "$uname"
|
||||
fi
|
||||
|
||||
printf "\nPackages:\n"
|
||||
dpkg -l --root "$ROOTFS_DIR"
|
||||
} >> "$INFO_FILE"
|
||||
|
||||
mkdir -p "${DEPLOY_DIR}"
|
||||
|
||||
rm -f "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.*"
|
||||
rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
|
||||
|
||||
mv "$INFO_FILE" "$DEPLOY_DIR/"
|
||||
|
||||
if [ "${USE_QCOW2}" = "0" ] && [ "${NO_PRERUN_QCOW2}" = "0" ]; then
|
||||
ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')"
|
||||
|
||||
unmount "${ROOTFS_DIR}"
|
||||
zerofree "${ROOT_DEV}"
|
||||
|
||||
unmount_image "${IMG_FILE}"
|
||||
else
|
||||
unload_qimage
|
||||
make_bootable_image "${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.qcow2" "$IMG_FILE"
|
||||
fi
|
||||
|
||||
case "${DEPLOY_COMPRESSION}" in
|
||||
zip)
|
||||
pushd "${STAGE_WORK_DIR}" > /dev/null
|
||||
zip -"${COMPRESSION_LEVEL}" \
|
||||
"${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.zip" "$(basename "${IMG_FILE}")"
|
||||
popd > /dev/null
|
||||
;;
|
||||
gz)
|
||||
pigz --force -"${COMPRESSION_LEVEL}" "$IMG_FILE" --stdout > \
|
||||
"${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.img.gz"
|
||||
;;
|
||||
xz)
|
||||
xz --compress --force --threads 0 --memlimit-compress=50% -"${COMPRESSION_LEVEL}" \
|
||||
--stdout "$IMG_FILE" > "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.img.xz"
|
||||
;;
|
||||
none | *)
|
||||
cp "$IMG_FILE" "$DEPLOY_DIR/"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,87 +1,48 @@
|
|||
#!/bin/bash -e
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
|
||||
|
||||
if [ "${NO_PRERUN_QCOW2}" = "0" ]; then
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
|
||||
unmount_image ${IMG_FILE}
|
||||
|
||||
unmount_image "${IMG_FILE}"
|
||||
rm -f ${IMG_FILE}
|
||||
|
||||
rm -f "${IMG_FILE}"
|
||||
rm -rf ${ROOTFS_DIR}
|
||||
mkdir -p ${ROOTFS_DIR}
|
||||
|
||||
rm -rf "${ROOTFS_DIR}"
|
||||
mkdir -p "${ROOTFS_DIR}"
|
||||
BOOT_SIZE=$(du -sh ${EXPORT_ROOTFS_DIR}/boot -B M | cut -f 1 | tr -d M)
|
||||
TOTAL_SIZE=$(du -sh ${EXPORT_ROOTFS_DIR} -B M | cut -f 1 | tr -d M)
|
||||
|
||||
BOOT_SIZE="$((256 * 1024 * 1024))"
|
||||
ROOT_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --exclude boot --block-size=1 | cut -f 1)
|
||||
IMG_SIZE=$(expr $BOOT_SIZE \* 2 \+ $TOTAL_SIZE \+ 512)M
|
||||
|
||||
# All partition sizes and starts will be aligned to this size
|
||||
ALIGN="$((4 * 1024 * 1024))"
|
||||
# Add this much space to the calculated file size. This allows for
|
||||
# some overhead (since actual space usage is usually rounded up to the
|
||||
# filesystem block size) and gives some free space on the resulting
|
||||
# image.
|
||||
ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)"
|
||||
fallocate -l ${IMG_SIZE} ${IMG_FILE}
|
||||
fdisk ${IMG_FILE} > /dev/null 2>&1 <<EOF
|
||||
o
|
||||
n
|
||||
|
||||
BOOT_PART_START=$((ALIGN))
|
||||
BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN))
|
||||
ROOT_PART_START=$((BOOT_PART_START + BOOT_PART_SIZE))
|
||||
ROOT_PART_SIZE=$(((ROOT_SIZE + ROOT_MARGIN + ALIGN - 1) / ALIGN * ALIGN))
|
||||
IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE))
|
||||
|
||||
truncate -s "${IMG_SIZE}" "${IMG_FILE}"
|
||||
8192
|
||||
+`expr $BOOT_SIZE \* 3`M
|
||||
p
|
||||
t
|
||||
c
|
||||
n
|
||||
|
||||
parted --script "${IMG_FILE}" mklabel msdos
|
||||
parted --script "${IMG_FILE}" unit B mkpart primary fat32 "${BOOT_PART_START}" "$((BOOT_PART_START + BOOT_PART_SIZE - 1))"
|
||||
parted --script "${IMG_FILE}" unit B mkpart primary ext4 "${ROOT_PART_START}" "$((ROOT_PART_START + ROOT_PART_SIZE - 1))"
|
||||
|
||||
PARTED_OUT=$(parted -sm "${IMG_FILE}" unit b print)
|
||||
BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 2 | tr -d B)
|
||||
BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 4 | tr -d B)
|
||||
8192
|
||||
|
||||
ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 2 | tr -d B)
|
||||
ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 4 | tr -d B)
|
||||
|
||||
echo "Mounting BOOT_DEV..."
|
||||
cnt=0
|
||||
until BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}"); do
|
||||
if [ $cnt -lt 5 ]; then
|
||||
cnt=$((cnt + 1))
|
||||
echo "Error in losetup for BOOT_DEV. Retrying..."
|
||||
sleep 5
|
||||
else
|
||||
echo "ERROR: losetup for BOOT_DEV failed; exiting"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
p
|
||||
w
|
||||
EOF
|
||||
|
||||
echo "Mounting ROOT_DEV..."
|
||||
cnt=0
|
||||
until ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}"); do
|
||||
if [ $cnt -lt 5 ]; then
|
||||
cnt=$((cnt + 1))
|
||||
echo "Error in losetup for ROOT_DEV. Retrying..."
|
||||
sleep 5
|
||||
else
|
||||
echo "ERROR: losetup for ROOT_DEV failed; exiting"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
LOOP_DEV=`kpartx -asv ${IMG_FILE} | grep -E -o -m1 'loop[[:digit:]]+' | head -n 1`
|
||||
BOOT_DEV=/dev/mapper/${LOOP_DEV}p1
|
||||
ROOT_DEV=/dev/mapper/${LOOP_DEV}p2
|
||||
|
||||
echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
|
||||
echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH"
|
||||
mkdosfs -n boot -S 512 -s 16 -v $BOOT_DEV > /dev/null
|
||||
mkfs.ext4 -O ^huge_file $ROOT_DEV > /dev/null
|
||||
|
||||
ROOT_FEATURES="^huge_file"
|
||||
for FEATURE in metadata_csum 64bit; do
|
||||
if grep -q "$FEATURE" /etc/mke2fs.conf; then
|
||||
ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES"
|
||||
fi
|
||||
done
|
||||
mkdosfs -n boot -F 32 -v "$BOOT_DEV" > /dev/null
|
||||
mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
|
||||
mount -v $ROOT_DEV ${ROOTFS_DIR} -t ext4
|
||||
mkdir -p ${ROOTFS_DIR}/boot
|
||||
mount -v $BOOT_DEV ${ROOTFS_DIR}/boot -t vfat
|
||||
|
||||
mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
|
||||
mkdir -p "${ROOTFS_DIR}/boot"
|
||||
mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat
|
||||
|
||||
rsync -aHAXx --exclude /var/cache/apt/archives --exclude /boot "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
|
||||
rsync -rtx "${EXPORT_ROOTFS_DIR}/boot/" "${ROOTFS_DIR}/boot/"
|
||||
fi
|
||||
rsync ${EXPORT_ROOTFS_DIR}/ ${ROOTFS_DIR}/ -aHAX
|
||||
|
|
|
|||
|
|
@ -1,48 +1,31 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_NAME}${IMG_SUFFIX}"
|
||||
NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
|
||||
|
||||
install -v -m 744 files/partition_setup.sh "${NOOBS_DIR}/"
|
||||
install -v files/partitions.json "${NOOBS_DIR}/"
|
||||
install -v files/os.json "${NOOBS_DIR}/"
|
||||
install -v files/OS.png "${NOOBS_DIR}/"
|
||||
install -v files/release_notes.txt "${NOOBS_DIR}/"
|
||||
install -v -m 744 files/partition_setup.sh ${NOOBS_DIR}/
|
||||
install -v files/partitions.json ${NOOBS_DIR}/
|
||||
install -v files/os.json ${NOOBS_DIR}/
|
||||
install -v files/Raspbian.png ${NOOBS_DIR}/
|
||||
install -v files/release_notes.txt ${NOOBS_DIR}/
|
||||
|
||||
tar -v -c -C files/marketing -f "${NOOBS_DIR}/marketing.tar" .
|
||||
tar -v -c -C files/marketing -f ${NOOBS_DIR}/marketing.tar .
|
||||
|
||||
BOOT_SHASUM="$(sha256sum "${NOOBS_DIR}/boot.tar.xz" | cut -f1 -d' ')"
|
||||
ROOT_SHASUM="$(sha256sum "${NOOBS_DIR}/root.tar.xz" | cut -f1 -d' ')"
|
||||
BOOT_SIZE=$(xz --robot -l ${NOOBS_DIR}/boot.tar.xz | grep totals | cut -f 5)
|
||||
ROOT_SIZE=$(xz --robot -l ${NOOBS_DIR}/root.tar.xz | grep totals | cut -f 5)
|
||||
|
||||
BOOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/boot.tar.xz" | grep totals | cut -f 5)"
|
||||
ROOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/root.tar.xz" | grep totals | cut -f 5)"
|
||||
BOOT_SIZE=$(expr ${BOOT_SIZE} / 1000000 \+ 1)
|
||||
ROOT_SIZE=$(expr ${ROOT_SIZE} / 1000000 \+ 1)
|
||||
|
||||
BOOT_SIZE="$(( BOOT_SIZE / 1024 / 1024 + 1))"
|
||||
ROOT_SIZE="$(( ROOT_SIZE / 1024 / 1024 + 1))"
|
||||
BOOT_NOM=$(expr ${BOOT_SIZE} \* 3)
|
||||
ROOT_NOM=$(expr ${ROOT_SIZE} \+ 400)
|
||||
|
||||
BOOT_NOM="256"
|
||||
ROOT_NOM="$(echo "$ROOT_SIZE" | awk '{printf "%.0f", (($1 + 400) * 1.2) + 0.5 }')"
|
||||
sed ${NOOBS_DIR}/partitions.json -i -e "s|BOOT_SIZE|${BOOT_SIZE}|"
|
||||
sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_SIZE|${ROOT_SIZE}|"
|
||||
|
||||
mv "${NOOBS_DIR}/OS.png" "${NOOBS_DIR}/${NOOBS_NAME// /_}.png"
|
||||
sed ${NOOBS_DIR}/partitions.json -i -e "s|BOOT_NOM|${BOOT_NOM}|"
|
||||
sed ${NOOBS_DIR}/partitions.json -i -e "s|ROOT_NOM|${ROOT_NOM}|"
|
||||
|
||||
sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SHASUM|${BOOT_SHASUM}|"
|
||||
sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SHASUM|${ROOT_SHASUM}|"
|
||||
sed ${NOOBS_DIR}/release_notes.txt -i -e "s|UNRELEASED|${IMG_DATE}|"
|
||||
sed ${NOOBS_DIR}/os.json -i -e "s|UNRELEASED|${IMG_DATE}|"
|
||||
|
||||
sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SIZE|${BOOT_SIZE}|"
|
||||
sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SIZE|${ROOT_SIZE}|"
|
||||
|
||||
sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_NOM|${BOOT_NOM}|"
|
||||
sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_NOM|${ROOT_NOM}|"
|
||||
|
||||
sed "${NOOBS_DIR}/os.json" -i -e "s|UNRELEASED|${IMG_DATE}|"
|
||||
sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_NAME|${NOOBS_NAME}|"
|
||||
sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_DESCRIPTION|${NOOBS_DESCRIPTION}|"
|
||||
sed "${NOOBS_DIR}/os.json" -i -e "s|RELEASE|${RELEASE}|"
|
||||
sed "${NOOBS_DIR}/os.json" -i -e "s|KERNEL|$(cat "${STAGE_WORK_DIR}/kernel_version")|"
|
||||
|
||||
sed "${NOOBS_DIR}/release_notes.txt" -i -e "s|UNRELEASED|${IMG_DATE}|"
|
||||
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
mv "${NOOBS_DIR}" "${DEPLOY_DIR}/"
|
||||
else
|
||||
cp -a "${NOOBS_DIR}" "${DEPLOY_DIR}/"
|
||||
fi
|
||||
cp -a ${NOOBS_DIR} ${DEPLOY_DIR}/
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
BIN
export-noobs/00-release/files/Raspbian.png
Normal file
BIN
export-noobs/00-release/files/Raspbian.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -1,17 +1,18 @@
|
|||
{
|
||||
"description": "NOOBS_DESCRIPTION",
|
||||
"kernel": "KERNEL",
|
||||
"name": "NOOBS_NAME",
|
||||
"description": "A community-created port of Debian jessie for the Raspberry Pi",
|
||||
"feature_level": 35120124,
|
||||
"kernel": "4.4",
|
||||
"name": "Raspbian",
|
||||
"password": "raspberry",
|
||||
"release_date": "UNRELEASED",
|
||||
"supported_hex_revisions": "2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,1040,1041,0092,0093,2082",
|
||||
"supported_models": [
|
||||
"Pi Zero 2",
|
||||
"Pi 3",
|
||||
"Pi 4",
|
||||
"Pi Compute Module 3",
|
||||
"Pi Compute Module 4"
|
||||
"Pi Model",
|
||||
"Pi 2",
|
||||
"Pi Zero",
|
||||
"Pi 3"
|
||||
],
|
||||
"url": "http://www.raspbian.org/",
|
||||
"username": "pi",
|
||||
"version": "RELEASE"
|
||||
"version": "jessie"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
#!/bin/sh
|
||||
#supports_backup in PINN
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
if [ -z "$part1" ] || [ -z "$part2" ]; then
|
||||
printf "Error: missing environment variable part1 or part2\n" 1>&2
|
||||
exit 1
|
||||
|
|
@ -14,32 +12,12 @@ mkdir -p /tmp/1 /tmp/2
|
|||
mount "$part1" /tmp/1
|
||||
mount "$part2" /tmp/2
|
||||
|
||||
sed /tmp/1/cmdline.txt -i -e "s|root=[^ ]*|root=${part2}|"
|
||||
sed /tmp/2/etc/fstab -i -e "s|^[^#].* / |${part2} / |"
|
||||
sed /tmp/2/etc/fstab -i -e "s|^[^#].* /boot |${part1} /boot |"
|
||||
sed /tmp/1/cmdline.txt -i -e "s|root=/dev/[^ ]*|root=${part2}|"
|
||||
sed /tmp/2/etc/fstab -i -e "s|^.* / |${part2} / |"
|
||||
sed /tmp/2/etc/fstab -i -e "s|^.* /boot |${part1} /boot |"
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
if [ -z "$restore" ]; then
|
||||
if [ -f /mnt/ssh ]; then
|
||||
cp /mnt/ssh /tmp/1/
|
||||
fi
|
||||
|
||||
if [ -f /mnt/ssh.txt ]; then
|
||||
cp /mnt/ssh.txt /tmp/1/
|
||||
fi
|
||||
|
||||
if [ -f /settings/wpa_supplicant.conf ]; then
|
||||
cp /settings/wpa_supplicant.conf /tmp/1/
|
||||
fi
|
||||
|
||||
if ! grep -q resize /proc/cmdline; then
|
||||
if ! grep -q splash /tmp/1/cmdline.txt; then
|
||||
sed -i "s| quiet||g" /tmp/1/cmdline.txt
|
||||
fi
|
||||
sed -i 's| init=/usr/lib/raspi-config/init_resize.sh||' /tmp/1/cmdline.txt
|
||||
else
|
||||
sed -i '1 s|.*|& sdhci.debug_quirks2=4|' /tmp/1/cmdline.txt
|
||||
fi
|
||||
if ! grep -q resize /proc/cmdline; then
|
||||
sed -i 's/ quiet init=.*$//' /tmp/1/cmdline.txt
|
||||
fi
|
||||
|
||||
umount /tmp/1
|
||||
|
|
|
|||
|
|
@ -3,11 +3,9 @@
|
|||
{
|
||||
"filesystem_type": "FAT",
|
||||
"label": "boot",
|
||||
"mkfs_options": "-F 32",
|
||||
"partition_size_nominal": BOOT_NOM,
|
||||
"uncompressed_tarball_size": BOOT_SIZE,
|
||||
"want_maximised": false,
|
||||
"sha256sum": "BOOT_SHASUM"
|
||||
"want_maximised": false
|
||||
},
|
||||
{
|
||||
"filesystem_type": "ext4",
|
||||
|
|
@ -15,8 +13,7 @@
|
|||
"mkfs_options": "-O ^huge_file",
|
||||
"partition_size_nominal": ROOT_NOM,
|
||||
"uncompressed_tarball_size": ROOT_SIZE,
|
||||
"want_maximised": true,
|
||||
"sha256sum": "ROOT_SHASUM"
|
||||
"want_maximised": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,588 +1,4 @@
|
|||
UNRELEASED:
|
||||
*
|
||||
2022-04-04:
|
||||
* Default "pi” user has been removed; the first-boot wizard enforces the creation of a new user account
|
||||
* rename-user script added to allow existing users to be renamed by temporarily rebooting to cut-down first-boot wizard
|
||||
* Overscan now managed by xrandr under KMS, can be set independently for both monitors, and takes effect on the fly rather than requiring reboot
|
||||
* GTK3 switch control now used in place of paired radio buttons throughout
|
||||
* piwiz - first-boot wizard now runs in a separate session as a different user with different graphics
|
||||
* piwiz - first-boot wizard now has automatic pairing for discoverable Bluetooth mice and keyboards
|
||||
* lxinput - keyboard delay and repeat settings now persist across reboots under mutter
|
||||
* raspi-config / rc_gui - removed pixel doubling option when KMS driver in use
|
||||
* raspi-config - removed composition manager option when legacy driver in use
|
||||
* arandr - restored support for interlaced displays
|
||||
* mutter - implemented more intuitive window and application cycling behaviour
|
||||
* pi-greeter - rebuilt for GTK3
|
||||
* Bug fix - graphical corruption in system tray icons
|
||||
* Bug fix - desktop items vanishing when dragged
|
||||
* Bug fix - terminal windows not focussed correctly when launched
|
||||
* Bug fix - crash after multiple update checks in updater plugin
|
||||
* Bug fix - Raspberry Pi keyboard auto-detect by wizard was broken in previous release
|
||||
* Bug fix - spurious "connected” dialog box shown when reconnecting to Bluetooth LE devices on boot
|
||||
* Support for experimental Wayland backend added - can be enabled as an advanced option in raspi-config
|
||||
* Various small bug fixes and graphical tweaks
|
||||
* Chromium upgraded to version 98.0.4758.106
|
||||
* FFmpeg HW acceleration improved
|
||||
* OpenJDK 17 now defaults to 'client' JVM for ARMv6 compatibility
|
||||
* Raspberry Pi firmware 69277bc713133a54a1d20554d79544da1ae2b6ca
|
||||
* Linux kernel 5.15.30
|
||||
2022-01-28:
|
||||
* Policykit CVE-2021-4034 fix
|
||||
* rc_gui - add combo box to allow resolution to be set for VNC connections
|
||||
* rc_gui - camera interface switch removed
|
||||
* lxpanel - remove appearance settings from preferences dialog; instead add menu option to open general Appearance Settings application
|
||||
* lxpanel - add ellipses to menu items which open dialogs
|
||||
* lxinput - read current mouse acceleration directly from xinput
|
||||
* lxinput - use device IDs rather than names to cope with devices changing when powered-down
|
||||
* lxinput - remove redundant changes to openbox config file
|
||||
* plymouth - set KillMode to mixed to suppress warning message
|
||||
* raspi-config - add option to switch composite video
|
||||
* raspi-config - add option to switch to legacy camera mode
|
||||
* raspi-config - add option to set resolution for headless connections
|
||||
* raspberrypi-ui-mods - disable mutter when VNC server is running and fall back to openbox
|
||||
* pipanel - add command-line option to open on arbitrary tab
|
||||
* lxplug-network - suppress ’scan received’ logging message
|
||||
* raspberrypi-ui-mods - set hover colour for taskbar items based on taskbar colour, not system highlight colour
|
||||
* Legacy camera applications and libraries reinstalled (32-bit only)
|
||||
* Bug fix - lxinput - lxsession config file not being written on first attempt
|
||||
* Bug fix - lxinput - set timer for file write to prevent slider slowing down
|
||||
* Bug fix - lxinput - write values to gsettings as well as xinput and xsettings to take effect within mutter
|
||||
* Bug fix - lxinput - fix failure to parse and write non-English numeric formats
|
||||
* Bug fix - arandr - various fixes to parsing of non-standard EDID blocks to enable model and serial to be correctly extracted
|
||||
* Bug fix - arandr - refresh rate calculated to 3 decimal places for monitors which require it
|
||||
* Bug fix - arandr - enable setting of left and right orientation
|
||||
* Bug fix - arandr - add compatibility with new touchscreen driver
|
||||
* Bug fix - arandr - apply settings correctly to DSI and composite displays
|
||||
* Bug fix - lxplug-magnifier - fix crash when opening preferences without required magnifier package installed
|
||||
* Bug fix - piwiz - launch screen reader install prompt as a new process to prevent audio lockups crashing wizard
|
||||
* Bug fix - lxpanel - not loading some plugins (cpufreq, minimise all windows) due to icon loading code not compatible with GTK+3
|
||||
* Bug fix - gtk+3 - disabled new GDK touch events to enable double-clicks to be detected on touchscreen
|
||||
* Bug fix - xrdp - included backports from bookworm version of xrdp and xorgxrdp to restore window frames with mutter over xrdp connections
|
||||
* Update various translations
|
||||
* udisks2 added to lite image
|
||||
* mkvtoolnix added to lite image
|
||||
* 7z and zip support added to lite image
|
||||
* gnome-keyring added to desktop images
|
||||
* Raspberry Pi firmware c6d56567ff6ef17fd85159770f22abcf2c5953ed
|
||||
* Linux kernel 5.10.92
|
||||
2021-10-30:
|
||||
* Based on Debian version 11 (bullseye)
|
||||
* Desktop components (lxpanel and all plugins, libfm, pcmanfm) now built against GTK+3
|
||||
* Applications (piwiz, pipanel, rc_gui, lxinput) now built against GTK+3
|
||||
* PiXflat GTK+3 theme updated with numerous changes to support the above
|
||||
* GTK+3 : toolbar icon size setting added
|
||||
* GTK+3 : ability to request client-side decoration on windows added
|
||||
* GTK+3 : setting for indent for frame labels in custom style added
|
||||
* mutter window manager used instead of openbox on devices with 2GB or more of RAM
|
||||
* mutter : title bar icon behaviour and appearance modified to match openbox
|
||||
* mutter : additional keyboard shortcuts added
|
||||
* mutter : various performance enhancements
|
||||
* mutter compatibility added to screen magnifier
|
||||
* Numerous changes to Appearance Settings application to support GTK+3 and mutter
|
||||
* Updater plugin added to lxpanel to detect and install software updates
|
||||
* File manager view options simplified to either list or icons, with separate menu option for thumbnails
|
||||
* New file manager toolbar icons
|
||||
* KMS used as default display driver
|
||||
* Modifications to HDMI audio output selection to support the above
|
||||
* xcompmgr enabled when openbox is running under KMS
|
||||
* New default camera subsystem based on libcamera
|
||||
* New camera demo applications (libcamera-still and libcamera-vid) have replaced raspistill and raspivid
|
||||
* Legacy camera subsystem removed from 64-bit RPi OS (still available on 32-bit)
|
||||
* Chromium upgraded to version 92.0.4515.98
|
||||
* VLC media player upgraded to version 3.0.16
|
||||
* Spurious drive removal warning after use of SD card copier removed
|
||||
* Bookshelf application now includes Custom PC magazine
|
||||
* Various translation updates - Italian, Korean, Polish, German, Armenian
|
||||
* Startup wizard now installs Japanese fonts if needed
|
||||
* Progress and information dialog boxes for lxpanel plugins now common to lxpanel, rather than in individual plugins
|
||||
* Icon handling code for lxpanel plugins now common to lxpanel
|
||||
* Package with 4K version of Raspberry Pi wallpaper added to Recommended Software
|
||||
* Python Games and Minecraft removed from Recommended Software - neither is compatible with bullseye
|
||||
* Bluetooth pairing and connection dialogs updated for compatibility with more devices
|
||||
* Bluetooth devices always disconnected before removal to speed up removal process
|
||||
* Bluetooth pairing dialog now only shows devices which offer services which are usable by Pi
|
||||
* Separate Bluetooth unpair dialog removed - unpair now an option for each individual device
|
||||
* Bug fix - mutter : header bar colours not updating when theme is changed
|
||||
* Bug fix - GTK+3 : tooltips being displayed incorrectly at bottom of screen
|
||||
* Bug fix - lxpanel : crash when using keyboard shortcut to enable magnifier when magnifier not installed
|
||||
* Bug fix - lxpanel : lockup in Bluetooth plugin when connecting to certain devices
|
||||
* Bug fix - lxpanel : discoverable mode icon could get out of sync with underlying Bluetooth system state
|
||||
* Bug fix - piwiz : missing cities in timezone list
|
||||
* Bug fix - piwiz : country-specific language packages not being installed
|
||||
* Bug fix - bookshelf : now waits for longer between packets before timing out
|
||||
* Bug fix - accented characters now displayed correctly in localisation dialogs
|
||||
* Raspberry Pi firmware e2bab29767e51c683a312df20014e3277275b8a6
|
||||
* Linux kernel 5.10.63
|
||||
2021-05-07:
|
||||
* Chromium upgraded to version 88.0.4324.187
|
||||
* NuScratch upgraded to version 20210507
|
||||
* Node-RED upgraded to version 1.3.4
|
||||
* pigpio upgraded to version 1.79
|
||||
* Thonny upgraded to version 3.3.6
|
||||
* Icelandic and Italian translations updated for several packages
|
||||
* piclone: Remove hiding of application in other desktops
|
||||
* agnostics: Remove hiding of app in other desktops
|
||||
* rp-bookshelf:
|
||||
- Remove hiding of app in other desktops
|
||||
- GTK+3 version
|
||||
* lxplug-bluetooth:
|
||||
- Fix some memory leaks
|
||||
- Add authorisation dialog required by some BT-LE pairings
|
||||
* alsa-utils: Add custom init files for bcm2835 on Raspberry Pi to set volume correctly
|
||||
* rp-prefapps: Remove hiding of app in other desktops
|
||||
* OpenSSH and OpenSSL speed improvements
|
||||
* Install gpiozero in lite images
|
||||
* Raspberry Pi firmware 518ee7c871aaa9aaa88116953d57e73787ee6e43
|
||||
* Linux kernel 5.10.17
|
||||
2021-03-04:
|
||||
* Thonny upgraded to version 3.3.5
|
||||
* SD Card Copier made compatible with NVMe devices; now built against GTK+3 toolkit
|
||||
* Composite video options removed from Raspberry Pi 4 in Raspberry Pi Configuration
|
||||
* Boot order options in raspi-config adjusted for more flexibility
|
||||
* Recommended Software now built against GTK+3 toolkit
|
||||
* Fix for crash in volume plugin when using keyboard could push value out of range
|
||||
* Fix for focus changing between windows in file manager when using keyboard to navigate directory view
|
||||
* Fix for Raspberry Pi 400 keyboard country not being read correctly in startup wizard
|
||||
* Armenian and Japanese translations added to several packages
|
||||
* Automatically load aes-neon-bs on ARM64 to speed up OpenSSL
|
||||
* Raspberry Pi firmware fcf8d2f7639ad8d0330db9c8db9b71bd33eaaa28
|
||||
* Linux kernel 5.10.17
|
||||
2021-01-11:
|
||||
* Chromium version 86.0.4240.197 included
|
||||
* Screen reader support enabled in Chromium
|
||||
* Adobe have end-of-lifed Flash Player, so it has been removed
|
||||
* Scratch 2 required Flash, so it has been removed
|
||||
* Added Epson printer drivers
|
||||
* Added timeout to hide messages from USB device monitor after 5 seconds
|
||||
* Bug fix - PulseAudio output was in mono
|
||||
* Bug fix - brief audio interruptions at start of playback in VLC
|
||||
* Bug fix - old ALSA output settings being used instead of PulseAudio settings by some applications
|
||||
* Bug fix - crash in PulseAudio volume controller when used on multichannel devices
|
||||
* Bug fix - battery monitor failing to load on x86 platforms
|
||||
* Bug fix - setting of password in startup wizard failed if language was changed
|
||||
* Bug fix - Chromium video playback lockup on small number of devices
|
||||
* Bug fix - Chromium Google Maps 3D view artefacts
|
||||
* Slovak, Italian and Norwegian translations updated
|
||||
* Added Epson printer drivers
|
||||
* Raspberry Pi firmware 70f1581eec2c036b7e9309f1af41c651fb125447
|
||||
* Linux kernel 5.4.83
|
||||
2020-12-02:
|
||||
* PulseAudio now included and running by default
|
||||
* Bluealsa Bluetooth interface removed - Bluetooth audio is now handled by PulseAudio
|
||||
* LXPanel volume control plugin replaced with PulseAudio version
|
||||
* Version 84.0.4147.105 of Chromium web browser included
|
||||
* Version 3.3.0 of Thonny included
|
||||
* Version 32.0.0.453 of Flash player included - note that this will be the final release of Flash, as it is end-of-lifed at the end of 2020
|
||||
* CUPS printer system included, along with system-config-printer CUPS GUI and HP printer drivers
|
||||
* raspi-config menu structure rearranged to match Raspberry Pi Configuration tabs
|
||||
* Control for GPIO-connected fans added to raspi-config and Raspberry Pi Configuration
|
||||
* Control for power / activity LED on Pi 400 and Pi Zero added to raspi-config and Raspberry Pi Configuration
|
||||
* Improved screen reader voice prompts in several applications
|
||||
* Added ctrl-alt-space shortcut to install Orca screen reader at any point
|
||||
* Low voltage warnings added to battery monitor plugin
|
||||
* Magnifier plugin zoom can now be changed with scroll wheel when pointer is over icon
|
||||
* Change to notification popups - now will only close when clicked on directly, not by clicking anywhere
|
||||
* Bookshelf now made compatible with translated versions of books and magazines, and will offer translated versions where available, based on system language setting
|
||||
* Bug fix - crash in CPU temperature plugin when throttling detection fails
|
||||
* Bug fix - if Orca is running, shutdown commands and shutdown dialog will force kill it to prevent it locking up the reboot or shutdown process
|
||||
* Various additional language translations added
|
||||
* Various minor bug fixes and UI tweaks
|
||||
* Raspberry Pi firmware b324aea801f669b6ab18441f970e74a5a7346684
|
||||
* Linux kernel 5.4.79
|
||||
2020-08-20:
|
||||
* raspi-config - added selection of boot device order
|
||||
* raspi-config - added selection of boot EEPROM version
|
||||
* SD Card Copier - copy is now immediately aborted if drives are connected or disconnected while copying
|
||||
* Version 32.0.0.414 of Flash player included
|
||||
* User feedback survey removed from first run of Chromium
|
||||
* Recommended Software - now allows multiple install and reinstall operations without having to close between each one
|
||||
* Bug fix - misleading file browser from panel menu icon selection dialog - icons must now be in icon theme rather than arbitrary files
|
||||
* Bug fix - items in main menu not being translated
|
||||
* Bug fix - raspi-config not detecting audio devices in non-English locales
|
||||
* Bug fix - Bookshelf claiming no disk space in non-English locales
|
||||
* Bug fix - failed installation of both 32 and 64 bit versions of packages by Recommended Software on 64-bit images
|
||||
* Italian translations added (thanks to Emanuele Goldoni and the Italian translation team)
|
||||
* Raspberry Pi firmware ef72c17bcaaeb89093d87bcf71f3228e1b5e1fff
|
||||
* Linux kernel 5.4.51
|
||||
2020-05-27:
|
||||
* Added Bookshelf application
|
||||
* Added Raspberry Pi Diagnostics application
|
||||
* Added magnifier plugin to taskbar - needs magnifier application installed from Recommended Software to enable
|
||||
* Added Magnifier application to Recommended Software
|
||||
* Added marketing questionnaire as initial Chromium tab
|
||||
* Version 0.25 of Scratch 2 included - uses external application to access IMU on SenseHAT
|
||||
* Version 1.0.5 of Scratch 3 included - uses external application to access IMU on SenseHAT
|
||||
* Version 32.0.0.371 of Flash player included
|
||||
* Version 1.0.6 of Node-RED included
|
||||
* Version 6.7.1 of VNC Server included
|
||||
* Version 6.20.113 of VNC Client included
|
||||
* Internal audio outputs enabled as separate ALSA devices
|
||||
* MagPi preinstall removed and replaced with Beginner’s Guide
|
||||
* MagPi weblink removed from main menu
|
||||
* Chromium made default application for PDF files
|
||||
* Common icon loading code for lxpanel plugins used
|
||||
* Italian translations added
|
||||
* Initial move of mouse pointer to menu button disabled
|
||||
* Padding at left of menu button removed
|
||||
* Focus behaviour changed so that focus moves to desktop if no windows are opened - improves reliability of Orca screen reader
|
||||
* Bug fix - focus bug in volume plugin
|
||||
* Bug fix - keyboard repeat interval bug in Mouse & Keyboard Settings
|
||||
* Bug fix - battery detection bug in battery plugin
|
||||
* Bug fix - spurious active areas on taskbar when plugins are hidden
|
||||
* Bug fix - occasional crash in file manager on file selection
|
||||
* Disk ID is now regenerated on first boot
|
||||
* Updated udev rules
|
||||
- Remove unused argon rule
|
||||
- Add vcsm-cma to video group
|
||||
- Add pwm to gpio group
|
||||
* i2cprobe: More flexible I2C/SPI alias mapping
|
||||
* Raspberry Pi firmware 21e1fe3477ffb708a5736ed61a924fd650031136
|
||||
* Linux kernel 4.19.118
|
||||
2020-02-13:
|
||||
* Raspberry Pi Configuration - screen blanking setting disabled if Xscreensaver is installed
|
||||
* Bug fix - switch to turn off VNC server in Raspberry Pi Configuration has no effect
|
||||
* Bug fix - fix %20 characters in file names
|
||||
* Linux kernel 4.19.97
|
||||
* Raspberry Pi firmware 9a34efbf2fc6a27231607ce91a7cb6bf3bdbc0c5
|
||||
- gencmd: Fix measure_clock name for CLOCK_OUTPUT_108
|
||||
- mmal isp: Remote alignment requirements for RGB24 formats
|
||||
- Add missing flags for VC_IMAGE_PROP_YUVUV_4K_CHROMA_ALIGN
|
||||
- platform: Compromise on gpu overclock settings
|
||||
2020-02-05:
|
||||
* Version 3.2.6 of Thonny included - significant improvements in speed, particularly when debugging
|
||||
* Version 1.0.4 of Scratch 3 included - adds new "display stage" and "display sprite" blocks to SenseHAT extension, and loading of files from command line
|
||||
* Version 32.0.0.314 of Flash player included
|
||||
* Version 1.0.3 of NodeRED included
|
||||
* Version 6.6.0 of RealVNC Server and version 6.19.923 of RealVNC Viewer included - adds support for audio
|
||||
* Version 78.0.3904.108 of Chromium included
|
||||
* Mesa updated to 19.3.2 for OpenGL ES 3.1 conformance
|
||||
* Pixel doubling option added in Raspberry Pi Configuration on platforms using FKMS display driver
|
||||
* Orca screen reader added to Recommended Software
|
||||
* Code The Classics Python games added to Recommended Software
|
||||
* File manager - new "places" pane added at top of sidebar to show mounted drives in simplified view; "new folder" icon added to taskbar; expanders in directory browser now correctly show state of subfolders
|
||||
* Multiple monitor support improved - alignment of icons on second desktop corrected, Appearance Settings opens on correct tab when launched from context menu
|
||||
* Raspberry Pi Touchscreen correctly aligned with display
|
||||
* System clock synchronised before installing new packages in startup wizard and Recommended Software
|
||||
* Mixer dialogs added to taskbar volume plugin; separate Audio Preferences application removed
|
||||
* Raspberry Pi Configuration - separate tab added for display options; screen blanking control added
|
||||
* Volume taskbar plugin and raspi-config modified to support separate ALSA devices for internal audio outputs (analogue and HDMI 1 and 2)
|
||||
* Robustness improvements in volume, ejecter and battery taskbar plugins
|
||||
* Movement of mouse pointer to menu button on startup now controlled by point_at_menu parameter in Global section of lxpanel configuration file
|
||||
* Ctrl-Alt-Del and Ctrl-Alt-End shortcuts added to open shutdown options box
|
||||
* Ctrl-Shift-Esc shortcut added to open task manager
|
||||
* Enabled NEON routines in OpenSSL
|
||||
* Linux kernel 4.19.97
|
||||
* Raspberry Pi firmware 149cd7f0487e08e148efe604f8d4d359541cecf4
|
||||
2019-09-26:
|
||||
* rpi-eeprom included
|
||||
- This will automatically update the SPI EEPROM on the Raspberry Pi 4 to the latest stable version.
|
||||
See https://rpf.io/eeprom for more information.
|
||||
* New icon theme for file manager icons
|
||||
* Appearance Settings - option for identical desktop on both monitors
|
||||
* Appearance Settings - option to show different desktop icons on both monitors
|
||||
* Taskbar automatically moved to monitor 0 if monitor 1 not found at boot
|
||||
* Switching of audio output between two HDMI devices added to volume plugin
|
||||
* Switching of audio input devices added to volume plugin
|
||||
* .asoundrc (ALSA config file) now uses 'plug' values to support more devices
|
||||
* Audio Settings tool modified to integrate more closely with volume plugin to reduce duplicated code
|
||||
* Screen Configuration tool now shows separate menus for resolution and refresh rate
|
||||
* Primary and active monitor settings removed from Screen Configuration tool
|
||||
* Overscan support added for FKMS driver
|
||||
* New keyboard shortcuts added - Ctrl-Alt-End brings up shutdown menu; Ctrl-Alt-M moves taskbar between monitors
|
||||
* Latest changes to Bluez ALSA interface integrated to improve connection to Bluetooth audio devices
|
||||
* Mousepad used as simple text editor instead of leafpad
|
||||
* Version 3.2 of Thonny added
|
||||
* Version 74 of Chromium added
|
||||
* Version 3.0.8 of VLC added
|
||||
* Version 32.0.0.255 of Flash player added
|
||||
* Version 6.5.0 of RealVNC Server added
|
||||
* Version 6.19.715 of RealVNC Viewer added (full image only)
|
||||
* Version 12.0.1 of Mathematica added (full image only)
|
||||
* Version 0.20.8 of NodeRED added (full image only)
|
||||
* Version 3.1.0 of Sonic Pi added (full image only)
|
||||
* Scratch 3 added (full image only)
|
||||
* Bug fix - URL handling in Terminal
|
||||
* Bug fix - octal values in SSIDs in network plugin
|
||||
* Bug fix - remaining value in progress bar when transferring files
|
||||
* Bug fix - integration of xarchiver tool with file manager
|
||||
* Bug fix - start menu opening on incorrect monitor
|
||||
* Bug fix - minimised applications wrongly displayed on taskbar on second monitor
|
||||
* Bug fix - Bluetooth icon disappearing on x86 platforms when Bluetooth turned off
|
||||
* Bug fix - Screen Configuration tool not shown on x86 platforms and settings not being saved
|
||||
* Various translation updates
|
||||
* Various minor bug fixes
|
||||
* Epiphany/Web removed
|
||||
* ntfs-3g included
|
||||
* pciutils added
|
||||
* Linux kernel 4.19.75
|
||||
* Raspberry Pi firmware 01508e81ec1e918448227ca864616d56c430b46d
|
||||
2019-07-10:
|
||||
* Clearer options for switching of Pi 4 video output in Raspberry Pi Configuration
|
||||
* Option added to Appearance Settings to move taskbar to second monitor
|
||||
* Option added to Recommended Software to restrict package installs by architecture
|
||||
* New version of Adobe Flash player (32.0.0.223)
|
||||
* Selection of screen refresh rates added to Screen Configuration
|
||||
* Fix for missing text insertion cursor in LibreOffice on Pi 4
|
||||
* Fix for Wi-fi interruption when Wi-fi icon on taskbar is clicked
|
||||
* FIx for incorrect desktop background behind desktop login prompt
|
||||
* Fix for segmentation faults when launching obconf and lxapperarance
|
||||
* Fix for unclosed file pointer in Screen Configuration
|
||||
* Fix for Bluetooth plugin freeze when large numbers of devices detected
|
||||
* Fix for opening URLs not working in lxterminal
|
||||
* Fix for start menu opening on incorrect monitor when launched from keyboard
|
||||
* Fix for taskbar item not having [] removed when un-minimising on second monitor
|
||||
* Fix for Chromium video playback and WebGL performance on Pi 4
|
||||
* Remove 4kp60 option from Raspberry Pi Configuration
|
||||
* Rename hdmi_enable_4k to hdmi_enable_4kp60 in /boot/config.txt and raspi-config
|
||||
* Linux kernel 4.19.57
|
||||
* Raspberry Pi firmware 356f5c2880a3c7e8774025aa6fc934a617553e7b
|
||||
2019-06-20:
|
||||
* Based on Debian Buster
|
||||
* Support for Raspberry Pi 4 hardware
|
||||
* FKMS OpenGL desktop graphics driver and xcompmgr compositing window manager used when running on Raspberry Pi 4
|
||||
* Screen Configuration application added for use with FKMS driver
|
||||
* Raspberry Pi 4 video output options added to Raspberry Pi Configuration
|
||||
* Uses new PiXflat UI theme for GTK and Openbox
|
||||
* CPU activity gauge plugin no longer shown on taskbar by default
|
||||
* CPU temperature gauge plugin added (not shown by default)
|
||||
* USB ejecter and Bluetooth taskbar icons hidden when not appropriate
|
||||
* Version 74.0.3729.157 of Chromium web browser included
|
||||
* Version 32.0.0.207 of Flash player included
|
||||
* IDLE Python IDE removed
|
||||
* Wolfram Mathematica removed temporarily due to incompatibility with Buster
|
||||
* Display of package sizes removed from Recommended Software
|
||||
* Appearance Settings modified to support independent settings for two monitors
|
||||
* Oracle Java 7 and 8 replaced with OpenJDK 11
|
||||
* Miscellaneous small bug fixes
|
||||
* On-board 5GHz WiFi blocked by rfkill by default
|
||||
The block is removed when taking one of the following actions:
|
||||
- Selecting a locale in the first run wizard
|
||||
- Setting the WiFi country in the Raspberry Pi Configuration tool or the Network Settings applet
|
||||
- Setting the WiFi country in raspi-config
|
||||
- Providing a wpa_supplicant.conf file through the boot partition
|
||||
- Running 'rfkill unblock wifi'
|
||||
* Boot partition size set to 256M
|
||||
* Linux kernel 4.19.50
|
||||
* Raspberry Pi firmware 88ca9081f5e51cdedd16d5dbc85ed12a25123201
|
||||
2019-04-08:
|
||||
* Chromium browser updated to version 72
|
||||
* VLC media player updated to version 3.0.6
|
||||
* RealVNC Server updated to version 6.4.0
|
||||
* Flash player updated to version 32.0.0.156
|
||||
* Performance improvements to SDL library
|
||||
* Performance improvements to pixman library
|
||||
* Option to set display underscan added to startup wizard
|
||||
* Mounted external drives now displayed on desktop by default
|
||||
* Network plugin modified for improved compatibility with wpa_passphrase
|
||||
* SD Card Copier tweaks to reduce copy failures
|
||||
* Various minor bug fixes and appearance tweaks
|
||||
* Added ethtool
|
||||
* Added rng-tools
|
||||
* Add PINN restore support
|
||||
* Linux kernel 4.14.98
|
||||
* Raspberry Pi firmware f8939644f7bd3065068787f1f92b3f3c79cf3de9
|
||||
2018-11-13:
|
||||
* Two versions of image created - "base" image has no optional software packages included; "full" image has all optional packages
|
||||
- Removed from "base" image - LibreOffice, Thonny, Scratch, Scratch 2, Sonic Pi, Minecraft, Python Games, SmartSim, SenseHAT Emulator
|
||||
- Added to "full" image - Mathematica, BlueJ, Greenfoot, Node-RED, Claws Mail, VNC Viewer
|
||||
* Python Games and SmartSim added to Recommended Software
|
||||
* VLC media player with VideoCore hardware acceleration included in image
|
||||
* Version 3.0.5 of Thonny included
|
||||
* Modifications to LXDE components to enable local configuration to override global configuration correctly
|
||||
* Modifications to Appearance Settings to support above configuration changes
|
||||
* Modifications to various initial config defaults and relevant package to support above configuration changes
|
||||
* Selecting default option in Appearance Settings now deletes relevant local configuration files
|
||||
* PiX theme modified so that all changes made in Appearance Settings are in override files rather than in theme files
|
||||
* Design of scrollbar buttons changed
|
||||
* Image Viewer moved into Graphics category on main menu
|
||||
* Recommended Software now installs LibreOffice language support files if needed, and suggests reboot if needed
|
||||
* Latest version of Pepper Flash plugin included
|
||||
* Chromium h264ify plugin permissions set correctly by default
|
||||
* Corrections to various MIME types so that files open in sensible default applications
|
||||
* Set default timezone to 'Europe/London'
|
||||
* Linux kernel 4.14.79
|
||||
* Raspberry Pi firmware 12e0bf86e08d6067372bc0a45d7e8a10d3113210
|
||||
2018-10-09:
|
||||
* Raspberry Pi 3A+ support
|
||||
* In startup wizard, assign keyboard to country as per Debian installer recommendations
|
||||
* In startup wizard, add option to use US keyboard in preference to country-specific option
|
||||
* In startup wizard, show IP address on first page
|
||||
* In startup wizard, check for existing wifi network connection and show it if there is one
|
||||
* In startup wizard, install language support packages for LibreOffice and other applications
|
||||
* In startup wizard, improve operation with keyboard only and no mouse
|
||||
* Password change in Raspberry Pi Configuration and startup wizard now works properly if passwords contain shell characters
|
||||
* Battery indicator plugin modified to cope with Pi-top hardware monitor crashing
|
||||
* Networking plugin hides wifi password characters by default
|
||||
* In Scratch 2 GPIO plugin, set pin from dropdown list rather than free text
|
||||
* In Scratch 2 SenseHAT plugin, swap x and y axis values for LED array
|
||||
* Include latest Adobe Flash player (31.0.0.108)
|
||||
* Include latest RealVNC Server (6.3.1)
|
||||
* Include libav-tools
|
||||
* Include ssh-import-id
|
||||
* Removed Mathematica
|
||||
* Merge in latest third-party code for Bluetooth ALSA interface
|
||||
* Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file
|
||||
* Various other small bug fixes, tweaks and changes to text
|
||||
* Make dhcpcd work with 3G devices
|
||||
* Add hw acceleration to ffmpeg
|
||||
* Improved WiFi-BT coexistence parameters
|
||||
* Run fake-hwclock before systemd-fsck-root
|
||||
* Raspberry Pi PoE HAT support
|
||||
* Linux kernel 4.14.71
|
||||
* Raspberry Pi firmware 5b49caa17e91d0e64024380119ad739bb201c674
|
||||
2018-06-27:
|
||||
* New first-boot configuration wizard added
|
||||
* Recommended Software installer added
|
||||
* Bluej, Greenfoot, NodeRED, Claws Mail, VNC Viewer removed from image - can now be installed from Recommended Applications
|
||||
* Qpdfview PDF viewer installed instead of Xpdf
|
||||
* Version 65.0 of Chromium browser included, with latest Flash player
|
||||
* Volume up / down keys now change by 5% increments and affect currently-selected output device rather than internal device only
|
||||
* Network plugin now remembers previously-entered WiFi network passwords when prompting for reconnection
|
||||
* Serial port and serial console can now be switched separately in Raspberry Pi Configuration
|
||||
* Lxkeymap keyboard language setting application removed - replaced with dialog within Raspberry Pi Configuration
|
||||
* Wifi country and keyboard language setting dialogs in Raspberry Pi Configuration now callable from other applications
|
||||
* New version of Piboto font included to render with correct weight under some rogue applications
|
||||
* Reconnection to Bluetooth audio devices on reboot improved
|
||||
* Disable click-to-rename behaviour in file manager if single-click selection enabled
|
||||
* Appearance Settings dialog makes config changes to some Qt files to match selected theme
|
||||
* MIME file type associations improved
|
||||
* Multiple desktop management options removed from mouse middle-click menu
|
||||
* Menu shortcuts to Raspberry Pi website amended
|
||||
* Python 2 IDLE menu link removed
|
||||
* Sample Magpi PDF installed in /home/pi/MagPi
|
||||
* Various minor tweaks, bug fixes and appearance changes
|
||||
* Bluetooth updates
|
||||
- Firmware with Bluetooth 4.2 features
|
||||
- SCO profile suppot added via bthelper.service
|
||||
* Linux kernel 4.14.50+
|
||||
* Raspberry Pi firmware 748fb17992426bb29d99224b93cb962fefbdc833
|
||||
2018-04-18:
|
||||
* Fixed race between wifi-country.service and raspberrypi-net-mods.service
|
||||
* Linux kernel 4.14.34+
|
||||
* Raspberry Pi firmware 5db8e4e1c63178e200d6fbea23ed4a9bf4656658
|
||||
2018-03-13:
|
||||
* Raspberry Pi 3 B+ support
|
||||
* WiFi is disabled until wireless regulatory domain is set (Pi 3 B+ only)
|
||||
- The domain can be done through 'Raspberry Pi Configuration' (rc_gui),
|
||||
'raspi-config' or by setting 'country=' to an appropriate ISO 3166
|
||||
alpha2 country code in /etc/wpa_supplicant/wpa_supplicant.conf.
|
||||
* Default wireless regulatory domain is now unset
|
||||
* Added support to desktop for different screen sizes and resolutions,
|
||||
including multiple preset options in Appearance Settings and pixel doubling
|
||||
option in Raspberry Pi Configuration
|
||||
* Version 2.1.16 of Thonny included
|
||||
* Version 29.0.0.113 of Adobe PepperFlash player included
|
||||
* Version 1.2.post1 of Pygame Zero included
|
||||
* Bluetooth plugin now supports connection to Bluetooth LE HID devices
|
||||
* Network plugin now indicates 5G-compatible APs
|
||||
* Latest changes to Bluez ALSA service merged
|
||||
- service now started on CLI boot as well as GUI boot
|
||||
* Latest changes to dhcpcd networking plugin merged
|
||||
* Improved support for running on pi-top devices
|
||||
* Small design changes to PiX theme and icons
|
||||
* Bug fix - hide spurious window resize handles
|
||||
* Bug fix - Scratch 2 remote GPIO state block now works correctly
|
||||
* Updated WiFi Firmware
|
||||
- brcmfmac43455-sdio 7.45.154
|
||||
- brcmfmac43430-sdio 7.45.98.38
|
||||
* New packages:
|
||||
- policykit-1
|
||||
- obconf
|
||||
- python-buttonshim python3-buttonshim
|
||||
- python-unicornhathd python3-unicornhathd
|
||||
- python-pantilthat python3-pantilthat
|
||||
* Linux kernel 4.9.80+
|
||||
* Raspberry Pi firmware 3347884c7df574bbabeff6dca63caf686e629699
|
||||
2017-11-29:
|
||||
* Added battery monitor plugin for taskbar - works on x86 images or first-generation Pi-Top
|
||||
* Added cutdown mode to PCManFM file manager to reduce complexity
|
||||
* Added ability to rename files in PCManFM by clicking name when selected
|
||||
* Bug fix in Bluetooth ALSA module to reduce truncation of audio at end of playback
|
||||
* Various small tweaks, bug fixes and theme modifications
|
||||
* New kernel and firmware
|
||||
2017-09-07:
|
||||
* Disable predictable network interface names for Ethernet devices
|
||||
* Bug fix for keyboard settings dialog in Raspberry Pi Configuration
|
||||
* Bug fix for crash on some videos and animations in Chromium
|
||||
* Bug fix for taskbar crash when running RealVNC server
|
||||
* Bug fix for reloading projects with extensions in Scratch 2
|
||||
* Bug fix for MAC address problem in Bluetooth
|
||||
* Simple mode and new icons in Thonny
|
||||
* New Japanese translations in Raspberry Pi Configuration
|
||||
* Install fonts-droid-fallback for international fonts
|
||||
2017-08-16:
|
||||
* Based on Raspbian Stretch (Debian version 9)
|
||||
* Version 60 of Chromium browser included
|
||||
* Version 3.0.1 of Sonic Pi included
|
||||
* Version 6.1.1 of RealVNC included
|
||||
* Version 0.17.4 of NodeRED included
|
||||
* Bluetooth audio routed via ALSA rather than Pulseaudio
|
||||
* SenseHAT extension added to Scratch 2
|
||||
* Various desktop applications modified to prompt for sudo password if needed
|
||||
* lxinput control options for mouse speed simplified
|
||||
* lxpanel plugins moved into separate packages
|
||||
* Wireless firmware for Pi 3 and Pi 0W modified to address Broadpwn exploit
|
||||
* Latest kernel and firmware
|
||||
* Various small tweaks, bug fixes and theme modifications
|
||||
2017-07-05:
|
||||
* New kernel and firmware
|
||||
* Filesystem created without the metadata_csum feature
|
||||
2017-06-21:
|
||||
* Scratch 2 application included
|
||||
* Thonny Python IDE included
|
||||
* New icons with thinner outlines
|
||||
* Volume control more linear in behaviour
|
||||
* Updated Flash player
|
||||
* Updated RealVNC server and viewer
|
||||
* Various tweaks and bugfixes
|
||||
* New kernel and firmware
|
||||
2017-04-10:
|
||||
* Wolfram Mathematica updated to version 11.0.1
|
||||
* Adobe Flash Player updated to version 25.0.0.127
|
||||
* Use PARTUUID to support USB boot
|
||||
2017-03-02:
|
||||
* Updated kernel and firmware (final Pi Zero W support)
|
||||
* Wolfram Mathematica updated to version 11
|
||||
* NOOBS installs now checks for presence of 'ssh' file on the NOOBS partition.
|
||||
2017-02-16:
|
||||
* Chromium browser updated to version 56
|
||||
* Adobe Flash Player updated to version 24.0.0.221
|
||||
* RealVNC Server and Viewer updated to version 6.0.2 (RealVNC Connect)
|
||||
* Sonic Pi updated to version 2.11
|
||||
* Node-RED updated to version 0.15.3
|
||||
* Scratch updated to version 120117
|
||||
* Detection of SSH enabled with default password moved into PAM
|
||||
* Updated desktop GL driver to support use of fake KMS option
|
||||
* Raspberry Pi Configuration and raspi-config allow setting of fixed HDMI resolution
|
||||
* raspi-config allows enabling of serial hardware independent of serial terminal
|
||||
* Updates to kernel and firmware
|
||||
* Various minor bug fixes and usability and appearance tweaks
|
||||
2017-01-11:
|
||||
* Re-release of the 2016-11-25 image with a FAT32-formatted boot partition
|
||||
2016-11-25:
|
||||
* SSH disabled by default; can be enabled by creating a file with name "ssh" in boot partition
|
||||
* Prompt for password change at boot when SSH enabled with default password unchanged
|
||||
* Adobe Flash Player included
|
||||
* Updates to hardware video acceleration in Chromium browser
|
||||
* Greeter now uses background image from last set in Appearance Settings rather than pi user
|
||||
* Updated version of Scratch
|
||||
* Rastrack option removed from raspi-config and Raspberry Pi Configuration
|
||||
* Ability to disable graphical boot splash screen added to raspi-config and Raspberry Pi Configuration
|
||||
* Appearance Settings dialog made tabbed to work better on small screens
|
||||
* Raspberry Pi Configuration now requires current password to change password
|
||||
* Various small bug fixes
|
||||
* Updated firmware and kernel
|
||||
2016-09-23:
|
||||
* New PIXEL desktop environment - new icon set, window design, desktop images, splash screen and greeter
|
||||
* Chromium web browser included
|
||||
* Infinality font rendering patches included
|
||||
* RealVNC server and viewer included
|
||||
* SenseHAT emulator included
|
||||
* Rfkill entries added to Wifi and Bluetooth panel plugins
|
||||
* Updates to various standard applications, including Scratch and NodeRED
|
||||
* Various bug fixes, tweaks and translation updates
|
||||
* Updated firmware and kernel (https://github.com/raspberrypi/firmware/commit/ad8608c08b122b2c228dba0ff5070d6e9519faf5)
|
||||
2016-05-27:
|
||||
* Fixed crash of lxpanel when D-bus not accessible
|
||||
* Fixed permissions for D-bus Bluetooth access
|
||||
* Removed sudo from shutdown options
|
||||
|
|
|
|||
|
|
@ -1,67 +1,25 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_NAME}${IMG_SUFFIX}"
|
||||
mkdir -p "${STAGE_WORK_DIR}"
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
|
||||
NOOBS_DIR="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}"
|
||||
unmount_image ${IMG_FILE}
|
||||
|
||||
IMG_FILE="${WORK_DIR}/export-image/${IMG_FILENAME}${IMG_SUFFIX}.img"
|
||||
cp ${WORK_DIR}/export-image/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img ${STAGE_WORK_DIR}/
|
||||
|
||||
unmount_image "${IMG_FILE}"
|
||||
rm -rf ${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}
|
||||
|
||||
rm -rf "${NOOBS_DIR}"
|
||||
LOOP_DEV=`kpartx -asv ${IMG_FILE} | grep -E -o -m1 'loop[[:digit:]]+' | head -n 1`
|
||||
BOOT_DEV=/dev/mapper/${LOOP_DEV}p1
|
||||
ROOT_DEV=/dev/mapper/${LOOP_DEV}p2
|
||||
|
||||
PARTED_OUT=$(parted -sm "${IMG_FILE}" unit b print)
|
||||
BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 2 | tr -d B)
|
||||
BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^1:' | cut -d':' -f 4 | tr -d B)
|
||||
mkdir -p ${STAGE_WORK_DIR}/rootfs
|
||||
mkdir -p ${STAGE_WORK_DIR}/bootfs
|
||||
mkdir -p ${NOOBS_DIR}
|
||||
|
||||
ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 2 | tr -d B)
|
||||
ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^2:' | cut -d':' -f 4 | tr -d B)
|
||||
mount $ROOT_DEV ${STAGE_WORK_DIR}/rootfs
|
||||
mount $BOOT_DEV ${STAGE_WORK_DIR}/bootfs
|
||||
|
||||
echo "Mounting BOOT_DEV..."
|
||||
cnt=0
|
||||
until BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}"); do
|
||||
if [ $cnt -lt 5 ]; then
|
||||
cnt=$((cnt + 1))
|
||||
echo "Error in losetup for BOOT_DEV. Retrying..."
|
||||
sleep 5
|
||||
else
|
||||
echo "ERROR: losetup for BOOT_DEV failed; exiting"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
tar -I pxz -C ${STAGE_WORK_DIR}/bootfs -cpf ${NOOBS_DIR}/boot.tar.xz .
|
||||
tar -I pxz -C ${STAGE_WORK_DIR}/rootfs -cpf ${NOOBS_DIR}/root.tar.xz .
|
||||
|
||||
echo "Mounting ROOT_DEV..."
|
||||
cnt=0
|
||||
until ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}"); do
|
||||
if [ $cnt -lt 5 ]; then
|
||||
cnt=$((cnt + 1))
|
||||
echo "Error in losetup for ROOT_DEV. Retrying..."
|
||||
sleep 5
|
||||
else
|
||||
echo "ERROR: losetup for ROOT_DEV failed; exiting"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
|
||||
echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH"
|
||||
|
||||
mkdir -p "${STAGE_WORK_DIR}/rootfs"
|
||||
mkdir -p "${NOOBS_DIR}"
|
||||
|
||||
mount "$ROOT_DEV" "${STAGE_WORK_DIR}/rootfs"
|
||||
mount "$BOOT_DEV" "${STAGE_WORK_DIR}/rootfs/boot"
|
||||
|
||||
ln -sv "/lib/systemd/system/apply_noobs_os_config.service" "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service"
|
||||
|
||||
KERNEL_VER="$(zgrep -oPm 1 "Linux version \K(.*)$" "${STAGE_WORK_DIR}/rootfs/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | cut -f-2 -d.)"
|
||||
echo "$KERNEL_VER" > "${STAGE_WORK_DIR}/kernel_version"
|
||||
|
||||
bsdtar --numeric-owner --format gnutar -C "${STAGE_WORK_DIR}/rootfs/boot" -cpf - . | xz -T0 > "${NOOBS_DIR}/boot.tar.xz"
|
||||
umount "${STAGE_WORK_DIR}/rootfs/boot"
|
||||
bsdtar --numeric-owner --format gnutar -C "${STAGE_WORK_DIR}/rootfs" --one-file-system -cpf - . | xz -T0 > "${NOOBS_DIR}/root.tar.xz"
|
||||
|
||||
if [ "${USE_QCOW2}" = "1" ]; then
|
||||
rm "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service"
|
||||
fi
|
||||
|
||||
unmount_image "${IMG_FILE}"
|
||||
unmount_image ${IMG_FILE}
|
||||
|
|
|
|||
114
imagetool.sh
114
imagetool.sh
|
|
@ -1,114 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ "$(id -u)" != "0" ]; then
|
||||
echo "Please run as root" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
progname=$(basename $0)
|
||||
|
||||
function usage()
|
||||
{
|
||||
cat << HEREDOC
|
||||
|
||||
Usage:
|
||||
Mount Image : $progname [--mount] [--image-name <path to qcow2 image>] [--mount-point <mount point>]
|
||||
Umount Image: $progname [--umount] [--mount-point <mount point>]
|
||||
Cleanup NBD : $progname [--cleanup]
|
||||
|
||||
arguments:
|
||||
-h, --help show this help message and exit
|
||||
-c, --cleanup cleanup orphaned device mappings
|
||||
-m, --mount mount image
|
||||
-u, --umount umount image
|
||||
-i, --image-name path to qcow2 image
|
||||
-p, --mount-point mount point for image
|
||||
|
||||
This tool will use /dev/nbd1 as default for mounting an image. If you want to use another device, execute like this:
|
||||
NBD_DEV=/dev/nbd2 ./$progname --mount --image-name <your image> --mount-point <your path>
|
||||
|
||||
HEREDOC
|
||||
}
|
||||
|
||||
MOUNT=0
|
||||
UMOUNT=0
|
||||
IMAGE=""
|
||||
MOUNTPOINT=""
|
||||
|
||||
nbd_cleanup() {
|
||||
DEVS="$(lsblk | grep nbd | grep disk | cut -d" " -f1)"
|
||||
if [ ! -z "${DEVS}" ]; then
|
||||
for d in $DEVS; do
|
||||
if [ ! -z "${d}" ]; then
|
||||
QDEV="$(ps xa | grep $d | grep -v grep)"
|
||||
if [ -z "${QDEV}" ]; then
|
||||
kpartx -d /dev/$d && echo "Unconnected device map removed: /dev/$d"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
# As long as there is at least one more argument, keep looping
|
||||
while [[ $# -gt 0 ]]; do
|
||||
key="$1"
|
||||
case "$key" in
|
||||
-h|--help)
|
||||
usage
|
||||
exit
|
||||
;;
|
||||
-c|--cleanup)
|
||||
nbd_cleanup
|
||||
;;
|
||||
-m|--mount)
|
||||
MOUNT=1
|
||||
;;
|
||||
-u|--umount)
|
||||
UMOUNT=1
|
||||
;;
|
||||
-i|--image-name)
|
||||
shift
|
||||
IMAGE="$1"
|
||||
;;
|
||||
-p|--mount-point)
|
||||
shift
|
||||
MOUNTPOINT="$1"
|
||||
;;
|
||||
*)
|
||||
echo "Unknown option '$key'"
|
||||
usage
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
# Shift after checking all the cases to get the next option
|
||||
shift
|
||||
done
|
||||
|
||||
if [ "${MOUNT}" = "1" ] && [ "${UMOUNT}" = "1" ]; then
|
||||
usage
|
||||
echo "Concurrent mount options not possible."
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ "${MOUNT}" = "1" ] && ([ -z "${IMAGE}" ] || [ -z "${MOUNTPOINT}" ]); then
|
||||
usage
|
||||
echo "Can not mount image. Image path and/or mount point missing."
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ "${UMOUNT}" = "1" ] && [ -z "${MOUNTPOINT}" ]; then
|
||||
usage
|
||||
echo "Can not umount. Mount point parameter missing."
|
||||
exit
|
||||
fi
|
||||
|
||||
export NBD_DEV="${NBD_DEV:-/dev/nbd1}"
|
||||
export MAP_BOOT_DEV=/dev/mapper/nbd1p1
|
||||
export MAP_ROOT_DEV=/dev/mapper/nbd1p2
|
||||
source scripts/qcow2_handling
|
||||
|
||||
if [ "${MOUNT}" = "1" ]; then
|
||||
mount_qimage "${IMAGE}" "${MOUNTPOINT}"
|
||||
elif [ "${UMOUNT}" = "1" ]; then
|
||||
umount_qimage "${MOUNTPOINT}"
|
||||
fi
|
||||
0
scripts/check_deps.sh
Executable file
0
scripts/check_deps.sh
Executable file
|
|
@ -1,40 +1,33 @@
|
|||
log (){
|
||||
date +"[%T] $*" | tee -a "${LOG_FILE}"
|
||||
date +"[%T] $@" | tee -a ${LOG_FILE}
|
||||
}
|
||||
export -f log
|
||||
|
||||
bootstrap(){
|
||||
local BOOTSTRAP_CMD=debootstrap
|
||||
local BOOTSTRAP_ARGS=()
|
||||
local ARCH=$(dpkg --print-architecture)
|
||||
|
||||
export http_proxy=${APT_PROXY}
|
||||
|
||||
BOOTSTRAP_ARGS+=(--arch arm64)
|
||||
BOOTSTRAP_ARGS+=(--include gnupg)
|
||||
BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
|
||||
#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
|
||||
BOOTSTRAP_ARGS+=(--exclude=info)
|
||||
BOOTSTRAP_ARGS+=(--include=ca-certificates)
|
||||
BOOTSTRAP_ARGS+=("$@")
|
||||
printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
|
||||
|
||||
capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
|
||||
|
||||
if [ -d "$2/debootstrap" ] && ! rmdir "$2/debootstrap"; then
|
||||
cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}"
|
||||
log "bootstrap failed: please check ${STAGE_WORK_DIR}/debootstrap.log"
|
||||
return 1
|
||||
if [ "$ARCH" != "armhf" ]; then
|
||||
local BOOTSTRAP_CMD=qemu-debootstrap
|
||||
else
|
||||
local BOOTSTRAP_CMD=debootstrap
|
||||
fi
|
||||
|
||||
${BOOTSTRAP_CMD} --components=main,contrib,non-free \
|
||||
--arch armhf\
|
||||
--no-check-gpg \
|
||||
$1 $2 $3
|
||||
}
|
||||
export -f bootstrap
|
||||
|
||||
copy_previous(){
|
||||
if [ ! -d "${PREV_ROOTFS_DIR}" ]; then
|
||||
if [ ! -d ${PREV_ROOTFS_DIR} ]; then
|
||||
echo "Previous stage rootfs not found"
|
||||
false
|
||||
fi
|
||||
mkdir -p "${ROOTFS_DIR}"
|
||||
rsync -aHAXx --exclude var/cache/apt/archives "${PREV_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
|
||||
mkdir -p ${ROOTFS_DIR}
|
||||
rsync -aHAX ${PREV_ROOTFS_DIR}/ ${ROOTFS_DIR}/
|
||||
}
|
||||
export -f copy_previous
|
||||
|
||||
|
|
@ -45,11 +38,10 @@ unmount(){
|
|||
DIR=$1
|
||||
fi
|
||||
|
||||
while mount | grep -q "$DIR"; do
|
||||
local LOCS
|
||||
LOCS=$(mount | grep "$DIR" | cut -f 3 -d ' ' | sort -r)
|
||||
while mount | grep -q $DIR; do
|
||||
local LOCS=`mount | grep $DIR | cut -f 3 -d ' ' | sort -r`
|
||||
for loc in $LOCS; do
|
||||
umount "$loc"
|
||||
umount $loc
|
||||
done
|
||||
done
|
||||
}
|
||||
|
|
@ -58,44 +50,42 @@ export -f unmount
|
|||
unmount_image(){
|
||||
sync
|
||||
sleep 1
|
||||
local LOOP_DEVICES
|
||||
LOOP_DEVICES=$(losetup --list | grep "$(basename "${1}")" | cut -f1 -d' ')
|
||||
for LOOP_DEV in ${LOOP_DEVICES}; do
|
||||
if [ -n "${LOOP_DEV}" ]; then
|
||||
local MOUNTED_DIR
|
||||
MOUNTED_DIR=$(mount | grep "$(basename "${LOOP_DEV}")" | head -n 1 | cut -f 3 -d ' ')
|
||||
if [ -n "${MOUNTED_DIR}" ] && [ "${MOUNTED_DIR}" != "/" ]; then
|
||||
unmount "$(dirname "${MOUNTED_DIR}")"
|
||||
fi
|
||||
sleep 1
|
||||
losetup -d "${LOOP_DEV}"
|
||||
local LOOP_DEV=$(losetup -j ${1} | cut -f1 -d':')
|
||||
if [ -n "${LOOP_DEV}" ]; then
|
||||
local MOUNTED_DIR=$(mount | grep $(basename ${LOOP_DEV} | head -n 1 | cut -f 3 -d ' '))
|
||||
if [ -n "${MOUNTED_DIR}" ]; then
|
||||
unmount $(dirname ${MOUNTED_DIR})
|
||||
fi
|
||||
done
|
||||
sleep 1
|
||||
kpartx -ds ${LOOP_DEV}
|
||||
losetup -d ${LOOP_DEV}
|
||||
fi
|
||||
}
|
||||
export -f unmount_image
|
||||
|
||||
on_chroot() {
|
||||
if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/proc)"; then
|
||||
mount -t proc proc "${ROOTFS_DIR}/proc"
|
||||
if ! mount | grep -q `realpath ${ROOTFS_DIR}/proc`; then
|
||||
mount -t proc proc ${ROOTFS_DIR}/proc
|
||||
fi
|
||||
|
||||
if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/dev)"; then
|
||||
mount --bind /dev "${ROOTFS_DIR}/dev"
|
||||
if ! mount | grep -q `realpath ${ROOTFS_DIR}/dev`; then
|
||||
mount --bind /dev ${ROOTFS_DIR}/dev
|
||||
fi
|
||||
|
||||
if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/dev/pts)"; then
|
||||
mount --bind /dev/pts "${ROOTFS_DIR}/dev/pts"
|
||||
if ! mount | grep -q `realpath ${ROOTFS_DIR}/dev/pts`; then
|
||||
mount --bind /dev/pts ${ROOTFS_DIR}/dev/pts
|
||||
fi
|
||||
|
||||
if ! mount | grep -q "$(realpath "${ROOTFS_DIR}"/sys)"; then
|
||||
mount --bind /sys "${ROOTFS_DIR}/sys"
|
||||
if ! mount | grep -q `realpath ${ROOTFS_DIR}/sys`; then
|
||||
mount --bind /sys ${ROOTFS_DIR}/sys
|
||||
fi
|
||||
|
||||
capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
|
||||
chroot ${ROOTFS_DIR}/ "$@"
|
||||
}
|
||||
export -f on_chroot
|
||||
|
||||
update_issue() {
|
||||
echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using ${PI_GEN}, ${PI_GEN_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue"
|
||||
local GIT_HASH=$(git rev-parse HEAD)
|
||||
echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using pi-gen, https://github.com/RPi-Distro/pi-gen, ${GIT_HASH}, ${1}" > ${ROOTFS_DIR}/etc/rpi-issue
|
||||
}
|
||||
export -f update_issue
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
# dependencies_check
|
||||
# $@ Dependency files to check
|
||||
#
|
||||
# Each dependency is in the form of a tool to test for, optionally followed by
|
||||
# a : and the name of a package if the package on a Debian-ish system is not
|
||||
# named for the tool (i.e., qemu-user-static).
|
||||
dependencies_check()
|
||||
{
|
||||
local depfile deps missing
|
||||
|
||||
for depfile in "$@"; do
|
||||
if [[ -e "$depfile" ]]; then
|
||||
deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${BASE_DIR}/depends")"
|
||||
|
||||
fi
|
||||
for dep in $deps; do
|
||||
if ! hash "${dep%:*}" 2>/dev/null; then
|
||||
missing="${missing:+$missing }${dep#*:}"
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if [[ "$missing" ]]; then
|
||||
echo "Required dependencies not installed"
|
||||
echo
|
||||
echo "This can be resolved on Debian/Raspbian systems by installing:"
|
||||
echo "$missing"
|
||||
false
|
||||
fi
|
||||
|
||||
# If we're building on a native arm platform, we don't need to check for
|
||||
# binfmt_misc or require it to be loaded.
|
||||
|
||||
binfmt_misc_required=1
|
||||
|
||||
case $(uname -m) in
|
||||
aarch64)
|
||||
binfmt_misc_required=0
|
||||
;;
|
||||
arm*)
|
||||
binfmt_misc_required=0
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ "${binfmt_misc_required}" == "1" ]]; then
|
||||
if ! grep -q "/proc/sys/fs/binfmt_misc" /proc/mounts; then
|
||||
echo "Module binfmt_misc not loaded in host"
|
||||
echo "Please run:"
|
||||
echo " sudo modprobe binfmt_misc"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,256 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# QCOW2 Routines
|
||||
|
||||
export CURRENT_IMAGE
|
||||
export CURRENT_MOUNTPOINT
|
||||
|
||||
export NBD_DEV
|
||||
export MAP_BOOT_DEV
|
||||
export MAP_ROOT_DEV
|
||||
|
||||
# set in build.sh
|
||||
# should be fairly enough for the beginning
|
||||
# overwrite here by uncommenting following lines
|
||||
# BASE_QCOW2_SIZE=12G
|
||||
|
||||
# find and initialize free block device nodes
|
||||
init_nbd() {
|
||||
modprobe nbd max_part=16
|
||||
if [ -z "${NBD_DEV}" ]; then
|
||||
for x in /sys/class/block/nbd* ; do
|
||||
S=`cat $x/size`
|
||||
if [ "$S" == "0" ] ; then
|
||||
NBD_DEV=/dev/$(basename $x)
|
||||
MAP_BOOT_DEV=/dev/mapper/$(basename $x)p1
|
||||
MAP_ROOT_DEV=/dev/mapper/$(basename $x)p2
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
export -f init_nbd
|
||||
|
||||
# connect image to block device
|
||||
connect_blkdev() {
|
||||
init_nbd
|
||||
qemu-nbd --discard=unmap -c $NBD_DEV "$1"
|
||||
sync
|
||||
kpartx -as $NBD_DEV
|
||||
sync
|
||||
CURRENT_IMAGE="$1"
|
||||
}
|
||||
export -f connect_blkdev
|
||||
|
||||
# disconnect image from block device
|
||||
disconnect_blkdev() {
|
||||
kpartx -d $NBD_DEV
|
||||
qemu-nbd -d $NBD_DEV
|
||||
NBD_DEV=
|
||||
MAP_BOOT_DEV=
|
||||
MAP_ROOT_DEV=
|
||||
CURRENT_IMAGE=
|
||||
}
|
||||
export -f disconnect_blkdev
|
||||
|
||||
# mount qcow2 image: mount_image <image file> <mountpoint>
|
||||
mount_qimage() {
|
||||
connect_blkdev "$1"
|
||||
mount -v -t ext4 $MAP_ROOT_DEV "$2"
|
||||
mkdir -p "${ROOTFS_DIR}/boot"
|
||||
mount -v -t vfat $MAP_BOOT_DEV "$2/boot"
|
||||
CURRENT_MOUNTPOINT="$2"
|
||||
}
|
||||
export -f mount_qimage
|
||||
|
||||
# umount qcow2 image: umount_image <current mountpoint>
|
||||
umount_qimage() {
|
||||
sync
|
||||
#umount "$1/boot"
|
||||
while mount | grep -q "$1"; do
|
||||
local LOCS
|
||||
LOCS=$(mount | grep "$1" | cut -f 3 -d ' ' | sort -r)
|
||||
for loc in $LOCS; do
|
||||
echo "$loc"
|
||||
while mountpoint -q "$loc" && ! umount "$loc"; do
|
||||
sleep 0.1
|
||||
done
|
||||
done
|
||||
done
|
||||
CURRENT_MOUNTPOINT=
|
||||
disconnect_blkdev
|
||||
}
|
||||
export -f umount_qimage
|
||||
|
||||
# create base image / backing image / mount image
|
||||
load_qimage() {
|
||||
if [ -z "${CURRENT_MOUNTPOINT}" ]; then
|
||||
if [ ! -d "${ROOTFS_DIR}" ]; then
|
||||
mkdir -p "${ROOTFS_DIR}";
|
||||
fi
|
||||
|
||||
if [ "${CLEAN}" = "1" ] && [ -f "${WORK_DIR}/image-${STAGE}.qcow2" ]; then
|
||||
rm -f "${WORK_DIR}/image-${STAGE}.qcow2";
|
||||
fi
|
||||
|
||||
if [ ! -f "${WORK_DIR}/image-${STAGE}.qcow2" ]; then
|
||||
pushd ${WORK_DIR} > /dev/null
|
||||
init_nbd
|
||||
if [ -z "${PREV_STAGE}" ]; then
|
||||
echo "Creating base image: image-${STAGE}.qcow2"
|
||||
# -o preallocation=falloc
|
||||
qemu-img create -f qcow2 image-${STAGE}.qcow2 $BASE_QCOW2_SIZE
|
||||
sync
|
||||
qemu-nbd --discard=unmap -c $NBD_DEV image-${STAGE}.qcow2
|
||||
sync
|
||||
sfdisk $NBD_DEV << EOF
|
||||
4MiB,250MiB,c,*
|
||||
254MiB,,83;
|
||||
EOF
|
||||
sync
|
||||
kpartx -as $NBD_DEV
|
||||
mkdosfs -n boot -F 32 -v $MAP_BOOT_DEV
|
||||
mkfs.ext4 -L rootfs -O "^huge_file,^metadata_csum,^64bit" $MAP_ROOT_DEV
|
||||
sync
|
||||
else
|
||||
if [ ! -f "${WORK_DIR}/image-${PREV_STAGE}.qcow2" ]; then
|
||||
exit 1;
|
||||
fi
|
||||
echo "Creating backing image: image-${STAGE}.qcow2 <- ${WORK_DIR}/image-${PREV_STAGE}.qcow2"
|
||||
qemu-img create -f qcow2 \
|
||||
-o backing_file=${WORK_DIR}/image-${PREV_STAGE}.qcow2 \
|
||||
${WORK_DIR}/image-${STAGE}.qcow2
|
||||
sync
|
||||
qemu-nbd --discard=unmap -c $NBD_DEV image-${STAGE}.qcow2
|
||||
sync
|
||||
kpartx -as $NBD_DEV
|
||||
fi
|
||||
|
||||
mount -v -t ext4 $MAP_ROOT_DEV "${ROOTFS_DIR}"
|
||||
mkdir -p "${ROOTFS_DIR}/boot"
|
||||
mount -v -t vfat $MAP_BOOT_DEV "${ROOTFS_DIR}/boot"
|
||||
CURRENT_IMAGE=${WORK_DIR}/image-${STAGE}.qcow2
|
||||
CURRENT_MOUNTPOINT=${ROOTFS_DIR}
|
||||
popd > /dev/null
|
||||
else
|
||||
mount_qimage "${WORK_DIR}/image-${STAGE}.qcow2" "${ROOTFS_DIR}"
|
||||
fi
|
||||
echo "Current image in use: ${CURRENT_IMAGE} (MP: ${CURRENT_MOUNTPOINT})"
|
||||
fi
|
||||
}
|
||||
export -f load_qimage
|
||||
|
||||
# umount current image and refresh mount point env var
|
||||
unload_qimage() {
|
||||
if [ ! -z "${CURRENT_MOUNTPOINT}" ]; then
|
||||
fstrim -v "${CURRENT_MOUNTPOINT}" || true
|
||||
umount_qimage "${CURRENT_MOUNTPOINT}"
|
||||
fi
|
||||
}
|
||||
export -f unload_qimage
|
||||
|
||||
# based on: https://github.com/SirLagz/RaspberryPi-ImgAutoSizer
|
||||
# helper function for make_bootable_image, do not call directly
|
||||
function resize_qcow2() {
|
||||
if [ -z "$CALL_FROM_MBI" ]; then
|
||||
echo "resize_qcow2: cannot be called directly, use make_bootable_image instead"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# ROOT_MARGIN=$((800*1024*1024))
|
||||
ROOT_MARGIN=$((1*1024*1024))
|
||||
PARTED_OUT=`parted -s -m "$NBD_DEV" unit B print`
|
||||
PART_NO=`echo "$PARTED_OUT" | grep ext4 | awk -F: ' { print $1 } '`
|
||||
PART_START=`echo "$PARTED_OUT" | grep ext4 | awk -F: ' { print substr($2,1,length($2)-1) } '`
|
||||
|
||||
e2fsck -y -f $MAP_ROOT_DEV || true
|
||||
|
||||
DATA_SIZE=`resize2fs -P $MAP_ROOT_DEV | awk -F': ' ' { print $2 } '`
|
||||
BLOCK_SIZE=$(dumpe2fs -h $MAP_ROOT_DEV | grep 'Block size' | awk -F': ' ' { print $2 }')
|
||||
BLOCK_SIZE=${BLOCK_SIZE// /}
|
||||
|
||||
let DATA_SIZE=$DATA_SIZE+$ROOT_MARGIN/$BLOCK_SIZE
|
||||
resize2fs -p $MAP_ROOT_DEV $DATA_SIZE
|
||||
sleep 1
|
||||
|
||||
let PART_NEW_SIZE=$DATA_SIZE*$BLOCK_SIZE
|
||||
let PART_NEW_END=$PART_START+$PART_NEW_SIZE
|
||||
ACT1=`parted -s "$NBD_DEV" rm 2`
|
||||
ACT2=`parted -s "$NBD_DEV" unit B mkpart primary $PART_START $PART_NEW_END`
|
||||
NEW_IMG_SIZE=`parted -s -m "$NBD_DEV" unit B print free | tail -1 | awk -F: ' { print substr($2,1,length($2)-1) } '`
|
||||
}
|
||||
export -f resize_qcow2
|
||||
|
||||
# create raw img from qcow2: make_bootable_image <in.qcow2> <out.img>
|
||||
function make_bootable_image() {
|
||||
|
||||
EXPORT_QCOW2="$1"
|
||||
EXPORT_IMAGE="$2"
|
||||
|
||||
echo "Connect block device to source qcow2"
|
||||
connect_blkdev "${EXPORT_QCOW2}"
|
||||
|
||||
echo "Resize fs and partition"
|
||||
CALL_FROM_MBI=1
|
||||
resize_qcow2
|
||||
sync
|
||||
CALL_FROM_MBI=
|
||||
|
||||
echo "Disconnect block device"
|
||||
disconnect_blkdev
|
||||
|
||||
if [ -z "$NEW_IMG_SIZE" ]; then
|
||||
echo "NEW_IMG_SIZE could not be calculated, cannot process image. Exit."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Shrinking qcow2 image"
|
||||
qemu-img resize --shrink "${EXPORT_QCOW2}" $NEW_IMG_SIZE
|
||||
sync
|
||||
|
||||
echo "Convert qcow2 to raw image"
|
||||
qemu-img convert -f qcow2 -O raw "${EXPORT_QCOW2}" "${EXPORT_IMAGE}"
|
||||
sync
|
||||
|
||||
echo "Get PARTUUIDs from image"
|
||||
IMGID="$(blkid -o value -s PTUUID "${EXPORT_IMAGE}")"
|
||||
|
||||
BOOT_PARTUUID="${IMGID}-01"
|
||||
echo "Boot: $BOOT_PARTUUID"
|
||||
ROOT_PARTUUID="${IMGID}-02"
|
||||
echo "Root: $ROOT_PARTUUID"
|
||||
|
||||
echo "Mount image"
|
||||
MOUNTROOT=${WORK_DIR}/tmpimage
|
||||
mkdir -p $MOUNTROOT
|
||||
|
||||
MOUNTPT=$MOUNTROOT
|
||||
PARTITION=2
|
||||
mount "${EXPORT_IMAGE}" "$MOUNTPT" -o loop,offset=$[ `/sbin/sfdisk -d "${EXPORT_IMAGE}" | grep "start=" | head -n $PARTITION | tail -n1 | sed 's/.*start=[ ]*//' | sed 's/,.*//'` * 512 ],sizelimit=$[ `/sbin/sfdisk -d "${EXPORT_IMAGE}" | grep "start=" | head -n $PARTITION | tail -n1 | sed 's/.*size=[ ]*//' | sed 's/,.*//'` * 512 ] || exit 1
|
||||
|
||||
MOUNTPT=$MOUNTROOT/boot
|
||||
PARTITION=1
|
||||
mount "${EXPORT_IMAGE}" "$MOUNTPT" -o loop,offset=$[ `/sbin/sfdisk -d "${EXPORT_IMAGE}" | grep "start=" | head -n $PARTITION | tail -n1 | sed 's/.*start=[ ]*//' | sed 's/,.*//'` * 512 ],sizelimit=$[ `/sbin/sfdisk -d "${EXPORT_IMAGE}" | grep "start=" | head -n $PARTITION | tail -n1 | sed 's/.*size=[ ]*//' | sed 's/,.*//'` * 512 ] || exit 1
|
||||
|
||||
if [ ! -d "${MOUNTROOT}/root" ]; then
|
||||
echo "Image damaged or not mounted. Exit."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Setup PARTUUIDs"
|
||||
if [ ! -z "$BOOT_PARTUUID" ] && [ ! -z "$ROOT_PARTUUID" ]; then
|
||||
echo "Set UUIDs to make it bootable"
|
||||
sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${MOUNTROOT}/etc/fstab"
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${MOUNTROOT}/etc/fstab"
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${MOUNTROOT}/boot/cmdline.txt"
|
||||
fi
|
||||
|
||||
echo "Umount image"
|
||||
sync
|
||||
umount "${MOUNTROOT}/boot" || exit 1
|
||||
umount "${MOUNTROOT}" || exit 1
|
||||
|
||||
echo "Remove qcow2 export image"
|
||||
rm -f "${EXPORT_QCOW2}"
|
||||
}
|
||||
export -f make_bootable_image
|
||||
0
scripts/release.sh
Executable file
0
scripts/release.sh
Executable file
|
|
@ -1,11 +0,0 @@
|
|||
# Deletes comments and collapses whitespace in ##-packages files
|
||||
|
||||
# Append (N)ext line to buffer
|
||||
# if (!)not ($)buffer is EOF, (b)ranch to (:)label loop
|
||||
:loop
|
||||
N
|
||||
$ !b loop
|
||||
|
||||
# Buffer is "line1\nline2\n...lineN", del comments and collapse whitespace
|
||||
s/#[^\n]*//g
|
||||
s/[[:space:]]\{1,\}/ /g
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/"
|
||||
install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
|
||||
sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list"
|
||||
sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.list"
|
||||
|
||||
if [ -n "$APT_PROXY" ]; then
|
||||
install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
|
||||
sed "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" -i -e "s|APT_PROXY|${APT_PROXY}|"
|
||||
else
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
|
||||
fi
|
||||
|
||||
cat files/raspberrypi.gpg.key | gpg --dearmor > "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/raspberrypi-archive-stable.gpg"
|
||||
on_chroot << EOF
|
||||
dpkg --add-architecture armhf
|
||||
apt-get update
|
||||
apt-get dist-upgrade -y
|
||||
EOF
|
||||
|
|
@ -1 +0,0 @@
|
|||
raspberrypi-archive-keyring
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
deb http://archive.raspberrypi.org/debian/ RELEASE main
|
||||
# Uncomment line below then 'apt-get update' to enable 'apt-get source'
|
||||
#deb-src http://archive.raspberrypi.org/debian/ RELEASE main
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
deb http://deb.debian.org/debian RELEASE main contrib non-free
|
||||
deb http://security.debian.org/debian-security RELEASE-security main contrib non-free
|
||||
deb http://deb.debian.org/debian RELEASE-updates main contrib non-free
|
||||
# Uncomment deb-src lines below then 'apt-get update' to enable 'apt-get source'
|
||||
#deb-src http://deb.debian.org/debian RELEASE main contrib non-free
|
||||
#deb-src http://security.debian.org/debian-security RELEASE-security main contrib non-free
|
||||
#deb-src http://deb.debian.org/debian RELEASE-updates main contrib non-free
|
||||
17
stage0/01-configure-apt/00-run.sh
Executable file
17
stage0/01-configure-apt/00-run.sh
Executable file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -m 644 files/sources.list ${ROOTFS_DIR}/etc/apt/
|
||||
install -m 644 files/raspi.list ${ROOTFS_DIR}/etc/apt/sources.list.d/
|
||||
|
||||
if [ -n "$APT_PROXY" ]; then
|
||||
install -m 644 files/51cache ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
|
||||
sed ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -i -e "s|APT_PROXY|${APT_PROXY}|"
|
||||
else
|
||||
rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
|
||||
fi
|
||||
|
||||
on_chroot apt-key add - < files/raspberrypi.gpg.key
|
||||
on_chroot sh -e - << EOF
|
||||
apt-get update
|
||||
apt-get dist-upgrade -y
|
||||
EOF
|
||||
3
stage0/01-configure-apt/files/raspi.list
Normal file
3
stage0/01-configure-apt/files/raspi.list
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
deb http://archive.raspberrypi.org/debian/ jessie main ui staging
|
||||
# Uncomment line below then 'apt-get update' to enable 'apt-get source'
|
||||
#deb-src http://archive.raspberrypi.org/debian/ jessie main ui
|
||||
3
stage0/01-configure-apt/files/sources.list
Normal file
3
stage0/01-configure-apt/files/sources.list
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi
|
||||
# Uncomment line below then 'apt-get update' to enable 'apt-get source'
|
||||
#deb-src http://archive.raspbian.org/raspbian/ jessie main contrib non-free rpi
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1 +0,0 @@
|
|||
locales
|
||||
|
|
@ -1,2 +1 @@
|
|||
raspberrypi-bootloader
|
||||
raspberrypi-kernel
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,4 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
if [ ! -d "${ROOTFS_DIR}" ] || [ "${USE_QCOW2}" = "1" ]; then
|
||||
bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
|
||||
if [ ! -d ${ROOTFS_DIR} ]; then
|
||||
bootstrap jessie ${ROOTFS_DIR} http://mirrordirector.raspbian.org/raspbian/
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -m 644 files/cmdline.txt "${ROOTFS_DIR}/boot/"
|
||||
install -m 644 files/config.txt "${ROOTFS_DIR}/boot/"
|
||||
install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/
|
||||
install -m 644 files/config.txt ${ROOTFS_DIR}/boot/
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait
|
||||
dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
# For more options and information see
|
||||
# http://rpf.io/configtxt
|
||||
# http://www.raspberrypi.org/documentation/configuration/config-txt.md
|
||||
# Some settings may impact device functionality. See link above for details
|
||||
|
||||
# uncomment if you get no picture on HDMI for a default "safe" mode
|
||||
#hdmi_safe=1
|
||||
|
||||
# uncomment this if your display has a black border of unused pixels visible
|
||||
# and your display can output without overscan
|
||||
#disable_overscan=1
|
||||
|
||||
# uncomment the following to adjust overscan. Use positive numbers if console
|
||||
# goes off screen, and negative if there is too much border
|
||||
#overscan_left=16
|
||||
|
|
@ -43,41 +47,10 @@
|
|||
#dtparam=i2s=on
|
||||
#dtparam=spi=on
|
||||
|
||||
# Uncomment this to enable infrared communication.
|
||||
#dtoverlay=gpio-ir,gpio_pin=17
|
||||
#dtoverlay=gpio-ir-tx,gpio_pin=18
|
||||
# Uncomment this to enable the lirc-rpi module
|
||||
#dtoverlay=lirc-rpi
|
||||
|
||||
# Additional overlays and parameters are documented /boot/overlays/README
|
||||
|
||||
# Enable audio (loads snd_bcm2835)
|
||||
dtparam=audio=on
|
||||
|
||||
# Automatically load overlays for detected cameras
|
||||
camera_auto_detect=1
|
||||
|
||||
# Automatically load overlays for detected DSI displays
|
||||
display_auto_detect=1
|
||||
|
||||
# Enable DRM VC4 V3D driver
|
||||
dtoverlay=vc4-kms-v3d
|
||||
max_framebuffers=2
|
||||
|
||||
# Run in 64-bit mode
|
||||
arm_64bit=1
|
||||
|
||||
# Disable compensation for displays with overscan
|
||||
disable_overscan=1
|
||||
|
||||
[cm4]
|
||||
# Enable host mode on the 2711 built-in XHCI USB controller.
|
||||
# This line should be removed if the legacy DWC2 controller is required
|
||||
# (e.g. for USB device mode) or if USB support is not required.
|
||||
otg_mode=1
|
||||
|
||||
[all]
|
||||
|
||||
[pi4]
|
||||
# Run as fast as firmware / board allows
|
||||
arm_boost=1
|
||||
|
||||
[all]
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raspi-config
|
||||
|
|
@ -1,10 +1,15 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -d "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d"
|
||||
install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf"
|
||||
install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"
|
||||
install -d ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d
|
||||
install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf
|
||||
install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd?
|
||||
install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab
|
||||
|
||||
on_chroot << EOF
|
||||
on_chroot sh -e - <<EOF
|
||||
if ! id -u pi >/dev/null 2>&1; then
|
||||
adduser --disabled-password --gecos "" pi
|
||||
fi
|
||||
echo "pi:raspberry" | chpasswd
|
||||
echo "root:root" | chpasswd
|
||||
EOF
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
proc /proc proc defaults 0 0
|
||||
BOOTDEV /boot vfat defaults,flush 0 2
|
||||
ROOTDEV / ext4 defaults,noatime 0 1
|
||||
/dev/mmcblk0p1 /boot vfat defaults 0 2
|
||||
/dev/mmcblk0p2 / ext4 defaults,noatime 0 1
|
||||
|
|
|
|||
2
stage1/01-sys-tweaks/files/policy-rc.d
Executable file
2
stage1/01-sys-tweaks/files/policy-rc.d
Executable file
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
exit 101
|
||||
|
|
@ -1 +0,0 @@
|
|||
netbase
|
||||
9
stage1/02-net-tweaks/00-patches/01-hosts.diff
Normal file
9
stage1/02-net-tweaks/00-patches/01-hosts.diff
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
Index: jessie-stage1/rootfs/etc/hosts
|
||||
===================================================================
|
||||
--- jessie-stage1.orig/rootfs/etc/hosts
|
||||
+++ jessie-stage1/rootfs/etc/hosts
|
||||
@@ -3,3 +3,4 @@
|
||||
ff02::1 ip6-allnodes
|
||||
ff02::2 ip6-allrouters
|
||||
|
||||
+127.0.1.1 raspberrypi
|
||||
13
stage1/02-net-tweaks/00-patches/02-persistant-net.diff
Normal file
13
stage1/02-net-tweaks/00-patches/02-persistant-net.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
Index: jessie-stage1/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules
|
||||
===================================================================
|
||||
--- jessie-stage1.orig/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules
|
||||
+++ jessie-stage1/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules
|
||||
@@ -22,7 +22,7 @@ IMPORT{cmdline}="net.ifnames"
|
||||
ENV{net.ifnames}=="1", GOTO="persistent_net_generator_end"
|
||||
|
||||
# device name whitelist
|
||||
-KERNEL!="eth*|ath*|wlan*[0-9]|msh*|ra*|sta*|ctc*|lcs*|hsi*", \
|
||||
+KERNEL!="ath*|msh*|ra*|sta*|ctc*|lcs*|hsi*", \
|
||||
GOTO="persistent_net_generator_end"
|
||||
|
||||
# ignore Xen virtual interfaces
|
||||
2
stage1/02-net-tweaks/00-patches/series
Normal file
2
stage1/02-net-tweaks/00-patches/series
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
01-hosts.diff
|
||||
02-persistant-net.diff
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
echo "${TARGET_HOSTNAME}" > "${ROOTFS_DIR}/etc/hostname"
|
||||
echo "127.0.1.1 ${TARGET_HOSTNAME}" >> "${ROOTFS_DIR}/etc/hosts"
|
||||
install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf
|
||||
install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/interfaces
|
||||
install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname
|
||||
|
||||
on_chroot << EOF
|
||||
SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_net_names 1
|
||||
on_chroot sh -e - << EOF
|
||||
dpkg-divert --add --local /lib/udev/rules.d/75-persistent-net-generator.rules
|
||||
EOF
|
||||
|
|
|
|||
1
stage1/02-net-tweaks/files/hostname
Normal file
1
stage1/02-net-tweaks/files/hostname
Normal file
|
|
@ -0,0 +1 @@
|
|||
raspberrypi
|
||||
4
stage1/02-net-tweaks/files/interfaces
Normal file
4
stage1/02-net-tweaks/files/interfaces
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
auto lo
|
||||
|
||||
iface lo inet loopback
|
||||
iface eth0 inet dhcp
|
||||
3
stage1/02-net-tweaks/files/ipv6.conf
Normal file
3
stage1/02-net-tweaks/files/ipv6.conf
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# Don't load ipv6 by default
|
||||
alias net-pf-10 off
|
||||
#alias ipv6 off
|
||||
|
|
@ -1,2 +1 @@
|
|||
libraspberrypi-bin libraspberrypi0
|
||||
systemd-timesyncd
|
||||
libraspberrypi-bin libraspberrypi0 raspi-config
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
if [ ! -d "${ROOTFS_DIR}" ]; then
|
||||
if [ ! -d ${ROOTFS_DIR} ]; then
|
||||
copy_previous
|
||||
fi
|
||||
|
|
|
|||
3
stage2/00-copies-and-fills/00-run.sh
Executable file
3
stage2/00-copies-and-fills/00-run.sh
Executable file
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
touch ${ROOTFS_DIR}/spindle_install
|
||||
1
stage2/00-copies-and-fills/01-packages
Normal file
1
stage2/00-copies-and-fills/01-packages
Normal file
|
|
@ -0,0 +1 @@
|
|||
raspi-copies-and-fills
|
||||
3
stage2/00-copies-and-fills/02-run.sh
Executable file
3
stage2/00-copies-and-fills/02-run.sh
Executable file
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
rm -f ${ROOTFS_DIR}/spindle_install
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,14 +1,12 @@
|
|||
ssh less fbset sudo psmisc strace ed ncdu crda
|
||||
console-setup keyboard-configuration debconf-utils parted
|
||||
build-essential manpages-dev bash-completion gdb pkg-config
|
||||
python-is-python3
|
||||
python3-rpi.gpio v4l-utils
|
||||
python3-gpiozero
|
||||
ssh locales less fbset sudo psmisc strace module-init-tools ed ncdu crda
|
||||
console-setup keyboard-configuration debconf-utils parted unzip
|
||||
build-essential manpages-dev python bash-completion gdb pkg-config
|
||||
python-rpi.gpio v4l-utils
|
||||
avahi-daemon
|
||||
lua5.1
|
||||
luajit
|
||||
hardlink ca-certificates curl
|
||||
fake-hwclock nfs-common usbutils
|
||||
fake-hwclock ntp nfs-common usbutils
|
||||
libraspberrypi-dev libraspberrypi-doc libfreetype6-dev
|
||||
dosfstools
|
||||
dphys-swapfile
|
||||
|
|
@ -16,19 +14,3 @@ raspberrypi-sys-mods
|
|||
pi-bluetooth
|
||||
apt-listchanges
|
||||
usb-modeswitch
|
||||
libpam-chksshpwd
|
||||
rpi-update
|
||||
libmtp-runtime
|
||||
rsync
|
||||
htop
|
||||
man-db
|
||||
policykit-1
|
||||
ssh-import-id
|
||||
rng-tools
|
||||
ethtool
|
||||
ntfs-3g
|
||||
pciutils
|
||||
rpi-eeprom
|
||||
raspinfo
|
||||
udisks2
|
||||
unzip zip p7zip-full
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
cifs-utils
|
||||
libcamera-apps-lite
|
||||
mkvtoolnix
|
||||
|
|
|
|||
10
stage2/01-sys-tweaks/00-patches/00-sudoers.diff
Normal file
10
stage2/01-sys-tweaks/00-patches/00-sudoers.diff
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
Index: jessie-stage2/rootfs/etc/sudoers
|
||||
===================================================================
|
||||
--- jessie-stage2.orig/rootfs/etc/sudoers
|
||||
+++ jessie-stage2/rootfs/etc/sudoers
|
||||
@@ -25,3 +25,5 @@ root ALL=(ALL:ALL) ALL
|
||||
# See sudoers(5) for more information on "#include" directives:
|
||||
|
||||
#includedir /etc/sudoers.d
|
||||
+
|
||||
+pi ALL=(ALL) NOPASSWD: ALL
|
||||
17
stage2/01-sys-tweaks/00-patches/03-console-setup.diff
Normal file
17
stage2/01-sys-tweaks/00-patches/03-console-setup.diff
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Index: jessie-stage2/rootfs/etc/default/console-setup
|
||||
===================================================================
|
||||
--- jessie-stage2.orig/rootfs/etc/default/console-setup
|
||||
+++ jessie-stage2/rootfs/etc/default/console-setup
|
||||
@@ -6,9 +6,9 @@ ACTIVE_CONSOLES="/dev/tty[1-6]"
|
||||
|
||||
CHARMAP="UTF-8"
|
||||
|
||||
-CODESET="Lat15"
|
||||
-FONTFACE="Fixed"
|
||||
-FONTSIZE="8x16"
|
||||
+CODESET="guess"
|
||||
+FONTFACE=""
|
||||
+FONTSIZE=""
|
||||
|
||||
VIDEOMODE=
|
||||
|
||||
15
stage2/01-sys-tweaks/00-patches/06-rc_local.diff
Normal file
15
stage2/01-sys-tweaks/00-patches/06-rc_local.diff
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Index: jessie-stage2/rootfs/etc/rc.local
|
||||
===================================================================
|
||||
--- jessie-stage2.orig/rootfs/etc/rc.local
|
||||
+++ jessie-stage2/rootfs/etc/rc.local
|
||||
@@ -11,4 +11,10 @@
|
||||
#
|
||||
# By default this script does nothing.
|
||||
|
||||
+# Print the IP address
|
||||
+_IP=$(hostname -I) || true
|
||||
+if [ "$_IP" ]; then
|
||||
+ printf "My IP address is %s\n" "$_IP"
|
||||
+fi
|
||||
+
|
||||
exit 0
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
--- stage2.orig/rootfs/boot/cmdline.txt
|
||||
+++ stage2/rootfs/boot/cmdline.txt
|
||||
--- a/rootfs/boot/cmdline.txt
|
||||
+++ b/rootfs/boot/cmdline.txt
|
||||
@@ -1 +1 @@
|
||||
-console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait
|
||||
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
|
||||
-dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
|
||||
+dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
00-sudoers.diff
|
||||
01-useradd.diff
|
||||
02-swap.diff
|
||||
03-console-setup.diff
|
||||
04-inputrc.diff
|
||||
05-path.diff
|
||||
06-rc_local.diff
|
||||
07-resize-init.diff
|
||||
|
|
|
|||
|
|
@ -1,65 +1,41 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -m 755 files/resize2fs_once "${ROOTFS_DIR}/etc/init.d/"
|
||||
install -m 755 files/regenerate_ssh_host_keys ${ROOTFS_DIR}/etc/init.d/
|
||||
install -m 755 files/apply_noobs_os_config ${ROOTFS_DIR}/etc/init.d/
|
||||
install -m 755 files/resize2fs_once ${ROOTFS_DIR}/etc/init.d/
|
||||
|
||||
install -d "${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d"
|
||||
install -m 644 files/ttyoutput.conf "${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/"
|
||||
install -d ${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d
|
||||
install -m 644 files/ttyoutput.conf ${ROOTFS_DIR}/etc/systemd/system/rc-local.service.d/
|
||||
|
||||
install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/"
|
||||
install -m 644 files/50raspi ${ROOTFS_DIR}/etc/apt/apt.conf.d/
|
||||
install -m 644 files/98-rpi.conf ${ROOTFS_DIR}/etc/sysctl.d/
|
||||
|
||||
install -m 644 files/console-setup "${ROOTFS_DIR}/etc/default/"
|
||||
|
||||
install -m 755 files/rc.local "${ROOTFS_DIR}/etc/"
|
||||
|
||||
if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then
|
||||
install -v -m 0700 -o 1000 -g 1000 -d "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh
|
||||
echo "${PUBKEY_SSH_FIRST_USER}" >"${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys
|
||||
chown 1000:1000 "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys
|
||||
chmod 0600 "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys
|
||||
fi
|
||||
|
||||
if [ "${PUBKEY_ONLY_SSH}" = "1" ]; then
|
||||
sed -i -Ee 's/^#?[[:blank:]]*PubkeyAuthentication[[:blank:]]*no[[:blank:]]*$/PubkeyAuthentication yes/
|
||||
s/^#?[[:blank:]]*PasswordAuthentication[[:blank:]]*yes[[:blank:]]*$/PasswordAuthentication no/' "${ROOTFS_DIR}"/etc/ssh/sshd_config
|
||||
fi
|
||||
|
||||
on_chroot << EOF
|
||||
on_chroot sh -e - <<EOF
|
||||
systemctl disable hwclock.sh
|
||||
systemctl disable nfs-common
|
||||
systemctl disable rpcbind
|
||||
if [ "${ENABLE_SSH}" == "1" ]; then
|
||||
systemctl enable ssh
|
||||
else
|
||||
systemctl disable ssh
|
||||
fi
|
||||
systemctl disable ssh
|
||||
systemctl enable regenerate_ssh_host_keys
|
||||
EOF
|
||||
|
||||
if [ "${USE_QEMU}" = "1" ]; then
|
||||
echo "enter QEMU mode"
|
||||
install -m 644 files/90-qemu.rules "${ROOTFS_DIR}/etc/udev/rules.d/"
|
||||
on_chroot << EOF
|
||||
systemctl disable resize2fs_once
|
||||
EOF
|
||||
echo "leaving QEMU mode"
|
||||
else
|
||||
on_chroot << EOF
|
||||
systemctl enable apply_noobs_os_config
|
||||
systemctl enable resize2fs_once
|
||||
EOF
|
||||
fi
|
||||
|
||||
on_chroot <<EOF
|
||||
on_chroot sh -e - << \EOF
|
||||
for GRP in input spi i2c gpio; do
|
||||
groupadd -f -r "\$GRP"
|
||||
groupadd -f -r $GRP
|
||||
done
|
||||
for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
|
||||
adduser pi $GRP
|
||||
done
|
||||
EOF
|
||||
|
||||
on_chroot << EOF
|
||||
on_chroot sh -e - <<EOF
|
||||
setupcon --force --save-only -v
|
||||
EOF
|
||||
|
||||
on_chroot << EOF
|
||||
on_chroot sh -e - <<EOF
|
||||
usermod --pass='*' root
|
||||
EOF
|
||||
|
||||
rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key*
|
||||
rm -f ${ROOTFS_DIR}/etc/ssh/ssh_host_*_key*
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
KERNEL=="sda", SYMLINK+="mmcblk0"
|
||||
KERNEL=="sda?", SYMLINK+="mmcblk0p%n"
|
||||
KERNEL=="sda2", SYMLINK+="root"
|
||||
3
stage2/01-sys-tweaks/files/98-rpi.conf
Normal file
3
stage2/01-sys-tweaks/files/98-rpi.conf
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
kernel.printk = 3 4 1 3
|
||||
vm.swappiness=1
|
||||
vm.min_free_kbytes = 8192
|
||||
31
stage2/01-sys-tweaks/files/apply_noobs_os_config
Normal file
31
stage2/01-sys-tweaks/files/apply_noobs_os_config
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: apply_noobs_os_config
|
||||
# Required-Start:
|
||||
# Required-Stop:
|
||||
# Default-Start: 2
|
||||
# Default-Stop:
|
||||
# Short-Description: Apply config from /boot/os_config.json
|
||||
# Description:
|
||||
### END INIT INFO
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
log_daemon_msg "Applying config from /boot/os_config.json (if it exists)"
|
||||
if raspi-config --apply-os-config; then
|
||||
update-rc.d apply_noobs_os_config remove
|
||||
rm /etc/init.d/apply_noobs_os_config
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 start" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# CONFIGURATION FILE FOR SETUPCON
|
||||
|
||||
# Consult the console-setup(5) manual page.
|
||||
|
||||
ACTIVE_CONSOLES="/dev/tty[1-6]"
|
||||
|
||||
CHARMAP="UTF-8"
|
||||
|
||||
CODESET="guess"
|
||||
FONTFACE=""
|
||||
FONTSIZE=""
|
||||
|
||||
VIDEOMODE=
|
||||
|
||||
# The following is an example how to use a braille font
|
||||
# FONT='lat9w-08.psf.gz brl-8x8.psf'
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
#
|
||||
# rc.local
|
||||
#
|
||||
# This script is executed at the end of each multiuser runlevel.
|
||||
# Make sure that the script will "exit 0" on success or any other
|
||||
# value on error.
|
||||
#
|
||||
# In order to enable or disable this script just change the execution
|
||||
# bits.
|
||||
#
|
||||
# By default this script does nothing.
|
||||
|
||||
# Print the IP address
|
||||
_IP=$(hostname -I) || true
|
||||
if [ "$_IP" ]; then
|
||||
printf "My IP address is %s\n" "$_IP"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
36
stage2/01-sys-tweaks/files/regenerate_ssh_host_keys
Normal file
36
stage2/01-sys-tweaks/files/regenerate_ssh_host_keys
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: regenerate_ssh_host_keys
|
||||
# Required-Start:
|
||||
# Required-Stop:
|
||||
# Default-Start: 2
|
||||
# Default-Stop:
|
||||
# Short-Description: Regenerate ssh host keys
|
||||
# Description:
|
||||
### END INIT INFO
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
log_daemon_msg "Regenerating ssh host keys (in background)"
|
||||
nohup sh -c "if [ -e /dev/hwrng ]; then
|
||||
dd if=/dev/hwrng of=/dev/urandom count=1 bs=4096
|
||||
fi; \
|
||||
yes | ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key && \
|
||||
yes | ssh-keygen -q -N '' -t rsa -f /etc/ssh/ssh_host_rsa_key && \
|
||||
yes | ssh-keygen -q -N '' -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key && \
|
||||
yes | ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key && \
|
||||
systemctl enable ssh && sync && \
|
||||
rm /etc/init.d/regenerate_ssh_host_keys && \
|
||||
update-rc.d regenerate_ssh_host_keys remove && \
|
||||
printf '\nfinished\n' && systemctl start ssh" > /var/log/regen_ssh_keys.log 2>&1 &
|
||||
log_end_msg $?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 start" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
case "$1" in
|
||||
start)
|
||||
log_daemon_msg "Starting resize2fs_once"
|
||||
ROOT_DEV=$(findmnt / -o source -n) &&
|
||||
ROOT_DEV=`grep -Eo 'root=[[:graph:]]+' /proc/cmdline | cut -d '=' -f 2-` &&
|
||||
resize2fs $ROOT_DEV &&
|
||||
update-rc.d resize2fs_once remove &&
|
||||
rm /etc/init.d/resize2fs_once &&
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek
|
||||
raspberrypi-net-mods
|
||||
wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-ralink firmware-realtek
|
||||
dhcpcd5
|
||||
net-tools
|
||||
|
|
|
|||
27
stage2/02-net-tweaks/00-patches/00-interfaces.diff
Normal file
27
stage2/02-net-tweaks/00-patches/00-interfaces.diff
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
Index: jessie-stage2/rootfs/etc/network/interfaces
|
||||
===================================================================
|
||||
--- jessie-stage2.orig/rootfs/etc/network/interfaces
|
||||
+++ jessie-stage2/rootfs/etc/network/interfaces
|
||||
@@ -1,4 +1,20 @@
|
||||
-auto lo
|
||||
+# interfaces(5) file used by ifup(8) and ifdown(8)
|
||||
+
|
||||
+# Please note that this file is written to be used with dhcpcd
|
||||
+# For static IP, consult /etc/dhcpcd.conf and 'man dhcpcd.conf'
|
||||
|
||||
+# Include files from /etc/network/interfaces.d:
|
||||
+source-directory /etc/network/interfaces.d
|
||||
+
|
||||
+auto lo
|
||||
iface lo inet loopback
|
||||
-iface eth0 inet dhcp
|
||||
+
|
||||
+iface eth0 inet manual
|
||||
+
|
||||
+allow-hotplug wlan0
|
||||
+iface wlan0 inet manual
|
||||
+ wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
|
||||
+
|
||||
+allow-hotplug wlan1
|
||||
+iface wlan1 inet manual
|
||||
+ wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
|
||||
1
stage2/02-net-tweaks/00-patches/series
Normal file
1
stage2/02-net-tweaks/00-patches/series
Normal file
|
|
@ -0,0 +1 @@
|
|||
00-interfaces.diff
|
||||
|
|
@ -1,37 +1,8 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -v -d "${ROOTFS_DIR}/etc/wpa_supplicant"
|
||||
install -v -m 600 files/wpa_supplicant.conf "${ROOTFS_DIR}/etc/wpa_supplicant/"
|
||||
install -v -d ${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d
|
||||
install -v -m 644 files/wait.conf ${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/
|
||||
|
||||
on_chroot << EOF
|
||||
SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_wait 0
|
||||
EOF
|
||||
install -v -d ${ROOTFS_DIR}/etc/wpa_supplicant
|
||||
install -v -m 600 files/wpa_supplicant.conf ${ROOTFS_DIR}/etc/wpa_supplicant/
|
||||
|
||||
if [ -v WPA_COUNTRY ]; then
|
||||
echo "country=${WPA_COUNTRY}" >> "${ROOTFS_DIR}/etc/wpa_supplicant/wpa_supplicant.conf"
|
||||
fi
|
||||
|
||||
if [ -v WPA_ESSID ] && [ -v WPA_PASSWORD ]; then
|
||||
on_chroot <<EOF
|
||||
set -o pipefail
|
||||
wpa_passphrase "${WPA_ESSID}" "${WPA_PASSWORD}" | tee -a "/etc/wpa_supplicant/wpa_supplicant.conf"
|
||||
EOF
|
||||
elif [ -v WPA_ESSID ]; then
|
||||
cat >> "${ROOTFS_DIR}/etc/wpa_supplicant/wpa_supplicant.conf" << EOL
|
||||
|
||||
network={
|
||||
ssid="${WPA_ESSID}"
|
||||
key_mgmt=NONE
|
||||
}
|
||||
EOL
|
||||
fi
|
||||
|
||||
# Disable wifi on 5GHz models if WPA_COUNTRY is not set
|
||||
mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/"
|
||||
if [ -n "$WPA_COUNTRY" ]; then
|
||||
echo 0 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan"
|
||||
echo 0 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan"
|
||||
else
|
||||
echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan"
|
||||
echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan"
|
||||
fi
|
||||
|
|
|
|||
3
stage2/02-net-tweaks/files/wait.conf
Normal file
3
stage2/02-net-tweaks/files/wait.conf
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=/sbin/dhcpcd -q -w
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
country=GB
|
||||
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
|
||||
update_config=1
|
||||
|
|
|
|||
5
stage2/03-cleanup/00-run.sh
Executable file
5
stage2/03-cleanup/00-run.sh
Executable file
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
on_chroot sh -e - <<EOF
|
||||
apt-get clean
|
||||
EOF
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
echo "${TIMEZONE_DEFAULT}" > "${ROOTFS_DIR}/etc/timezone"
|
||||
rm "${ROOTFS_DIR}/etc/localtime"
|
||||
|
||||
on_chroot << EOF
|
||||
dpkg-reconfigure -f noninteractive tzdata
|
||||
EOF
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue