Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opensuse-tumbleweed-image for
openSUSE:Factory checked in at 2026-06-23 17:38:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-tumbleweed-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-tumbleweed-image.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-tumbleweed-image"
Tue Jun 23 17:38:46 2026 rev:37 rq:1361185 version:unknown
Changes:
--------
---
/work/SRC/openSUSE:Factory/opensuse-tumbleweed-image/opensuse-tumbleweed-image.changes
2026-04-26 21:13:01.753627818 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-tumbleweed-image.new.1956/opensuse-tumbleweed-image.changes
2026-06-23 17:41:02.246639033 +0200
@@ -1,0 +2,5 @@
+Mon Jun 22 15:25:24 UTC 2026 - Fabian Vogt <[email protected]>
+
+- config.sh: Complete switchover to zypp.conf.d
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.pkJy8Y/_old 2026-06-23 17:41:02.938663165 +0200
+++ /var/tmp/diff_new_pack.pkJy8Y/_new 2026-06-23 17:41:02.942663304 +0200
@@ -24,19 +24,6 @@
# which would avoid it being installed by the filesystem package
rpm -e compat-usrmerge-tools
-# if /etc/zypp/zypp.conf exists, patch it - otherwise rely on packages
providing functionality
-if [ -f /etc/zypp/zypp.conf ]; then
- #======================================
- # Disable recommends
- #--------------------------------------
- sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g'
/etc/zypp/zypp.conf
-
- #======================================
- # Exclude docs installation
- #--------------------------------------
- sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g'
/etc/zypp/zypp.conf
-fi
-
#======================================
# Remove locale files
#--------------------------------------
@@ -62,9 +49,14 @@
# the host arch differs (e.g. docker with --platform doesn't affect uname)
arch=$(rpm -q --qf %{arch} glibc)
if [ "$arch" = "i586" ] || [ "$arch" = "i686" ]; then
- sed -i "s/^# arch =.*\$/arch = i686/" /etc/zypp/zypp.conf
- # Verify that it's applied
- grep -q '^arch =' /etc/zypp/zypp.conf
+ mkdir -p /usr/etc/zypp/zypp.conf.d/
+ echo -e "[main]\narch = i686" > /usr/etc/zypp/zypp.conf.d/i686.conf
+fi
+
+# If zypp.conf exists, zypp.conf.d is not used. Error out in that case.
+if [ -f /etc/zypp/zypp.conf ]; then
+ echo "/etc/zypp/zypp.conf exists, not expected"
+ exit 1
fi
if [[ "$kiwi_profiles" == *"docker"* ]]; then
