Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2022-10-16 16:08:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Sun Oct 16 16:08:59 2022 rev:311 rq:1011006 version:8.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2022-10-10
18:44:48.990901453 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.2275/linuxrc.changes
2022-10-16 16:09:04.730735440 +0200
@@ -1,0 +2,8 @@
+Fri Oct 14 17:58:15 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#304
+- make s390x hypervisor setting configurable (for debugging)
+- s390x: remove deprecated ESCON support (jsc#PED-595)
+- 8.15
+
+--------------------------------------------------------------------
Old:
----
linuxrc-8.14.tar.xz
New:
----
linuxrc-8.15.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.1ol4xi/_old 2022-10-16 16:09:05.414737044 +0200
+++ /var/tmp/diff_new_pack.1ol4xi/_new 2022-10-16 16:09:05.422737062 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 8.14
+Version: 8.15
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-8.14.tar.xz -> linuxrc-8.15.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/VERSION new/linuxrc-8.15/VERSION
--- old/linuxrc-8.14/VERSION 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/VERSION 2022-10-14 19:58:15.000000000 +0200
@@ -1 +1 @@
-8.14
+8.15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/changelog new/linuxrc-8.15/changelog
--- old/linuxrc-8.14/changelog 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/changelog 2022-10-14 19:58:15.000000000 +0200
@@ -1,3 +1,8 @@
+2022-10-14: 8.15
+ - merge gh#openSUSE/linuxrc#304
+ - make s390x hypervisor setting configurable (for debugging)
+ - s390x: remove deprecated ESCON support (jsc#PED-595)
+
2022-10-05: 8.14
- merge gh#openSUSE/linuxrc#299
- add 'repo' URL scheme to linuxrc (jsc#SLE-22578, jsc#SLE-24584)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/dialog.c new/linuxrc-8.15/dialog.c
--- old/linuxrc-8.14/dialog.c 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/dialog.c 2022-10-14 19:58:15.000000000 +0200
@@ -104,7 +104,6 @@
{ di_390net_osa, "OSA-2 or OSA Express" },
{ di_390net_ctc, "Channel To Channel (CTC)" },
- { di_390net_escon, "ESCON" },
{ di_390net_iucv, "Inter-User Communication Vehicle (IUCV)" },
{ di_390net_hsi, "HiperSockets" },
{ di_390net_virtio, "VirtIO Ethernet CCW Device"},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/dialog.h new/linuxrc-8.15/dialog.h
--- old/linuxrc-8.14/dialog.h 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/dialog.h 2022-10-14 19:58:15.000000000 +0200
@@ -84,7 +84,6 @@
di_390net_osa,
di_390net_ctc,
- di_390net_escon,
di_390net_iucv,
di_390net_hsi,
di_390net_virtio,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/file.c new/linuxrc-8.15/file.c
--- old/linuxrc-8.14/file.c 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/file.c 2022-10-14 19:58:15.000000000 +0200
@@ -327,6 +327,7 @@
{ key_extend, "Extend", kf_cfg + kf_cmd },
{ key_switch_to_fb, "SwitchToFB", kf_cfg + kf_cmd_early },
{ key_edid, "EDID", kf_cmd_early },
+ { key_hypervisor, "Hypervisor", kf_cmd_early },
};
static struct {
@@ -351,7 +352,6 @@
#if defined(__s390__) || defined(__s390x__)
{ "osa", di_390net_osa },
{ "ctc", di_390net_ctc },
- { "escon", di_390net_escon },
{ "iucv", di_390net_iucv },
{ "hsi", di_390net_hsi },
{ "qdio", di_osa_qdio },
@@ -1903,6 +1903,10 @@
if(*f->value) util_parse_edid(f->value);
break;
+ case key_hypervisor:
+ str_copy(&config.hwp.hypervisor, f->value);
+ break;
+
default:
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/file.h new/linuxrc-8.15/file.h
--- old/linuxrc-8.14/file.h 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/file.h 2022-10-14 19:58:15.000000000 +0200
@@ -58,7 +58,8 @@
key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update,
key_ibft_devices, key_linuxrc_core, key_norepo, key_auto_assembly,
key_autoyast_parse,
key_device_auto_config, key_autoyast_passurl, key_rd_zdev, key_insmod_pre,
- key_zram, key_zram_root, key_zram_swap, key_extend, key_switch_to_fb,
key_edid
+ key_zram, key_zram_root, key_zram_swap, key_extend, key_switch_to_fb,
key_edid,
+ key_hypervisor
} file_key_t;
typedef enum {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/global.h new/linuxrc-8.15/global.h
--- old/linuxrc-8.14/global.h 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/global.h 2022-10-14 19:58:15.000000000 +0200
@@ -737,7 +737,6 @@
log_file_t dest[3]; /**< logging destinations, see
linuxrc.c */
} log;
-#if defined(__s390__) || defined(__s390x__)
/* hwcfg file parameters */
struct {
char* userid;
@@ -762,9 +761,6 @@
char* osahwaddr;
char* hypervisor;
} hwp;
-
-#endif
-
} config_t;
extern config_t config;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/linuxrc.c new/linuxrc-8.15/linuxrc.c
--- old/linuxrc-8.14/linuxrc.c 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/linuxrc.c 2022-10-14 19:58:15.000000000 +0200
@@ -762,7 +762,10 @@
util_setup_coredumps();
- #if defined(__s390__) || defined(__s390x__)
+ /*
+ * config.hwp.hypervisor is a s390 specific setting
+ */
+ str_copy(&config.hwp.hypervisor, "Reallyunknown");
if(util_check_exist("/sys/hypervisor/s390")) {
char *type;
@@ -771,23 +774,21 @@
type = util_get_attr("/sys/hypervisor/s390/hyp/type");
if(!strncmp(type, "z/VM", sizeof "z/VM" - 1)) {
- config.hwp.hypervisor = "z/VM";
+ str_copy(&config.hwp.hypervisor, "z/VM");
}
else if(!strncmp(type, "LPAR", sizeof "LPAR" - 1)) {
- config.hwp.hypervisor = "LPAR";
+ str_copy(&config.hwp.hypervisor, "LPAR");
}
else {
- config.hwp.hypervisor = "Unknown";
+ str_copy(&config.hwp.hypervisor, "Unknown");
}
}
else {
struct utsname utsinfo;
uname(&utsinfo);
- if(!strncmp(utsinfo.machine, "s390x", sizeof "s390x" - 1 ))
config.hwp.hypervisor="KVM";
- else config.hwp.hypervisor="Reallyunknown";
+ if(!strncmp(utsinfo.machine, "s390x", sizeof "s390x" - 1 ))
str_copy(&config.hwp.hypervisor, "KVM");
}
- #endif
/* add cmdline to info file */
config.info.add_cmdline = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/linuxrc.html
new/linuxrc-8.15/linuxrc.html
--- old/linuxrc-8.14/linuxrc.html 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/linuxrc.html 2022-10-14 19:58:15.000000000 +0200
@@ -1452,7 +1452,6 @@
osa OSA-2 or OSA Express
hsi Hipersocket
ctc CTC (deprecated)
- escon ESCON (deprecated)
iucv IUCV (deprecated)
</pre>
</td></tr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.14/net.c new/linuxrc-8.15/net.c
--- old/linuxrc-8.14/net.c 2022-10-05 17:53:27.000000000 +0200
+++ new/linuxrc-8.15/net.c 2022-10-14 19:58:15.000000000 +0200
@@ -615,7 +615,6 @@
{ "fddi", "FDDI network card" },
{ "hip", "HIPPI network card" },
{ "ctc", "channel to channel connection" },
- { "escon", "ESCON connection" },
{ "ci", "channel attached cisco router" },
{ "iucv", "IUCV connection" },
{ "hsi", "HiperSocket" }
@@ -638,7 +637,7 @@
IUCV is available for use unless the driver is already loaded. So,
if we're running on z/VM we always load it, no matter what. */
#if defined(__s390__) || defined(__s390x__)
- if(!strncmp(config.hwp.hypervisor, "z/VM", sizeof "z/VM" - 1 )) {
+ if(!strcmp(config.hwp.hypervisor, "z/VM")) {
dia_info(&win, "We are running on z/VM", MSGTYPE_INFO);
dia_info(&win, "Loading the IUCV network driver", MSGTYPE_INFO);
mod_modprobe("netiucv","");
@@ -1403,9 +1402,6 @@
case 0x88: /* CTC */
config.hwp.type = di_390net_ctc;
break;
- case 0x8f: /* ESCON */
- config.hwp.type = di_390net_escon;
- break;
default:
return -1;
}
@@ -1415,11 +1411,10 @@
di_390net_hsi,
di_390net_sep,
di_390net_ctc,
- di_390net_escon,
di_390net_iucv,
di_none
};
- if(!strncmp(config.hwp.hypervisor, "KVM", sizeof "KVM" - 1)) {
+ if(!strcmp(config.hwp.hypervisor, "KVM")) {
config.hwp.type = di_390net_virtio;
}
else {
@@ -1448,7 +1443,6 @@
break;
case di_390net_ctc:
- case di_390net_escon:
if(mod_modprobe("ctcm",NULL)) {
dia_message("failed to load ctcm module",MSGTYPE_ERROR);
return -1;
@@ -1593,7 +1587,6 @@
sprintf(cmd, "iucv_configure %s 1", config.hwp.userid);
break;
case di_390net_ctc:
- case di_390net_escon:
if(config.hwp.protocol > 0)
sprintf(cmd, "/sbin/chzdev -e ctc --no-root-update %s-%s protocol=%d",
config.hwp.readchan, config.hwp.writechan, config.hwp.protocol - 1);
else
