Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2021-04-27 21:34:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Tue Apr 27 21:34:18 2021 rev:298 rq:888752 version:8.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2021-04-23
17:50:24.950772532 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.12324/linuxrc.changes
2021-04-27 21:34:23.831957620 +0200
@@ -1,0 +2,21 @@
+Tue Apr 27 10:59:37 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#257
+- rescue: leave linking modules to prep script
+- 8.0.0
+
+--------------------------------------------------------------------
+Tue Apr 27 07:22:19 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#260
+- don't ask for ssh password if ssh.password.enc is set (bsc#1185304)
+- 7.0.35
+
+--------------------------------------------------------------------
+Mon Apr 26 12:24:07 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#259
+- fix handling of modules.order in driver updates (bsc#1184550)
+- 7.0.34
+
+--------------------------------------------------------------------
Old:
----
linuxrc-7.0.33.tar.xz
New:
----
linuxrc-8.0.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.wpCwyZ/_old 2021-04-27 21:34:24.339958455 +0200
+++ /var/tmp/diff_new_pack.wpCwyZ/_new 2021-04-27 21:34:24.339958455 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 7.0.33
+Version: 8.0.0
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-7.0.33.tar.xz -> linuxrc-8.0.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.33/VERSION new/linuxrc-8.0.0/VERSION
--- old/linuxrc-7.0.33/VERSION 2021-04-20 09:44:05.000000000 +0200
+++ new/linuxrc-8.0.0/VERSION 2021-04-27 12:59:37.000000000 +0200
@@ -1 +1 @@
-7.0.33
+8.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.33/changelog new/linuxrc-8.0.0/changelog
--- old/linuxrc-7.0.33/changelog 2021-04-20 09:44:05.000000000 +0200
+++ new/linuxrc-8.0.0/changelog 2021-04-27 12:59:37.000000000 +0200
@@ -1,3 +1,15 @@
+2021-04-27: 8.0.0
+ - merge gh#openSUSE/linuxrc#257
+ - rescue: leave linking modules to prep script
+
+2021-04-27: 7.0.35
+ - merge gh#openSUSE/linuxrc#260
+ - don't ask for ssh password if ssh.password.enc is set (bsc#1185304)
+
+2021-04-26: 7.0.34
+ - merge gh#openSUSE/linuxrc#259
+ - fix handling of modules.order in driver updates (bsc#1184550)
+
2021-04-20: 7.0.33
- merge gh#openSUSE/linuxrc#256
- Set copyright date to "1996-2021" (bsc#1184990)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.33/linuxrc.c new/linuxrc-8.0.0/linuxrc.c
--- old/linuxrc-7.0.33/linuxrc.c 2021-04-20 09:44:05.000000000 +0200
+++ new/linuxrc-8.0.0/linuxrc.c 2021-04-27 12:59:37.000000000 +0200
@@ -342,14 +342,6 @@
if(!strcmp(*s, "tmp")) chmod(buf, 01777);
}
- // link module tree
- strprintf(&buf, "%s/lib/modules", mp);
- symlink("/parts/mp_0000/lib/modules", buf);
-
- // link firmware tree
- strprintf(&buf, "%s/lib/firmware", mp);
- symlink("/parts/mp_0000/lib/firmware", buf);
-
// mount 'parts/00_lib' (kernel parts)
strprintf(&buf, "%s/parts/mp_0000", mp);
util_mount_ro("/parts/00_lib", buf, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.33/net.c new/linuxrc-8.0.0/net.c
--- old/linuxrc-7.0.33/net.c 2021-04-20 09:44:05.000000000 +0200
+++ new/linuxrc-8.0.0/net.c 2021-04-27 12:59:37.000000000 +0200
@@ -96,7 +96,7 @@
}
}
- if(config.usessh && !config.net.sshpassword && !config.net.sshkey) {
+ if(config.usessh && !(config.net.sshpassword || config.net.sshpassword_enc
|| config.net.sshkey)) {
if(!config.win) util_disp_init();
dia_input2("Enter your temporary SSH password.", &config.net.sshpassword,
20, 1);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.33/util.c new/linuxrc-8.0.0/util.c
--- old/linuxrc-7.0.33/util.c 2021-04-20 09:44:05.000000000 +0200
+++ new/linuxrc-8.0.0/util.c 2021-04-27 12:59:37.000000000 +0200
@@ -846,7 +846,9 @@
if(!util_check_exist(buf2) && (f = fopen(buf2, "w"))) {
while((de = readdir(d))) {
if(mod_basename_len(de->d_name)) {
- fprintf(f, "%s\n", de->d_name);
+ char *mod_name = mod_basename(de->d_name);
+ fprintf(f, "%s\n", mod_name);
+ free(mod_name);
}
}
fclose(f);
@@ -983,17 +985,32 @@
f0 = file_read_file(buf1, kf_none);
for(f = f0; f; f = f->next) {
char *mod_name = mod_basename(f->key_str);
+ char *update_mod_name = NULL;
+ const mod_extensions_t *update_mod_ext;
- // remove existing module, with any extension
- for(const mod_extensions_t *mod_ext = mod_extensions; mod_ext->ext;
mod_ext++) {
- strprintf(&buf2, "/modules/%s%s", mod_name, mod_ext->ext);
- unlink(buf2);
+ // check if module exists in driver update
+ //
+ // if so, update_mod_ext->ext points to the module extension used for the
module
+ // else, update_mod_ext->ext is NULL
+ for(update_mod_ext = mod_extensions; update_mod_ext->ext;
update_mod_ext++) {
+ strprintf(&update_mod_name, "%s/modules/%s%s", dst, mod_name,
update_mod_ext->ext);
+ if(util_check_exist(update_mod_name)) break;
}
- strprintf(&buf1, "%s/modules/%s", dst, f->key_str);
- strprintf(&buf2, "/modules/%s", f->key_str);
- symlink(buf1, buf2);
+ // if the driver update contains the module...
+ if(update_mod_ext->ext) {
+ // remove existing module, with any possible extension
+ for(const mod_extensions_t *mod_ext = mod_extensions; mod_ext->ext;
mod_ext++) {
+ strprintf(&buf1, "/modules/%s%s", mod_name, mod_ext->ext);
+ unlink(buf1);
+ }
+
+ // create a link to the updated module
+ strprintf(&buf1, "/modules/%s%s", mod_name, update_mod_ext->ext);
+ symlink(update_mod_name, buf1);
+ }
+ free(update_mod_name);
free(mod_name);
}
