Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mksusecd for openSUSE:Factory
checked in at 2022-12-07 19:08:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mksusecd (Old)
and /work/SRC/openSUSE:Factory/.mksusecd.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd"
Wed Dec 7 19:08:28 2022 rev:72 rq:1041166 version:2.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2022-05-23
18:27:56.712229522 +0200
+++ /work/SRC/openSUSE:Factory/.mksusecd.new.1835/mksusecd.changes
2022-12-07 19:31:35.414175669 +0100
@@ -1,0 +2,7 @@
+Wed Dec 7 16:03:59 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/mksusecd#63
+- fix handling of usrmerge kernels (bsc#1206181)
+- 2.8
+
+--------------------------------------------------------------------
Old:
----
mksusecd-2.7.tar.xz
New:
----
mksusecd-2.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mksusecd.spec ++++++
--- /var/tmp/diff_new_pack.S3lF4p/_old 2022-12-07 19:31:35.834178031 +0100
+++ /var/tmp/diff_new_pack.S3lF4p/_new 2022-12-07 19:31:35.842178076 +0100
@@ -18,7 +18,7 @@
Name: mksusecd
-Version: 2.7
+Version: 2.8
Release: 0
Summary: Tool to create SUSE Linux installation ISOs
License: GPL-3.0+
++++++ mksusecd-2.7.tar.xz -> mksusecd-2.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-2.7/VERSION new/mksusecd-2.8/VERSION
--- old/mksusecd-2.7/VERSION 2022-05-23 17:36:52.000000000 +0200
+++ new/mksusecd-2.8/VERSION 2022-12-07 17:03:59.000000000 +0100
@@ -1 +1 @@
-2.7
+2.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-2.7/changelog new/mksusecd-2.8/changelog
--- old/mksusecd-2.7/changelog 2022-05-23 17:36:52.000000000 +0200
+++ new/mksusecd-2.8/changelog 2022-12-07 17:03:59.000000000 +0100
@@ -1,3 +1,7 @@
+2022-12-07: 2.8
+ - merge gh#openSUSE/mksusecd#63
+ - fix handling of usrmerge kernels
+
2022-05-23: 2.7
- merge gh#openSUSE/mksusecd#61
- fix zstd compression handling (bsc#1198138)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-2.7/mksusecd new/mksusecd-2.8/mksusecd
--- old/mksusecd-2.7/mksusecd 2022-05-23 17:36:52.000000000 +0200
+++ new/mksusecd-2.8/mksusecd 2022-12-07 17:03:59.000000000 +0100
@@ -4128,33 +4128,55 @@
{
$kernel->{dir} = $tmp->dir();
+ # add compat links for usrmerge
+ symlink "usr/lib", "$kernel->{dir}/lib";
+ mkdir "$kernel->{dir}/usr", 0755;
+ mkdir "$kernel->{dir}/usr/lib", 0755;
+
for (@opt_kernel_rpms) {
my $type = get_archive_type $_;
die "$_: don't know how to unpack this\n" if !$type;
unpack_archive $type, $_, $kernel->{dir};
}
- $kernel->{version} = (glob "$kernel->{dir}/boot/System.map-*")[0];
+ my $kernel_location;
+ my $kernel_name_suffix;
- if($kernel->{version} =~ m#/boot/System.map-([^/]+)#) {
- $kernel->{version} = $1;
+ if(-d "$kernel->{dir}/boot" ) {
+ my $version = (glob "$kernel->{dir}/boot/System.map-*")[0];
+ if($version =~ m#/boot/System.map-([^/]+)#) {
+ $kernel->{version} = $1;
+ $kernel_location = "boot";
+ $kernel_name_suffix = "-$kernel->{version}";
+ }
}
else {
+ my $version = (glob "$kernel->{dir}/lib/modules/*/System.map")[-1];
+ if($version =~ m#/lib/modules/([^/]+)/#) {
+ $kernel->{version} = $1;
+ $kernel_location = "lib/modules/$1";
+ $kernel_name_suffix = "";
+ }
+ }
+
+ if(! $kernel->{version}) {
die "Couldn't determine kernel version. No kernel package?\n";
}
# kernel image names, per architecture
#
- # aarch64: Image, Image-*; vmlinux-*
- # i586: vmlinuz, vmlinuz-*; vmlinux-*
- # ppc64le: vmlinux, vmlinux-*
- # s390x: image, image-*; vmlinux-*
- # x86_64: vmlinuz, vmlinuz-*; vmlinux-*
- #
- $kernel->{image} = (glob "$kernel->{dir}/boot/vmlinuz-*")[0];
- $kernel->{image} = (glob "$kernel->{dir}/boot/Image-*")[0] if
!$kernel->{image};
- $kernel->{image} = (glob "$kernel->{dir}/boot/image-*")[0] if
!$kernel->{image};
- $kernel->{image} = (glob "$kernel->{dir}/boot/vmlinux-*")[0] if
!$kernel->{image};
+ # aarch64: Image, Image-*; vmlinux-*
+ # i586: vmlinuz, vmlinuz-*; vmlinux-*
+ # ppc64le: vmlinux, vmlinux-*
+ # s390x: image, image-*; vmlinux-*
+ # x86_64: vmlinuz, vmlinuz-*; vmlinux-*
+
+ for my $name ( qw ( vmlinuz Image image vmlinux ) ) {
+ if( -f "$kernel->{dir}/$kernel_location/$name$kernel_name_suffix" ) {
+ $kernel->{image} =
"$kernel->{dir}/$kernel_location/$name$kernel_name_suffix";
+ last;
+ }
+ }
die "no module dir?\n" if $kernel->{version} eq "";
die "no kernel?\n" if !$kernel->{image};
@@ -4168,6 +4190,15 @@
system "depmod -a -b $kernel->{dir} $kernel->{version}";
+ if(! -s "$kernel->{dir}/lib/modules/$kernel->{version}/modules.dep") {
+ # squashfs is randomly picked, assuming it will always exist
+ my $fmt = (glob
"$kernel->{dir}/lib/modules/$kernel->{version}/kernel/fs/squashfs/squashfs.*")[0];
+ $fmt =~ s#.*/squashfs##;
+ $fmt .= " " if $fmt;
+
+ die "failed to generate modules.dep - maybe kmod package too old to handle
${fmt}module format?\n";
+ }
+
# print Dumper($kernel);
}
@@ -4241,7 +4272,7 @@
# copy modules.order & modules.builtin
if(-f "$kernel->{dir}/lib/modules/$kernel->{version}/modules.builtin") {
- system "cp $kernel->{dir}/lib/modules/$kernel->{version}/modules.builtin
$kernel->{new_dir}/lib/modules/$kernel->{version}/";
+ system "cp -f
$kernel->{dir}/lib/modules/$kernel->{version}/modules.builtin{,.modinfo}
$kernel->{new_dir}/lib/modules/$kernel->{version}/";
}
if(open my $f,
"$kernel->{dir}/lib/modules/$kernel->{version}/modules.order") {
