Hibbian
/
Raspi-image-spec
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Re-add 'non-free' to sources till all firmware is moved 

The wireless firmware is in the firmware-brcm80211 package, but that is
still in 'non-free', so add 'non-free' back to the sources until all
the needed firmware packages are in 'non-free-firmware'.

https://salsa.debian.org/kernel-team/firmware-nonfree/-/merge_requests/36
is where the move to non-free-firmware is proposed, but not yet merged.
This commit is contained in:
Diederik de Haas 2022-10-31 01:04:23 +01:00
parent d71140b08a
commit dc7558eb3f
No known key found for this signature in database
GPG Key ID: D76E5BCE787EDB6E
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
generate-recipe.py
View File

@ -56,8 +56,10 @@ else:
# ¹ https://www.debian.org/vote/2022/vote_003 # ¹ https://www.debian.org/vote/2022/vote_003
if suite == 'bookworm': if suite == 'bookworm':
firmware_component = 'non-free-firmware' firmware_component = 'non-free-firmware'
firmware_component_old = 'non-free'
else: else:
firmware_component = 'non-free' firmware_component = 'non-free'
firmware_component_old = ''
# Extra wireless firmware: # Extra wireless firmware:
if version != '2': if version != '2':
@ -170,6 +172,7 @@ with open('raspi_master.yaml', 'r') as in_file:
.replace('__RELEASE__', suite) \ .replace('__RELEASE__', suite) \
.replace('__ARCH__', arch) \ .replace('__ARCH__', arch) \
.replace('__FIRMWARE_COMPONENT__', firmware_component) \ .replace('__FIRMWARE_COMPONENT__', firmware_component) \
.replace('__FIRMWARE_COMPONENT_OLD__', firmware_component_old) \
.replace('__LINUX_IMAGE__', linux) \ .replace('__LINUX_IMAGE__', linux) \
.replace('__DTB__', dtb) \ .replace('__DTB__', dtb) \
.replace('__SECURITY_SUITE__', security_suite) \ .replace('__SECURITY_SUITE__', security_suite) \

5
raspi_master.yaml
View File

@ -46,12 +46,13 @@ steps:
components: components:
- main - main
- __FIRMWARE_COMPONENT__ - __FIRMWARE_COMPONENT__
- __FIRMWARE_COMPONENT_OLD__
unless: rootfs_unpacked unless: rootfs_unpacked
- create-file: /etc/apt/sources.list - create-file: /etc/apt/sources.list
contents: |+ contents: |+
deb http://deb.debian.org/debian __RELEASE__ main __FIRMWARE_COMPONENT__ deb http://deb.debian.org/debian __RELEASE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
deb http://security.debian.org/debian-security __SECURITY_SUITE__ main __FIRMWARE_COMPONENT__ deb http://security.debian.org/debian-security __SECURITY_SUITE__ main __FIRMWARE_COMPONENT__ __FIRMWARE_COMPONENT_OLD__
__BACKPORTS__ __BACKPORTS__
unless: rootfs_unpacked unless: rootfs_unpacked