Hello community,
here is the log from the commit of package mksusecd for openSUSE:Factory
checked in at 2016-07-15 12:54:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mksusecd (Old)
and /work/SRC/openSUSE:Factory/.mksusecd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2016-06-23
13:36:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2016-07-15
12:55:09.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jul 15 08:15:15 UTC 2016 - snw...@suse.com
+
+- tw support: also sign image files
+- sanitize function that removes files from iso
+- remove tumbleweed images in 'micro' format
+- 1.40
+
+-------------------------------------------------------------------
Old:
----
mksusecd-1.39.tar.xz
New:
----
mksusecd-1.40.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mksusecd.spec ++++++
--- /var/tmp/diff_new_pack.VP1heA/_old 2016-07-15 12:55:10.000000000 +0200
+++ /var/tmp/diff_new_pack.VP1heA/_new 2016-07-15 12:55:10.000000000 +0200
@@ -18,7 +18,7 @@
Name: mksusecd
-Version: 1.39
+Version: 1.40
Release: 0
Summary: Create SUSE Linux installation ISOs
License: GPL-3.0+
++++++ mksusecd-1.39.tar.xz -> mksusecd-1.40.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-1.39/VERSION new/mksusecd-1.40/VERSION
--- old/mksusecd-1.39/VERSION 2016-06-20 17:04:52.000000000 +0200
+++ new/mksusecd-1.40/VERSION 2016-07-15 10:10:59.000000000 +0200
@@ -1 +1 @@
-1.39
+1.40
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-1.39/changelog new/mksusecd-1.40/changelog
--- old/mksusecd-1.39/changelog 2016-06-20 17:04:52.000000000 +0200
+++ new/mksusecd-1.40/changelog 2016-07-15 10:10:59.000000000 +0200
@@ -1,3 +1,8 @@
+2016-07-14: 1.40
+ - tw support: also sign image files
+ - sanitize function that removes files from iso
+ - remove tumbleweed images in 'micro' format
+
2016-06-20: 1.39
- create missing 'content' file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-1.39/mksusecd new/mksusecd-1.40/mksusecd
--- old/mksusecd-1.39/mksusecd 2016-06-20 17:04:52.000000000 +0200
+++ new/mksusecd-1.40/mksusecd 2016-07-15 10:10:59.000000000 +0200
@@ -172,6 +172,7 @@
sub grub2_add_option;
sub yaboot_add_option;
sub update_boot_options;
+sub exclude_files;
sub prepare_normal;
sub prepare_micro;
sub prepare_nano;
@@ -2129,15 +2130,44 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Exclude files from iso.
+#
+# exclude_files(ref_to_file_list)
+#
+# ref_to_file_list is an array ref with file name patterns (regexp) to exclude
+#
+sub exclude_files
+{
+ my $list = $_[0];
+
+ my $ex = join "|", @$list;
+
+ for (sort keys %$files) {
+ if(m#^($ex)$#) {
+ my $f = fname($_);
+ push @{$mkisofs->{exclude}}, $f if $f;
+ }
+ }
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sub prepare_micro
{
- for (
+ exclude_files [
(map { "suse/$_" } @boot_archs, "i586", "noarch"),
- "docu", "ls-lR.gz", "INDEX.gz", "ARCHIVES.gz", "ChangeLog", "updates",
"linux"
- ) {
- my $f = fname($_);
- push @{$mkisofs->{exclude}}, $f if $f;
- }
+ "docu",
+ "ls-lR\\.gz",
+ "INDEX\\.gz",
+ "ARCHIVES\\.gz",
+ "ChangeLog",
+ "updates",
+ "linux",
+ "images",
+ "autorun.inf",
+ ".*\\.ico",
+ ".*\\.exe",
+ ];
}
@@ -2146,7 +2176,7 @@
{
prepare_micro;
- my $ex = join "|", (
+ exclude_files [
"boot/.*/.*\\.rpm",
"boot/.*/bind",
"boot/.*/common",
@@ -2154,22 +2184,19 @@
"boot/.*/rescue",
"boot/.*/root",
"boot/.*/sax2",
+ "boot/.*/libstoragemgmt",
"boot/.*/branding",
"boot/.*/openSUSE",
"boot/.*/SLES",
"boot/.*/SLED",
"boot/.*/.*-xen",
- "control.xml",
+ "control\\.xml",
"gpg-.*",
"NEWS",
- );
-
- for (sort keys %$files) {
- if(m#^suse(/|$)|^$ex$#) {
- my $f = fname($_);
- push @{$mkisofs->{exclude}}, $f if $f;
- }
- }
+ "license\\.tar\\.gz",
+ "(|.*/)directory\\.yast",
+ "suse",
+ ];
}
@@ -2178,31 +2205,19 @@
{
prepare_nano;
- my $ex = join "|", (
+ exclude_files [
"boot/.*/linux",
"boot/.*/initrd",
"boot/.*/biostest",
- "boot/.*/en.tlk",
- );
+ "boot/.*/en\\.tlk",
+ ];
if(!$opt_efi) {
- $ex .= "|" . join "|", (
+ exclude_files [
"boot/.*/efi",
"boot/.*/grub2.*",
- )
- }
-
- $ex = "^$ex\$";
-
- if(!$opt_efi) {
- $ex .= "|^EFI(/|\$)";
- }
-
- for (sort keys %$files) {
- if(m#$ex#) {
- my $f = fname($_);
- push @{$mkisofs->{exclude}}, $f if $f;
- }
+ "EFI",
+ ]
}
}
@@ -2356,6 +2371,7 @@
add_to_content_file $cont, "HASH", $_, '^boot/.+/linux[^/.]*$';
add_to_content_file $cont, "HASH", $_, '^docu/RELEASE-NOTES[^/]*$';
add_to_content_file $cont, "META", $_, '^suse/setup/descr/[^/]+$';
+ add_to_content_file $cont, "HASH", $_, '^images/[^/]+\.(xz|xml)$';
}
# print Dumper($cont);
