Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package warewulf for openSUSE:Factory
checked in at 2022-02-11 23:07:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/warewulf (Old)
and /work/SRC/openSUSE:Factory/.warewulf.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warewulf"
Fri Feb 11 23:07:25 2022 rev:6 rq:953261 version:3.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/warewulf/warewulf.changes 2021-11-02
19:19:58.767121467 +0100
+++ /work/SRC/openSUSE:Factory/.warewulf.new.1956/warewulf.changes
2022-02-11 23:08:48.970843005 +0100
@@ -1,0 +2,9 @@
+Thu Feb 10 11:31:35 UTC 2022 - Egbert Eich <e...@suse.com>
+
+- Improve creating chroot on SLE: use repositories from host
+ OS. This avoids registrations to get out of sync (bsc#1195796).
+ * vnfs-On-SUSE-don-t-copy-repository-information-into-chroot.patch
+- Include SUSE into overlay template:
+ * Add-suse-to-overlay-template.patch
+
+-------------------------------------------------------------------
New:
----
Add-suse-to-overlay-template.patch
vnfs-On-SUSE-don-t-copy-repository-information-into-chroot.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ warewulf.spec ++++++
--- /var/tmp/diff_new_pack.o2VWbF/_old 2022-02-11 23:08:49.978845920 +0100
+++ /var/tmp/diff_new_pack.o2VWbF/_new 2022-02-11 23:08:49.986845944 +0100
@@ -1,7 +1,7 @@
#
# spec file for package warewulf
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -81,6 +81,8 @@
Patch40: initramfs-Handle-NTP-client-configuration-for-SUSE.patch
Patch41:
Add-lib-modules-opt_kversion-sysctl.conf-to-initfs-if-present.patch
Patch42: vnfs-Do-not-pull-in-recommended-packages-on-SUSE.patch
+Patch43: Add-suse-to-overlay-template.patch
+Patch44:
vnfs-On-SUSE-don-t-copy-repository-information-into-chroot.patch
%if "%{?flavor}" != "common"
BuildRequires: bsdtar
@@ -408,6 +410,8 @@
%patch31 -p1
%patch41 -p1
%patch42 -p1
+%patch43 -p1
+%patch44 -p1
# cluster
%patch2 -p1
%patch3 -p1
++++++ Add-suse-to-overlay-template.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Thu Feb 10 12:26:59 2022 +0100
Subject: Add suse to overlay template
Patch-mainline: Not yet
Git-commit: 430ccf8a1a853372cf50e0805a759754d36a4d8b
References:
Signed-off-by: Egbert Eich <e...@suse.com>
---
vnfs/libexec/wwmkchroot/example-overlay.tmpl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/vnfs/libexec/wwmkchroot/example-overlay.tmpl
b/vnfs/libexec/wwmkchroot/example-overlay.tmpl
index 957f41b..ba0770c 100644
--- a/vnfs/libexec/wwmkchroot/example-overlay.tmpl
+++ b/vnfs/libexec/wwmkchroot/example-overlay.tmpl
@@ -4,6 +4,7 @@
# one of these must come first
# . include-rhel
# . include-deb
+# . include-suse
# ! make sure to use this template as overlay !
# must be set after the above platform options
@@ -20,7 +21,11 @@ set_as_overlay
# Define the location of the YUM repository
# YUM_MIRROR="http://mirror.centos.org/centos-6/6/os/\$basearch/";
-
+# required for a suse overlay
+#------------------------------#
+# Define the location of the zypper repository
+# ZYPP_MIRROR="http://download.opensuse.org/distribution/leap/15.3/repo/oss/,\
+# http://download.opensuse.org/update/leap/15.3/oss/";
# list of package to install into chroot
# PKGLIST="cups build-essential"
++++++ vnfs-On-SUSE-don-t-copy-repository-information-into-chroot.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Thu Feb 10 12:03:44 2022 +0100
Subject: vnfs: On SUSE don't copy repository information into chroot
Patch-mainline: Not yet
Git-commit: 6211ac13212607aab2f38276403e202df3610193
References:
If neither ZYP_MIRROR nor INSTALL_ISO is set use repository
information and credentials on host system without copying
these into the chroot by using --installroot instead of
--root.
Signed-off-by: Egbert Eich <e...@suse.com>
---
vnfs/libexec/wwmkchroot/include-suse | 45 +++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/vnfs/libexec/wwmkchroot/include-suse
b/vnfs/libexec/wwmkchroot/include-suse
index e6cad4c..3e5dcf4 100644
--- a/vnfs/libexec/wwmkchroot/include-suse
+++ b/vnfs/libexec/wwmkchroot/include-suse
@@ -1,4 +1,4 @@
-ZYP_CMD="zypper --root $CHROOTDIR -n --gpg-auto-import-keys"
+ZYP_CMD="zypper -n --gpg-auto-import-keys"
distro_check() {
if ! rpm -q zypper >/dev/null 2>&1 ; then
@@ -22,11 +22,20 @@ set_overlay() {
elif [ -f "$CHROOTDIR/etc/SuSE-release" ]; then
suse=1
fi
- if [ $no_suse -eq 1 ]; then
- echo "ERROR: This must be a SuSE compatible chroot!"
- return 1
+ if [ $suse -eq 0 ]; then
+ echo "ERROR: This must be a SUSE compatible chroot!"
+ return 1
+ fi
+ # If no repos are available in the chroot assume they've been taken from
+ # the host.
+ chrootarg="--root $CHROOTDIR"
+ if [ -z "$ZYP_MIRROR" -a -z "$INSTALL_ISO" ]; then
+ echo "INFO: Taking repository information from running system"
+ chrootarg="--installroot $CHROOTDIR"
fi
- PKGR_CMD="$ZYP_CMD install --no-recommends --auto-agree-with-licenses
$PKGLIST"
+ [ -n "$VERBOSE" ] && echo "Executing zypper with $chrootarg"
+ PKGR_CMD="$ZYP_CMD $chrootarg install --auto-agree-with-licenses $PKGLIST"
+
return 0
}
@@ -46,14 +55,13 @@ prechroot() {
mkdir -p -m 755 $CHROOTDIR/dev
rm -f $CHROOTDIR/dev/zero && mknod -m 666 $CHROOTDIR/dev/zero c 1 5
- cp -rap /etc/zypp/zypper.conf $CHROOTDIR/etc
- # Use repos of installed system
+ chrootarg="--root $CHROOTDIR"
+ # Use repos of installed system
if [[ -z "$ZYP_MIRROR" && -z "$INSTALL_ISO" ]]; then
- cp -rap /etc/zypp/repos.d $CHROOTDIR/etc/zypp
- [ -d /etc/zypp/services.d ] && cp -rap /etc/zypp/services.d
$CHROOTDIR/etc/zypp
- [ -d /etc/zypp/credentials.d ] && cp -rap /etc/zypp/credentials.d
$CHROOTDIR/etc/zypp
+ chrootarg="--installroot $CHROOTDIR"
elif [ -n "$INSTALL_ISO" ]; then
- # Use ISO
+ cp -rap /etc/zypp/zypper.conf $CHROOTDIR/etc
+ # Use ISO
for mountpath in `ls -d $MEDIA_MOUNTPATH.*`; do
if [ -z "$INSTALLDIRS" ]; then
if [ -d ${mountpath}/repodata ]; then
@@ -68,31 +76,30 @@ prechroot() {
fi
done
ZYP_MIRROR=$INSTALLDIRS
+ else
+ cp -rap /etc/zypp/zypper.conf $CHROOTDIR/etc
fi
-
+ [ -n "$VERBOSE" ] && echo "Executing zypper with $chrootarg"
if [ -n "${ZYP_MIRROR}" ]; then
declare -i i=0 cnt
- cnt=$($ZYP_CMD lr | grep '|' | wc -l)
+ cnt=$($ZYP_CMD $chrootarg lr | grep '|' | wc -l)
while [ $i -lt $cnt ]; do
- $ZYP_CMD rr $i
+ $ZYP_CMD $chrootarg rr $i
let i++
done
cnt=0
for repourl in `echo $ZYP_MIRROR | sed -e 's/,/ /'`; do
- $ZYP_CMD ar $repourl repo-$((cnt++))
+ $ZYP_CMD $chrootarg ar $repourl repo-$((cnt++))
done
fi
- PKGR_CMD="$ZYP_CMD install --no-recommends --auto-agree-with-licenses
$PKGLIST"
+ PKGR_CMD="$ZYP_CMD $chrootarg install --auto-agree-with-licenses $PKGLIST"
return 0
}
postchroot() {
- for mirror in `echo $ZYP_MIRROR | sed -e 's/,/ /'`; do
- $ZYP_CMD rr $mirror
- done
touch $CHROOTDIR/fastboot
return 0
}
