Commit Graph

27 Commits

Author SHA1 Message Date
Cyril Brulebois 592c0df22e Adjust /etc/machine-id logic for buster.
Commit 26a7de63b0 in master:
/etc/machine-id needs to exist and be empty on buster, while bullseye
needs this file not to exist at all. For now, treat both bullseye and
bookworm the same way.
2021-11-20 04:09:52 +01:00
Cyril Brulebois 1410839911 Add an empty line before __EXTRA_CHROOT_SHELL_CMDS__
This means the generated recipes are getting two empty lines if there
are no such commands (that's the case for everyone right now), but this
emphasizes the existence of this placeholder, the same way as for its
__EXTRA_ROOT_SHELL_CMDS__ twin.
2021-08-28 06:08:27 +02:00
Cyril Brulebois b339942ca4 Fix missing trailing newline in sources.list
Re-implement MR #49 by Diederik de Haas.
2021-08-28 06:07:45 +02:00
Cyril Brulebois 433100f5cb Standardize firmware handling.
Group raspi-firmware and firmware-brcm80211 together, and make the
firmware package a regular list item in the master YAML file (making
editors happy about it).

Of course, this means that in all generated recipes, linux-image and
raspi*-firmware switch places.
2021-08-28 06:07:45 +02:00
Cyril Brulebois 4483f4cdfb Generate recipes using a Python script instead of multiplying sed calls.
This is a proof of concept rather than an ideal, final situation.

It can be used this way:

    for v in 1 2 3 4 ; do
      for s in buster bullseye; do
        ./generate-recipe.py $v $s
      done
    done

and it has been verified to produce very similar results compared to the
existing many-sed approach.

Differences are as follows:
 - Missing newline after some backports stanza, due to the removal of
   the other APT line. There's already MR#51 that aims at fixing some
   newline-related issues anyway, so this can be addressed separately.
 - Less schizophrenia in the generated sources.list for buster/4, as we
   are now only showing a reason for enabling the backports, instead
   of starting by explaining why backports are disabled by default.
 - Dropping APT::Default-Release = buster in the buster/4 case, which
   is no longer needed as we are pulling things from buster-backports
   rather than pulling them from unstable (see 57e90df103).
 - No longer trying to fix the firmware package name by throwing a
   broken sed at rpi-reconfigure-raspi-firmware.service in the buster/4
   case: the syntax was buggy and fixing it would have made us try to
   replace raspi-firmware with raspi-firmware/buster-backports, while
   the correct thing to do is to not touch it in the first place
   (raspi-firmware is the correct name for the firmware package, pulled
   from buster-backports).

As a side effect, this transforms the existing __EXTRA_SHELL_CMDS__ into
a slightly more explicit __EXTRA_ROOT_SHELL_CMDS__ which now has its
__EXTRA_CHROOT_SHELL_CMDS__ twin. That's the entry point that was
missing and made 45cb5619d4 necessary in the past.
2021-08-28 06:07:45 +02: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
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
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 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
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
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 89ef824285 Don't use the transition firmware package when building for bullseye 2021-01-25 14:27:26 -06:00
Gunnar Wolf 85126a9503 Enable the build of Bullseye targets as well 2021-01-14 00:55:55 -06:00
Gunnar Wolf 7de811f115 Add a configuration file for wireless networking 2020-08-15 00:15:43 -05:00
PeterLawler dd3b33419c rootfs subdirectory 2020-08-15 05:06:18 +00:00
Gunnar Wolf 0cf508221f Merge branch 'liw/shquote' into 'master'
Fix: quote expansion of $ROOT in case it has problematic characters

See merge request raspi-team/image-specs!3
2020-05-24 21:55:02 +00:00
Gunnar Wolf aad5a5a489 non-free must be enabled for updated raspi3-firmware on armel to be pulled in :-Þ 2020-04-24 11:00:10 -05:00
Gunnar Wolf 3cdd8af08d Enable stable-proposed-updates for building images for RPi 0/1 families 2020-04-10 00:22:30 -05:00
Gunnar Wolf f1445d5f28 Replace a pending "chroot" section by "create-file" 2020-04-04 20:03:16 -06:00
Gunnar Wolf 7288c11f0e Added a Makefile driving a raspi_master recipe
This is instead of maintaining separate recipes for 0w, 2 and 3 hardware
2019-12-17 17:41:16 -03:00