openstack/ironic-python-agent-builder
Code Issues Proposed changes

Fix building images for Bullseye and Bookworm

Browse Source 
Bullseye requires installing lshw from backports because the default one
has broken JSON output:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1002025

Bookworm requires installing firmware from a different repository.

Change-Id: I1bfecfcaff1547f99fcb48cc54b8f7ff77f0b0d9
This commit is contained in:
Dmitry Tantsur 2023-12-08 15:38:23 +01:00
parent 123c430db2
commit 9da0cf41d4
No known key found for this signature in database
GPG Key ID: 315B2AF9FD216C60
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dib/ironic-python-agent-ramdisk/environment.d/01-debian-ipa.bash
View File

@ -1,5 +1,10 @@
# IPA is built with non-free firmware by default. # IPA is built with non-free firmware by default.
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,contrib,non-free} DIB_DEBIAN_NON_FREE=non-free-firmware
if [[ "$DIB_RELEASE" == "bullseye" ]]; then
# Starting with bookworm, firmware is in a separate repository
DIB_DEBIAN_NON_FREE=non-free
fi
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,contrib,$DIB_DEBIAN_NON_FREE}
if [[ $DIB_DEBIAN_COMPONENTS =~ non-free ]]; then if [[ $DIB_DEBIAN_COMPONENTS =~ non-free ]]; then
export IPA_DEBIAN_NONFREE=true export IPA_DEBIAN_NONFREE=true

5
dib/ironic-python-agent-ramdisk/pkg-map
View File

@ -11,6 +11,11 @@
"python": "python", "python": "python",
"python-dev": "python-devel" "python-dev": "python-devel"
} }
},
"debian": {
"bullseye": {
"lshw": "lshw/bullseye-backports"
}
} }
}, },
"family": { "family": {

2
doc/source/admin/dib.rst
View File

@ -5,7 +5,7 @@ Images built using diskimage-builder_ are recommended for production use on
real hardware. The recommended distributions are: real hardware. The recommended distributions are:
* CentOS Stream 9 * CentOS Stream 9
* Debian Bullseye (``debian-minimal`` element) * Debian Bullseye and Bookworm (``debian-minimal`` element)
The following should work but receive only limited testing and support: The following should work but receive only limited testing and support:

4
releasenotes/notes/debian-9a4fa6b2d3ef96d0.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixes building images for Debian Bullseye and Bookworm.