Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2023-01-26 13:57:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images" Thu Jan 26 13:57:08 2023 rev:175 rq:1060994 version:17.69 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2023-01-18 13:08:12.615926387 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new.32243/installation-images.changes 2023-01-26 14:01:13.381067696 +0100 @@ -1,0 +2,8 @@ +Wed Jan 25 16:42:39 UTC 2023 - wfe...@opensuse.org + +- merge gh#openSUSE/installation-images#621 +- support more general wicked firmware devices interface + (jsc#PED-3118, jsc#PED-967) +- 17.69 + +-------------------------------------------------------------------- Old: ---- installation-images-17.68.tar.xz New: ---- installation-images-17.69.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.GIcAvu/_old 2023-01-26 14:01:14.021071830 +0100 +++ /var/tmp/diff_new_pack.GIcAvu/_new 2023-01-26 14:01:14.025071855 +0100 @@ -495,6 +495,7 @@ BuildRequires: vim-small BuildRequires: wget BuildRequires: wicked +BuildRequires: wicked-nbft BuildRequires: wireless-tools %ifnarch s390 s390x BuildRequires: wpa_supplicant @@ -663,7 +664,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 17.68 +Version: 17.69 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) ++++++ installation-images-17.68.tar.xz -> installation-images-17.69.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.68/VERSION new/installation-images-17.69/VERSION --- old/installation-images-17.68/VERSION 2023-01-16 19:32:30.000000000 +0100 +++ new/installation-images-17.69/VERSION 2023-01-25 17:42:39.000000000 +0100 @@ -1 +1 @@ -17.68 +17.69 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.68/changelog new/installation-images-17.69/changelog --- old/installation-images-17.68/changelog 2023-01-16 19:32:30.000000000 +0100 +++ new/installation-images-17.69/changelog 2023-01-25 17:42:39.000000000 +0100 @@ -1,3 +1,8 @@ +2023-01-25: 17.69 + - merge gh#openSUSE/installation-images#621 + - support more general wicked firmware devices interface + (jsc#PED-3118, jsc#PED-967) + 2023-01-16: 17.68 - merge gh#openSUSE/installation-images#618 - switch from curl to osc api to avoid authentication hassle with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.68/data/initrd/initrd.file_list new/installation-images-17.69/data/initrd/initrd.file_list --- old/installation-images-17.68/data/initrd/initrd.file_list 2023-01-16 19:32:30.000000000 +0100 +++ new/installation-images-17.69/data/initrd/initrd.file_list 2023-01-25 17:42:39.000000000 +0100 @@ -99,6 +99,7 @@ nvme-cli: sed: ?wicked: +?wicked-nbft: ?s390-tools-hmcdrvfs: rsyslog: sysconfig-netconfig: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.68/data/initrd/scripts/early_setup new/installation-images-17.69/data/initrd/scripts/early_setup --- old/installation-images-17.68/data/initrd/scripts/early_setup 2023-01-16 19:32:30.000000000 +0100 +++ new/installation-images-17.69/data/initrd/scripts/early_setup 2023-01-25 17:42:39.000000000 +0100 @@ -74,11 +74,42 @@ } 2>/var/log/wickedd.log fi -# gather list of ibft interfaces for linuxrc -ibft= -while read ifname xxx ; do - [ -z "$ifname" ] && continue - [ -n "$ibft" ] && ibft="$ibft", - ibft="$ibft$ifname" -done < <(/etc/wicked/extensions/ibft -l) -echo "ibftdevices: $ibft" >/etc/ibft_devices +# New wicked: gather list of firmware interfaces for linuxrc. +# +# Parse lines like: 'fw_type interface_1 interface_2 ...' and store a +# comma-separated list of all interfaces and types in: +# +# /etc/firmware_devices (interface list) +# /etc/firmware_types (type list) +# +fw_types= +fw_interfaces= +while read -a fw ; do + fw_types="$fw_types,${fw[0]}" + unset fw[0] + for i in ${fw[@]} ; do + fw_interfaces="$fw_interfaces,$i" + done +done < <(wicked firmware interfaces 2>/dev/null) + +fw_types=${fw_types#,} +fw_interfaces=${fw_interfaces#,} + +if [ -n "$fw_interfaces" ] ; then + echo "firmwaredevices: $fw_interfaces" >/etc/firmware_devices +fi + +if [ -n "$fw_types" ] ; then + echo "firmwaretypes: $fw_types" >/etc/firmware_types +fi + +if [ ! -f /etc/firmware_devices ] ; then + # Old wicked: gather list of ibft interfaces for linuxrc. + ibft= + while read ifname xxx ; do + [ -z "$ifname" ] && continue + [ -n "$ibft" ] && ibft="$ibft", + ibft="$ibft$ifname" + done < <(/etc/wicked/extensions/ibft -l) + echo "ibftdevices: $ibft" >/etc/ibft_devices +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.68/obs/installation-images.spec new/installation-images-17.69/obs/installation-images.spec --- old/installation-images-17.68/obs/installation-images.spec 2023-01-16 19:32:30.000000000 +0100 +++ new/installation-images-17.69/obs/installation-images.spec 2023-01-25 17:42:39.000000000 +0100 @@ -495,6 +495,7 @@ BuildRequires: vim-small BuildRequires: wget BuildRequires: wicked +BuildRequires: wicked-nbft BuildRequires: wireless-tools %ifnarch s390 s390x BuildRequires: wpa_supplicant