Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package combustion for openSUSE:Factory checked in at 2024-03-07 18:27:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/combustion (Old) and /work/SRC/openSUSE:Factory/.combustion.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "combustion" Thu Mar 7 18:27:48 2024 rev:30 rq:1155560 version:1.3+git9 Changes: -------- --- /work/SRC/openSUSE:Factory/combustion/combustion.changes 2024-03-03 20:19:11.217538809 +0100 +++ /work/SRC/openSUSE:Factory/.combustion.new.1770/combustion.changes 2024-03-07 18:28:05.810092327 +0100 @@ -1,0 +2,7 @@ +Wed Mar 06 12:50:29 UTC 2024 - Fabian Vogt <[email protected]> + +- Update to version 1.3+git9: + * Explicitly install modules for config sources + * Trigger udev rules on ACTION!="remove" + +------------------------------------------------------------------- Old: ---- combustion-1.3+git7.obscpio New: ---- combustion-1.3+git9.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ combustion.spec ++++++ --- /var/tmp/diff_new_pack.bdm4TX/_old 2024-03-07 18:28:06.610121849 +0100 +++ /var/tmp/diff_new_pack.bdm4TX/_new 2024-03-07 18:28:06.610121849 +0100 @@ -17,7 +17,7 @@ Name: combustion -Version: 1.3+git7 +Version: 1.3+git9 Release: 0 Summary: System for initial configuration of appliances License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.bdm4TX/_old 2024-03-07 18:28:06.646123177 +0100 +++ /var/tmp/diff_new_pack.bdm4TX/_new 2024-03-07 18:28:06.650123324 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/combustion.git</param> - <param name="changesrevision">cc93c59cfc5a112b4b52c0aadf9df884a6159f24</param></service></servicedata> + <param name="changesrevision">5ff41dbc3735817ffdacb8d6b45e595cc3adba7d</param></service></servicedata> (No newline at EOF) ++++++ combustion-1.3+git7.obscpio -> combustion-1.3+git9.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/combustion-1.3+git7/combustion.rules new/combustion-1.3+git9/combustion.rules --- old/combustion-1.3+git7/combustion.rules 2024-03-01 14:00:44.000000000 +0100 +++ new/combustion-1.3+git9/combustion.rules 2024-03-06 13:48:26.000000000 +0100 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020 SUSE LLC +# SPDX-FileCopyrightText: 2024 SUSE LLC # SPDX-License-Identifier: GPL-2.0-or-later # It's not possible to wait for one of multiple devices to appear, so @@ -6,17 +6,17 @@ # This is only used for the .service dependencies. # Filesystems with either combustion or ignition as label -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="combustion", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="COMBUSTION", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="ignition", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="IGNITION", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="combustion", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="COMBUSTION", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="ignition", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="IGNITION", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" # These can be used as config source as well, but they cannot be used as providers for # /dev/combustion/config, as some other config source with higher priority might show up later. -#ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="install", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" -#ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="INSTALL", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" +#ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="install", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" +#ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="INSTALL", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config" # QEMU fw_cfg blob with key opt/org.opensuse.combustion # There are add events for keys inside fw_cfg, but they are unreliable: https://github.com/systemd/systemd/issues/28638 # Using the platform device with add|bind does not work with TAG+="systemd" for some reason, so use the module... -ACTION=="add", SUBSYSTEM=="module", KERNEL=="qemu_fw_cfg", TEST=="/sys/firmware/qemu_fw_cfg/by_name/opt/org.opensuse.combustion", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config", TAG+="systemd" +ACTION!="remove", SUBSYSTEM=="module", KERNEL=="qemu_fw_cfg", TEST=="/sys/firmware/qemu_fw_cfg/by_name/opt/org.opensuse.combustion", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config", TAG+="systemd" # VMware guestinfo value. Using sh allows PATH lookup traversal and checking for nonempty stdout without logging the value. -ACTION=="add", DEVPATH=="/devices/virtual/misc/vmci", PROGRAM=="/bin/sh -c '[ $$(vmware-rpctool \"info-get guestinfo.combustion.script\" | wc -c) -gt 2 ]'", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config", TAG+="systemd" +ACTION!="remove", DEVPATH=="/devices/virtual/misc/vmci", PROGRAM=="/bin/sh -c '[ $$(vmware-rpctool \"info-get guestinfo.combustion.script\" | wc -c) -gt 2 ]'", ENV{SYSTEMD_ALIAS}+="/dev/combustion/config", TAG+="systemd" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/combustion-1.3+git7/module-setup.sh new/combustion-1.3+git9/module-setup.sh --- old/combustion-1.3+git7/module-setup.sh 2024-03-01 14:00:44.000000000 +0100 +++ new/combustion-1.3+git9/module-setup.sh 2024-03-06 13:48:26.000000000 +0100 @@ -31,3 +31,10 @@ mkdir -p "${initdir}/${systemdsystemunitdir}/dev-combustion-config.device.d/" echo -e "[Unit]\nJobTimeoutSec=${devtimeout}" > "${initdir}/${systemdsystemunitdir}/dev-combustion-config.device.d/timeout.conf" } + +installkernel() { + # Modules for config sources + hostonly='' instmods ext4 + # hostonly is fine here, only include them if they fit the current HW + instmods qemu_fw_cfg vmw_vsock_vmci_transport +} ++++++ combustion.obsinfo ++++++ --- /var/tmp/diff_new_pack.bdm4TX/_old 2024-03-07 18:28:06.742126719 +0100 +++ /var/tmp/diff_new_pack.bdm4TX/_new 2024-03-07 18:28:06.742126719 +0100 @@ -1,5 +1,5 @@ name: combustion -version: 1.3+git7 -mtime: 1709298044 -commit: cc93c59cfc5a112b4b52c0aadf9df884a6159f24 +version: 1.3+git9 +mtime: 1709729306 +commit: 5ff41dbc3735817ffdacb8d6b45e595cc3adba7d
