Commit Graph

184 Commits

Author SHA1 Message Date
Cyril Brulebois 3058cf8e82 Run sed on rpi-reconfigure-raspi-firmware.service within $ROOT.
This fixes the build of all buster-based images (regression in
feb61f3361).
2021-08-22 23:05:01 +02:00
Cyril Brulebois 45cb5619d4 Add cma= tweaks only once for raspi_4_* recipes.
Otherwise, the two same sed calls would be added twice, once after the
console= tweak, once after the LABEL= tweak.
2021-08-22 23:05:01 +02:00
Gunnar Wolf cef8519ab7 Document the usage of bmap files 2021-08-02 12:17:25 -05:00
Gunnar Wolf 6cc7bc3666 Merge remote-tracking branch 'smcv/bmap' 2021-08-02 12:08:47 -05:00
Gunnar Wolf bc811c0b53 Use ASCII-only chars in the comments of wlan0 configuration
Very minor change with no functional differences, jsut for un-uglifying its display
on a base system.
2021-07-30 12:26:56 -05:00
Gunnar Wolf feb61f3361 Fix rpi-generate-ssh-host-keys.service to use the correct package name in buster 2021-07-02 13:01:22 -05:00
Diederik de Haas 84b6ac3864
Add check whether 'fakemachine' exists.
Give a warning message if it does and an error when it does not.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-06-24 20:22:55 +02:00
Simon McVittie 821aff4e19 Makefile: Automatically use fakemachine if not uid 0
fakemachine launches a virtual machine reusing the host system's /usr,
and runs commands as root on that virtual machine. It's used by debos,
but can also be used to wrap arbitrary commands, in particular vmdb2;
it's enough to run the parts of vmdb2 that need to mount filesystems
and run apt.

This won't work if fakemachine isn't available (in particular on non-x86),
but that seems better than just failing altogether.

Signed-off-by: Simon McVittie <smcv@debian.org>
2021-06-24 19:33:33 +02:00
Gunnar Wolf 5aadb0116a Ugh, pointed to wrong directory (should be /var/lib/dbus). Fixed. 2021-06-08 11:57:34 -05:00
Gunnar Wolf 75698b0feb Clearing machine-id requires also removing the info from /var/lib/bus/ 2021-06-08 11:51:34 -05:00
Diederik de Haas 8af1ec6cc6
Add 'ca-certificates' to installed packages.
This is needed to use Debian repos served over https, but also a LOT of
other programs, like reportbug, which want to communicate securely.

Also sorted the list of packages alphabatically as I couldn't find a
reason for the current order and then a logical sort order is better.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-06-04 23:23:23 +02:00
Gunnar Wolf 99c34cc1d6 Remove /etc/machine-id so that it gets generated upon the (real) first boot 2021-05-28 18:48:39 -05:00
Andres Salomon 0f23b8e378 rpi-resizerootfs: switch the root filesystem resizing away from a systemd oneshot service
Switch away from using a systemd service for the initial root resize.
Instead, we resize the root partition and filesystem in the initrd.

To simplify things, the initrd script will check whether it should resize
the partition on every boot. It does this by checking if the entire disk
(ignoring an empty 4MB) is in use.  However, the scripts themselves are
deleted from the system after the initrd is generated. After the image
is installed, the resize script should exist only in the initrd. When the
kernel gets upgraded (eg, for a security update) or a new initrd is generated
due to a package install, the new initrd will not contain the resize script.
At that point, nothing will remain from the image's initial resize
bootstrapping process.

This process (but not the scripts) is similar to what cloud-initramfs-growroot
does. However, that particular package has an indirect dependency on Python,
and we don't necessarily want that overhead in our images just for resizing.
2021-05-10 14:08:07 -04:00
Gunnar Wolf 41ee2c55a7 Use security.d.o for the security mirror 2021-05-07 13:35:05 -05:00
Gunnar Wolf e826d97050 Enable security updates for Bullseye images 2021-05-07 12:58:56 -05:00
Simon McVittie e6defffb23 Makefile: Optionally generate a bmaptool map file
bmaptool(1), from the bmap-tools package, can write the used blocks
in a sparse disk image to media, while saving time and I/O by not writing
zeroes to the unused blocks. Typical use:

    make raspi2_bullseye.img.bmap raspi2_bullseye.img.xz
    ... upload those two files ...
    ... download those two files ...
    bmaptool copy raspi2_bullseye.img.xz /dev/disk/by-id/usb-Generic-_SD_MMC_*-0:0

Signed-off-by: Simon McVittie <smcv@debian.org>
2021-04-25 11:22:59 +01:00
Simon McVittie 44b845e83f rootfs: Eliminate circular dependency between systemd units
rpi-reconfigure-raspi-firmware.service requires /boot/firmware to be
mounted, but mounting local filesystems requires local-fs-pre.target,
so trying to run rpi-reconfigure-raspi-firmware.service before
local-fs-pre.target results in a cyclic order dependency. systemd
breaks the cycle in an arbitrary place, and the result is unlikely to be
what we want.

Instead, delay reconfiguration of config.txt until after local
filesystems are mounted, but before sysinit.target. This breaks the cycle
(image-specs#49).

This still orders it before all non-early-boot services, because
sysinit.target is part of the DefaultDependencies; so in particular
it will finish before rpi-generate-ssh-host-keys.service starts, which
avoids the two services fighting over the dpkg lock (image-specs#45).

Resolves: image-specs#45
Resolves: image-specs#49
Signed-off-by: Simon McVittie <smcv@debian.org>
2021-04-25 11:17:50 +01:00
Gunnar Wolf 09805aa49b Un-blacklist vc4
Distributing vc4-blacklisted images is a disservice to our users as soon as
vc4+serial work again, and RPi4 is quite often used for desktop or multimedia
tasks.
2021-04-13 22:55:07 -05:00
Gunnar Wolf 6779ca8ad0 Blacklist vc4 module for Bullseye on RPi4, as it leads to serial console corruption 2021-04-13 16:58:25 -05:00
Diederik de Haas 6f9766906b Merge branch 'feature/add_missing_dependencies' into 'master'
add missing dependencies

See merge request raspi-team/image-specs!37
2021-03-26 17:57:17 +00:00
Gunnar Wolf d4fa0532a5 Merge remote-tracking branch 'diedrik/fix-sha256-makefile-target' 2021-03-26 10:16:19 -06:00
Gunnar Wolf 6603b2fc4a Merge remote-tracking branch 'diedrik/fix-alignment' 2021-03-26 10:14:44 -06:00
Gunnar Wolf 0eea2bc2aa Merge remote-tracking branch 'diedrik/update-readme-for-bullseye' 2021-03-26 10:09:41 -06:00
Gunnar Wolf 5544b9c018 Merge remote-tracking branch 'diedrik/update-git-ignore' 2021-03-26 10:07:30 -06:00
Gunnar Wolf 99ebf67b29 Merge branch 'fix-serial-consoles' into 'master'
Replace ttyACM0 with ttyAMA0 for the serial console.

See merge request raspi-team/image-specs!36
2021-03-26 16:05:58 +00:00
Gunnar Wolf 7151dc68cb Added ipv6 support (commented) to wlan0 2021-03-26 10:02:44 -06:00
Gunnar Wolf 1c63302066 Merge branch 'feature/ipv6' into 'master'
add iface line for ipv6

See merge request raspi-team/image-specs!38
2021-03-26 16:01:04 +00:00
Christian Decker b81e5ad86f add iface line for ipv6 2021-03-19 22:07:13 +01:00
Christian Decker 1af8472759 add missing dependencies 2021-03-04 08:41:51 +00:00
Diederik de Haas 267e7fe332 Replace ttyACM0 with ttyAMA0 for the serial console.
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-02-21 11:30:55 +01:00
Diederik de Haas 4205fd427f Change base of sha256 target to .img as checksum is based on that.
It now xz compresses the image and then still calculates the sha256 hash
on the non-compressed file. The xz.sha256 target (already) compresses it
and calculates the hash on the xz file.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-02-19 12:58:33 +01:00
Diederik de Haas afc486f116 Update make targets for the new names/parameters.
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-02-19 11:58:04 +01:00
Diederik de Haas 1b802e100b Start first partition at 4MiB for proper alignment.
See
https://www.gnu.org/software/parted/manual/html_node/mkpart.html#FOOT2
which then points to Arnd Bergmann's article on LWN:
https://lwn.net/Articles/428584/

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-02-19 11:41:43 +01:00
Diederik de Haas 54b7b925d0 Update gitignore for the new yaml file names.
Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
2021-02-19 11:09:11 +01:00
Gunnar Wolf e48b1980a1 Merge branch 'master' into 'master'
Fix the name of package to reconfigure

See merge request raspi-team/image-specs!29
2021-02-18 17:59:37 +00:00
Gunnar Wolf a71cfaa904 Merge branch 'update-readme' into 'master'
Fix a typo in a command in README.md

See merge request raspi-team/image-specs!31
2021-02-18 17:58:15 +00:00
Gunnar Wolf a146c3a7f7 Fixes to almost-ensure there is a working serial console
Why almost? Because Rpi0w uses ttyS1 instead of ttyAMA0 desipte being part of the RPi1 family...
...But it will work fine for the _second_ boot onwards, if things go according to plan.
For all other RPi models, it should work from the first boot on.
2021-02-18 11:31:23 -06:00
Gunnar Wolf 791dfacde6 Merge remote-tracking branch 'diedrik/replace-wltools-with-iw' into bullseye 2021-02-07 14:28:40 -06:00
julienbenjamin cda97f1809 Fix a typo in a command in README.md 2021-02-07 02:45:01 +01:00
Gunnar Wolf 84bfceab18 Remove unneded "b0rken" yaml scripts 2021-02-04 11:03:19 -06:00
Diederik de Haas d82cb7bbfd Replace deprecated wireless-tools with iw.
In https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963896 the
wireless-tools package is orphaned, after it has been deprecated
upstream for a while now.
2021-01-26 13:20:23 +01:00
Gunnar Wolf 42f88e3d30 Fix missing regex end when calling sed; add target_platforms target 2021-01-26 00:55:23 -06:00
Gunnar Wolf 89ef824285 Don't use the transition firmware package when building for bullseye 2021-01-25 14:27:26 -06:00
Gunnar Wolf 04ea975a1e Use a more coherent, stable naming for build families and releases 2021-01-25 14:09:59 -06:00
Gunnar Wolf eac6b11833 Skip the debian-security repositories when building images for testing 2021-01-14 13:32:44 -06:00
Gunnar Wolf 85126a9503 Enable the build of Bullseye targets as well 2021-01-14 00:55:55 -06:00
Sven Strittmatter 0827d29263
Fix the name of package to reconfigure
Signed-off-by: Sven Strittmatter <ich@weltraumschaf.de>
2020-12-27 20:38:07 +01:00
Gunnar Wolf 71fbc01775 Merged zvpunry/merge requests/build-depends 2020-11-12 19:33:25 -06:00
Gunnar Wolf be6a614be7 Merge branch 'readme_improvements' into 'master'
Minor clarifications in README.md

See merge request raspi-team/image-specs!26
2020-11-13 01:28:54 +00:00
Gunnar Wolf dbcdf867fe Merge branch 'update-rpi-set-sysconf-location' into 'master'
Update rpi-set-sysconf as it's in /usr/local/sbin, not /usr/sbin.

See merge request raspi-team/image-specs!27
2020-11-13 01:28:00 +00:00