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

Don't use the transition firmware package when building for bullseye

This commit is contained in:
Gunnar Wolf 2021-01-25 14:27:26 -06:00
parent 04ea975a1e
commit 89ef824285
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,6 +14,7 @@ yaml: $(addsuffix .yaml,$(platforms))
raspi_base_buster.yaml: raspi_master.yaml raspi_base_buster.yaml: raspi_master.yaml
cat raspi_master.yaml | \ cat raspi_master.yaml | \
sed "s/__FIRMWARE_PKG__/raspi3-firmware" | \
sed "s/__RELEASE__/buster/" > $@ sed "s/__RELEASE__/buster/" > $@
raspi_1_buster.yaml: raspi_base_buster.yaml raspi_1_buster.yaml: raspi_base_buster.yaml
@ -54,6 +55,7 @@ raspi_4_buster.yaml: raspi_base_buster.yaml
raspi_base_bullseye.yaml: raspi_master.yaml raspi_base_bullseye.yaml: raspi_master.yaml
cat raspi_master.yaml | \ cat raspi_master.yaml | \
sed "s/__RELEASE__/bullseye/" |\ sed "s/__RELEASE__/bullseye/" |\
sed "s/__FIRMWARE_PKG__/raspi-firmware/" | \
grep -v "__OTHER_APT_ENABLE__" |\ grep -v "__OTHER_APT_ENABLE__" |\
sed -e '/debian-security/ s/deb/# Uncomment after Bullseye becomes stable → deb/' > $@ sed -e '/debian-security/ s/deb/# Uncomment after Bullseye becomes stable → deb/' > $@

2
raspi_master.yaml
View File

@ -71,7 +71,7 @@ steps:
- dosfstools - dosfstools
- wireless-tools - wireless-tools
- wpasupplicant - wpasupplicant
- raspi3-firmware - __FIRMWARE_PKG__
- __LINUX_IMAGE__ - __LINUX_IMAGE__
__EXTRA_PKGS__ __EXTRA_PKGS__
tag: / tag: /