Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2026-03-24 18:48:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Tue Mar 24 18:48:38 2026 rev:99 rq:1342085 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2026-03-19 17:39:17.362562916 +0100 +++ /work/SRC/openSUSE:Factory/.mksusecd.new.8177/mksusecd.changes 2026-03-24 18:49:29.251987578 +0100 @@ -1,0 +2,8 @@ +Mon Mar 23 18:48:43 UTC 2026 - [email protected] + +- merge gh#openSUSE/mksusecd#101 +- show DUD product string when applying DUD (bsc#1258149) +- apply only DUD for matching product (bsc#1258149) +- 5.2 + +-------------------------------------------------------------------- Old: ---- mksusecd-5.1.tar.xz New: ---- mksusecd-5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.pZsjc9/_old 2026-03-24 18:49:29.764008703 +0100 +++ /var/tmp/diff_new_pack.pZsjc9/_new 2026-03-24 18:49:29.768008868 +0100 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 5.1 +Version: 5.2 Release: 0 Summary: Tool to create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-5.1.tar.xz -> mksusecd-5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-5.1/VERSION new/mksusecd-5.2/VERSION --- old/mksusecd-5.1/VERSION 2026-03-18 19:18:39.000000000 +0100 +++ new/mksusecd-5.2/VERSION 2026-03-23 19:48:43.000000000 +0100 @@ -1 +1 @@ -5.1 +5.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-5.1/changelog new/mksusecd-5.2/changelog --- old/mksusecd-5.1/changelog 2026-03-18 19:18:39.000000000 +0100 +++ new/mksusecd-5.2/changelog 2026-03-23 19:48:43.000000000 +0100 @@ -1,3 +1,8 @@ +2026-03-23: 5.2 + - merge gh#openSUSE/mksusecd#101 + - show DUD product string when applying DUD (bsc#1258149) + - apply only DUD for matching product (bsc#1258149) + 2026-03-18: 5.1 - merge gh#openSUSE/mksusecd#98 - avoid problems with xz and landlock lsm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-5.1/mkmedia new/mksusecd-5.2/mkmedia --- old/mksusecd-5.1/mkmedia 2026-03-18 19:18:39.000000000 +0100 +++ new/mksusecd-5.2/mkmedia 2026-03-23 19:48:43.000000000 +0100 @@ -333,6 +333,7 @@ my $opt_initrd_options = []; my $opt_tmp_dir; my $opt_dry_run; +my $opt_dud_dist; Getopt::Long::Configure("gnu_compat"); @@ -384,6 +385,7 @@ 'no-mbr-chs' => \$opt_no_mbr_chs, 'initrd=s' => \@opt_initrds, 'apply-dud=s' => \@opt_duds, + 'dud-dist=s' => \$opt_dud_dist, 'instsys|live-root=s' => \@opt_instsys, 'rescue=s' => \@opt_rescue, 'rebuild-initrd' => sub { $opt_rebuild_initrd = 2 }, @@ -481,7 +483,7 @@ } if($opt_rebuild_initrd == 3) { # for live-root changes and full initrd rebuilds - die "mkmedia must be run with root permissions to appy driver updates.\n" + die "mkmedia must be run with root permissions to apply driver updates.\n" } } @@ -1036,6 +1038,7 @@ --rescue DIR|RPM Add content of DIR or RPM to rescue system (can be repeated). --instsys-size SIZE_SPEC Resize Live root file system. --live-root-size SIZE_SPEC Alias for --instsys-size. + --dud-dist DIST Apply DUDs intended for DIST (see man page for details). --no-docs Don't include package doc files (default). --keep-docs Include package doc files. @@ -7520,6 +7523,7 @@ die "initrd unpacking failed\n" if !$orig_initrd; my $linuxrc_config = read_config "$orig_initrd/linuxrc.config"; + my $os_release = read_config "$orig_initrd/etc/os-release"; my $dud; @@ -7544,6 +7548,18 @@ $dud->{dir} = $linuxrc_config->{updatedir}; ($dud->{arch} = $1, $dud->{dist} = $2) if $dud->{dir} =~ m#/([^/-]+)-([^/-]+)$#; } + elsif($os_release->{id} && $os_release->{version_id}) { + $dud->{dist} = $os_release->{id} . $os_release->{version_id}; + $dud->{dist} = "tw" if $os_release->{id} eq "opensuse-tumbleweed"; + $dud->{dir} = "/linux/suse/$dud->{arch}-$dud->{dist}"; + } + + if($opt_dud_dist) { + $dud->{dist} = $opt_dud_dist; + # avoid accidents... + $dud->{dist} =~ tr/\/\$\{\}\[\]\t //d; + $dud->{dir} = "/linux/suse/$dud->{arch}-$dud->{dist}"; + } print "going to apply driver updates in $dud->{dir}\n" if $opt_verbose >= 1; @@ -7583,6 +7599,11 @@ unpack_orig_initrd; } + if($dud->{count} == 0) { + print "warning: no driver updates found in $dud->{dir}\n"; + print "(Try --dud-dist option to apply this DUD anyway.)\n"; + } + return $dud; } @@ -7636,8 +7657,12 @@ $dud->{name} = $dud->{config}{updatename}; $dud->{id} = $dud->{config}{updateid}; + $dud->{product} = $dud->{config}{updateproduct}; - print "applying driver update\n - id: $dud->{id}\n - name: $dud->{name}\n" if !$iso_only; + if(!$iso_only) { + print "applying driver update\n - id: $dud->{id}\n - name: $dud->{name}\n"; + print " - product: $dud->{product}\n" if $dud->{product}; + } my $log; my $log_id = $dud->{id}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-5.1/mkmedia_man.adoc new/mksusecd-5.2/mkmedia_man.adoc --- old/mksusecd-5.1/mkmedia_man.adoc 2026-03-18 19:18:39.000000000 +0100 +++ new/mksusecd-5.2/mkmedia_man.adoc 2026-03-23 19:48:43.000000000 +0100 @@ -176,6 +176,13 @@ *--live-root-size*=_SIZE_SPEC_:: Aias for *--instsys-size*. +*--dud-dist*=_DIST_:: +Apply DUDs intended for _DIST_. +Usually *--apply-dud* applies only DUDs that match the product of the installation medium. If you want to +apply a DUD even if the product does not match, set _DIST_ to the dist tag used in the DUD. Examples +are 'leap16.1' (Leap 16.1), 'tw' (Tumbleweed), 'sles16.1' (SLES 16.1). +The option value is actually a shell glob - so, to catch all, you can set _DIST_ to '*'. + *--no-docs*:: Don't include package documentation files (default).
