Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2020-06-23 21:07:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Tue Jun 23 21:07:11 2020 rev:61 rq:816593 version:1.73 Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2020-04-09 23:17:44.810324000 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new.2956/mksusecd.changes 2020-06-23 21:07:56.286490371 +0200 @@ -1,0 +2,8 @@ +Tue Jun 23 13:32:51 UTC 2020 - [email protected] + +- merge gh#openSUSE/mksusecd#48 +- do not include excluded products (bsc#1173263) +- recreate products file, including its checksum update +- 1.73 + +-------------------------------------------------------------------- Old: ---- mksusecd-1.72.tar.xz New: ---- mksusecd-1.73.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.AfBaHd/_old 2020-06-23 21:07:57.126493085 +0200 +++ /var/tmp/diff_new_pack.AfBaHd/_new 2020-06-23 21:07:57.130493098 +0200 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 1.72 +Version: 1.73 Release: 0 Summary: Tool to create SUSE Linux installation ISOs License: GPL-3.0+ ++++++ mksusecd-1.72.tar.xz -> mksusecd-1.73.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.72/VERSION new/mksusecd-1.73/VERSION --- old/mksusecd-1.72/VERSION 2020-04-09 09:27:15.000000000 +0200 +++ new/mksusecd-1.73/VERSION 2020-06-23 15:32:51.000000000 +0200 @@ -1 +1 @@ -1.72 +1.73 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.72/changelog new/mksusecd-1.73/changelog --- old/mksusecd-1.72/changelog 2020-04-09 09:27:15.000000000 +0200 +++ new/mksusecd-1.73/changelog 2020-06-23 15:32:51.000000000 +0200 @@ -1,3 +1,8 @@ +2020-06-23: 1.73 + - merge gh#openSUSE/mksusecd#48 + - do not include excluded products (bsc#1173263) + - recreate products file, including its checksum update + 2020-04-09: 1.72 - merge gh#openSUSE/mksusecd#47 - Fix broken link to kiwi documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.72/mksusecd new/mksusecd-1.73/mksusecd --- old/mksusecd-1.72/mksusecd 2020-04-09 09:27:15.000000000 +0200 +++ new/mksusecd-1.73/mksusecd 2020-06-23 15:32:51.000000000 +0200 @@ -516,8 +516,10 @@ } if($opt_sign && ( - # we are going to change '/content' resp. '/CHECKSUMS' in one way or another - @opt_initrds || @opt_kernel_rpms || $opt_boot_options || $opt_new_boot_entry || update_content_or_checksums) + # we are going to change '/content' resp. '/CHECKSUMS' in one way or another + @opt_initrds || @opt_kernel_rpms || $opt_boot_options || + $opt_new_boot_entry || $opt_include_repos || update_content_or_checksums + ) ) { extract_installkeys; create_sign_key; @@ -4417,14 +4419,8 @@ # don't merge repos if the user doesn't want to return if !$opt_merge_repos; - # copy products file from first source (if any) ... - mkdir "$tmp_new/media.1", 0755; - my $prod_file = "$src->[0]{dir}/media.1/products"; - if(-r $prod_file) { - push @{$mkisofs->{exclude}}, $prod_file; - system "cp $prod_file $tmp_new/media.1/products"; - chmod 0644, "$tmp_new/media.1/products"; - } + # rebuild products file + my $prod_file = copy_or_new_file "media.1/products"; # create/update add_on_products.xml my $products_xml; @@ -4437,17 +4433,19 @@ close $fh; } - open my $prod_fd, ">>$tmp_new/media.1/products" or die "media.1/products: $!\n"; + # rewrite entire product file + open my $prod_fd, ">$prod_file" or die "media.1/products: $!\n"; # ... and append any products we found above for (@{$product_db->{list}}) { - # $src->[0] is always included, skip it here - next if !$_->{src_idx}; - next if !$_->{include}; + if(!$_->{include}) { + push @{$mkisofs->{exclude}}, $_->{base_dir} if $_->{product_dir}; + next; + } # FIXME: add $label to name? print $prod_fd "/$_->{repo_dir} $_->{name} $_->{ver}\n"; for my $d (@{$_->{dirs}}) { - push @{$mkisofs->{grafts}}, "$_->{repo_dir}/$d=$_->{base_dir}/$d"; + push @{$mkisofs->{grafts}}, "$_->{repo_dir}/$d=$_->{base_dir}/$d" if $_->{repo_dir} ne $_->{product_dir}; } if($opt_enable_repos =~ /^(1|yes|auto|ask)$/i) { @@ -4474,7 +4472,7 @@ # # - source_idx: # of source medium (0-based) # - product_file: full path to 'media.1/products' -# - base_dir: directory the repos is in +# - base_dir: directory the repos are in # - name: product name # - version: some version string # @@ -4492,6 +4490,8 @@ $base_dir =~ s#/media.1/products$#$dir#; $base_dir =~ s#/+$##; + $dir =~ s#^/##; + # skip if we did this already return 0 if $product_db->{checked}{$base_dir}; @@ -4525,15 +4525,20 @@ # The reason is that on our module media the same directory is used for # binary, source, and debuginfo modules. So we'd have a file conflict when # putting them on the same medium.. - my $repo_dir = $name; # FIXME: add "_$ver"? - $repo_dir .= "_$label" if $label ne ""; + my $repo_dir = $dir; + + if($label) { + $repo_dir = $name if !$repo_dir; + $repo_dir .= "_$label"; + } - # Check repo list if the repo should be included on the final medium. See - # --include-repos option. If unset, include everything. + # Check repo list if the repo should be included on the final medium. + # See --include-repos option. + # If unset, include everything. # - # Again, things on the first source are always included. + # Products in media root dir are always included. my $inc = 1; - if($opt_include_repos && $src_idx) { + if($opt_include_repos && $dir) { my @repos = split /,/, $opt_include_repos; $inc = grep { $_ eq $name } @repos; } @@ -4541,6 +4546,7 @@ # create internal product database entry push @{$product_db->{list}}, { base_dir => $base_dir, + product_dir => $dir, name => $name, ver => $ver, dirs => [ "repodata", sort keys %repodirs ],
