Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2018-12-31 09:44:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Mon Dec 31 09:44:10 2018 rev:61 rq:658912 version:14.403
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2018-11-26 10:17:44.285913217 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.28833/installation-images.changes
2018-12-31 09:44:11.730324411 +0100
@@ -0,0 +1,92 @@
+-------------------------------------------------------------------
+Mon Dec 17 11:39:09 UTC 2018 - [email protected]
+
+- added skelcd-fallbackrepo for SLE_HPC, SLE_RT, and CAASP
+
+-------------------------------------------------------------------
+Mon Dec 17 10:14:32 UTC 2018 - [email protected]
+
+- add skelcd-fallbackrepo-* packages to SLES image
+
+--------------------------------------------------------------------
+Mon Dec 17 09:16:26 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#286
+- allow adding package files to inst-sys (fate#325482)
+- add skelcd-fallbackrepo packages to instsys
+- 14.403
+
+--------------------------------------------------------------------
+Wed Dec 12 14:40:32 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#285
+- check font config (bsc#1113164)
+- add missing Source Sans Pro fonts (bsc#1113164)
+- add not always all skelcd-control packages
+- fix style issue in check_fonts
+- add check_fonts script (and other stuff)
+- 14.402
+
+-------------------------------------------------------------------
+Wed Dec 12 14:39:53 UTC 2018 - [email protected]
+
+- use adobe-sourcesanspro-fonts on openSUSE
+
+--------------------------------------------------------------------
+Tue Dec 11 13:06:12 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#284
+- add all available skelcd-control packages to inst-sys (fate#325482)
+- 14.401
+
+--------------------------------------------------------------------
+Tue Dec 11 12:44:55 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#283
+- support adding packages matching a regexp (fate#325482)
+- minor correction
+- 14.400
+
+--------------------------------------------------------------------
+Mon Dec 10 12:12:45 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#282
+- Do not set Y2MAXLOGSIZE and Y2MAXLOGNUM in YaST debug mode
+ (bsc#1118643)
+- 14.399
+
+--------------------------------------------------------------------
+Wed Dec 5 10:58:24 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#281
+- no longer block hicolor-icon-theme (bsc#1118410)
+- 14.398
+
+--------------------------------------------------------------------
+Tue Dec 4 10:16:31 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#280
+- s390x: adjust rexx sample script (bsc#1108089, bsc#1108090)
+- 14.397
+
+--------------------------------------------------------------------
+Mon Dec 3 15:07:16 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#279
+- YaST theme cleanup (related to boo#1109310)
+- 14.396
+
+--------------------------------------------------------------------
+Mon Dec 3 12:49:03 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#277
+- Add udftools package (fate#326877)
+- 14.395
+
+--------------------------------------------------------------------
+Mon Dec 3 12:00:33 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#278
+- re-enable ssh root login to installation system (bsc#1118114)
+- 14.394
+
Old:
----
installation-images-14.393.tar.xz
New:
----
installation-images-14.403.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.YEWMYs/_old 2018-12-31 09:44:12.342323910 +0100
+++ /var/tmp/diff_new_pack.YEWMYs/_new 2018-12-31 09:44:12.346323907 +0100
@@ -119,6 +119,7 @@
%define branding_grub2 openSUSE
%define branding_gfxboot openSUSE
BuildRequires: openSUSE-release
+BuildRequires: adobe-sourcesanspro-fonts
%endif
%if "%theme" == "Kubic"
@@ -130,6 +131,7 @@
%define branding_gfxboot openSUSE
%define config_bootmenu_no_upgrade 1
BuildRequires: openSUSE-Tumbleweed-Kubic-release
+BuildRequires: adobe-sourcesanspro-fonts
%endif
%if "%theme" == "SLED"
@@ -149,6 +151,13 @@
%define branding_plymouth SLE
%define branding_grub2 SLE
%define branding_gfxboot SLE
+BuildRequires: skelcd-fallbackrepo-SLES
+BuildRequires: skelcd-fallbackrepo-SLED
+%ifarch %ix86
+BuildRequires: skelcd-fallbackrepo-SLES_SAP
+BuildRequires: skelcd-fallbackrepo-SLE_HPC
+BuildRequires: skelcd-fallbackrepo-SLE_RT
+%endif
BuildRequires: unified-installer-release
%endif
@@ -170,6 +179,7 @@
%define branding_grub2 SLE
%define branding_gfxboot SLE
%define config_bootmenu_no_upgrade 1
+BuildRequires: skelcd-fallbackrepo-CAASP
BuildRequires: caasp-release
%endif
@@ -390,6 +400,7 @@
BuildRequires: tcpd-devel
BuildRequires: termcap
BuildRequires: terminfo
+BuildRequires: udftools
BuildRequires: un-fonts
BuildRequires: usbutils
BuildRequires: util-linux
@@ -541,7 +552,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.393
+Version: 14.403
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.393.tar.xz -> installation-images-14.403.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/VERSION
new/installation-images-14.403/VERSION
--- old/installation-images-14.393/VERSION 2018-11-20 13:21:51.000000000
+0100
+++ new/installation-images-14.403/VERSION 2018-12-17 10:16:26.000000000
+0100
@@ -1 +1 @@
-14.393
+14.403
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/changelog
new/installation-images-14.403/changelog
--- old/installation-images-14.393/changelog 2018-11-20 13:21:51.000000000
+0100
+++ new/installation-images-14.403/changelog 2018-12-17 10:16:26.000000000
+0100
@@ -1,3 +1,43 @@
+2018-12-14: 14.403
+ - add skelcd-fallbackrepo packages to instsys
+ - allow adding package files to inst-sys (fate #325482)
+
+2018-12-12: 14.402
+ - fix style issue in check_fonts
+ - add not always all skelcd-control packages
+ - add missing Source Sans Pro fonts (bsc #1113164)
+ - check font config (bsc #1113164)
+ - add check_fonts script
+
+2018-12-11: 14.401
+ - add all available skelcd-control packages to inst-sys (fate #325482)
+
+2018-12-11: 14.400
+ - minor correction
+ - support adding packages matching a regexp (fate #325482)
+
+2018-12-10: 14.399
+ - Do not set Y2MAXLOGSIZE and Y2MAXLOGNUM in YaST debug mode (bsc
#1118643)
+
+2018-12-05: 14.398
+ - no longer block hicolor-icon-theme (bsc #1118410)
+
+2018-12-04: 14.397
+ - s390x: adjust rexx sample script (bsc #1108089, bsc #1108090)
+
+2018-12-03: 14.396
+ - YaST theme cleanup (related to boo#1109310)
+ - Do not create the /usr/share/YaST2/theme/current symlink,
+ it's not needed anymore, the path exists and is a directory.
+ - Removed the related settings from the theme config and
+ the documentation.
+
+2018-12-03: 14.395
+ - Add udftools package (fate #326877)
+
+2018-12-03: 14.394
+ - re-enable ssh root login to installation system (bsc #1118114)
+
2018-11-19: 14.393
- rescue: change service name of nfsserver to nfs-server
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/data/base/base.file_list
new/installation-images-14.403/data/base/base.file_list
--- old/installation-images-14.393/data/base/base.file_list 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/data/base/base.file_list 2018-12-17
10:16:26.000000000 +0100
@@ -148,6 +148,7 @@
x unused_mos bin/unused_mos
x mlist3 bin/mlist3
x default_repo bin/default_repo
+x check_fonts bin/check_fonts
# create locale
x create_locale /create_locale
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/data/base/check_fonts
new/installation-images-14.403/data/base/check_fonts
--- old/installation-images-14.393/data/base/check_fonts 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.403/data/base/check_fonts 2018-12-17
10:16:26.000000000 +0100
@@ -0,0 +1,44 @@
+#! /usr/bin/perl
+
+# usage: check_fonts DIR
+#
+# Scan DIR for *.css and *.qss files (recursively), extract font families
+# and check if they are available.
+#
+# Exit code is 0 if everything is fine, else 1.
+
+use strict;
+use File::Find;
+
+# We need '.' as the script runs in a somewhat peculiar setup where fc-match
+# will not be available at the usual place.
+$ENV{PATH} = "/usr/bin:/bin/:/usr/sbin:/sbin:.";
+
+my $dir = shift || ".";
+my $error = 0;
+my $fonts;
+
+File::Find::find({
+ wanted => sub {
+ if(/\.[cq]ss$/) {
+ if(open my $f, $_) {
+ map { $fonts->{$2 || $3} = 1 if
/\bfont-family:\s*("([^"]+)"|([^\s,;]+))/ } <$f>;
+ close $f;
+ }
+ }
+ },
+ no_chdir => 1
+}, $dir);
+
+for my $font (sort keys %$fonts) {
+ my $match = `fc-match -f '%{family},%{fullname}' '$font'`;
+ exit 1 if $?;
+ my %matches;
+ $matches{$_} = 1 for split /,/, $match;
+ if(!$matches{$font}) {
+ $error = 1;
+ print "Error: font \"$font\" not found; closest match(es): \"", join('",
"', sort keys %matches), "\"\n";
+ }
+}
+
+exit $error;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.393/data/initrd/s390/sles.exec
new/installation-images-14.403/data/initrd/s390/sles.exec
--- old/installation-images-14.393/data/initrd/s390/sles.exec 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.403/data/initrd/s390/sles.exec 2018-12-17
10:16:26.000000000 +0100
@@ -0,0 +1,11 @@
+/* REXX LOAD EXEC FOR SUSE LINUX S/390 VM GUESTS */
+/* LOADS SUSE LINUX S/390 FILES INTO READER */
+SAY ''
+SAY 'LOADING SLES FILES INTO READER...'
+'CP CLOSE RDR'
+'PURGE RDR ALL'
+'SPOOL PUNCH * RDR'
+'PUNCH SLES LINUX A (NOH'
+'PUNCH SLES PARMFILE A (NOH'
+'PUNCH SLES INITRD A (NOH'
+'IPL 00C'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.393/data/initrd/s390/sles12.exec
new/installation-images-14.403/data/initrd/s390/sles12.exec
--- old/installation-images-14.393/data/initrd/s390/sles12.exec 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/data/initrd/s390/sles12.exec 1970-01-01
01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-/* REXX LOAD EXEC FOR SUSE LINUX S/390 VM GUESTS */
-/* LOADS SUSE LINUX S/390 FILES INTO READER */
-SAY ''
-SAY 'LOADING SLES12 FILES INTO READER...'
-'CP CLOSE RDR'
-'PURGE RDR ALL'
-'SPOOL PUNCH * RDR'
-'PUNCH SLES12 LINUX A (NOH'
-'PUNCH SLES12 PARMFILE A (NOH'
-'PUNCH SLES12 INITRD A (NOH'
-'IPL 00C'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.393/data/rescue/rescue.file_list
new/installation-images-14.403/data/rescue/rescue.file_list
--- old/installation-images-14.393/data/rescue/rescue.file_list 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/data/rescue/rescue.file_list 2018-12-17
10:16:26.000000000 +0100
@@ -328,6 +328,8 @@
d /etc/sysconfig
t /etc/sysconfig/ssh
E prein
+ # enable root login bsc#1118114
+ R s/^\s*#\s*(PermitRootLogin)\b.*/$1 yes/ /etc/ssh/sshd_config
?ia32el:
/etc/init.d/ia32el
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/data/root/etc/inst_setup
new/installation-images-14.403/data/root/etc/inst_setup
--- old/installation-images-14.393/data/root/etc/inst_setup 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/data/root/etc/inst_setup 2018-12-17
10:16:26.000000000 +0100
@@ -151,8 +151,6 @@
# for yast debugging.
if grep -iwq y2debug < /proc/cmdline ; then
export Y2DEBUG=1
- export Y2MAXLOGSIZE=50000
- export Y2MAXLOGNUM=5
fi
export XCURSOR_THEME=DMZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/data/root/root.file_list
new/installation-images-14.403/data/root/root.file_list
--- old/installation-images-14.393/data/root/root.file_list 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/data/root/root.file_list 2018-12-17
10:16:26.000000000 +0100
@@ -98,7 +98,6 @@
kmod: ignore
kmod-compat: ignore
gio-branding-upstream: ignore
-hicolor-icon-theme: ignore
yast2-trans-allpacks: ignore
udev: ignore
unzip: ignore
@@ -180,6 +179,7 @@
systemd-presets-branding-<systemd_theme>:
systemd-sysvinit:
systemd:
+udftools:
usbutils:
util-linux:
wget:
@@ -194,6 +194,8 @@
python2-websockify: ignore
python3-setuptools: ignore
+add_all skelcd-fallbackrepo-.*:
+
python3-websockify:
/
# avoid update-alternatives
@@ -537,6 +539,9 @@
fbiterm:
/usr/bin/fbiterm
+?adobe-sourcesanspro-fonts:
+ /usr/share/fonts/truetype/SourceSansPro-{Regular,Light,Semibold}.otf
+
dejavu-fonts:
/usr/share/fonts/truetype/DejaVuSans*.ttf
r /usr/share/fonts/truetype/DejaVuSansCondensed*
@@ -635,6 +640,8 @@
/
t /etc/sysconfig/ssh
E prein
+ # enable root login bsc#1118114
+ R s/^\s*#\s*(PermitRootLogin)\b.*/$1 yes/ /etc/ssh/sshd_config
fonts-config:
/
@@ -660,11 +667,6 @@
:
-# set yast theme
-if theme ne 'openSUSE'
- s <yast_theme> usr/share/YaST2/theme/current
-endif
-
x etc/suse-post-user.conf etc/fonts/
e mkfontscale usr/share/fonts/misc
@@ -745,6 +747,11 @@
# zypp config is in initrd
r /etc/zypp
+# check font config
+e cp /bin/check_fonts /usr/bin/fc-match .
+E /check_fonts usr/share/YaST2/theme
+e rm check_fonts fc-match
+
# allowed dangling symlinks
D ../../sbin/update-ca-certificates /usr/lib64/p11-kit/p11-kit-extract-trust
D ../../sbin/update-ca-certificates /usr/lib/p11-kit/p11-kit-extract-trust
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/doc/branding.md
new/installation-images-14.403/doc/branding.md
--- old/installation-images-14.393/doc/branding.md 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/doc/branding.md 2018-12-17
10:16:26.000000000 +0100
@@ -14,7 +14,6 @@
grub2 = SLE # grub2-branding-SLE.rpm
plymouth = SLE # plymouth-branding-SLE.rpm
systemd = SLE # systemd-presets-branding-SLE.rpm
-yast = SLE # yast2-theme-SLE.rpm
```
Then add an appropriate theme section to `installation-images.spec`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/doc/files.md
new/installation-images-14.403/doc/files.md
--- old/installation-images-14.393/doc/files.md 2018-11-20 13:21:51.000000000
+0100
+++ new/installation-images-14.403/doc/files.md 2018-12-17 10:16:26.000000000
+0100
@@ -170,6 +170,24 @@
systemd: ignore
```
+### Including packages matching a regexp
+
+To include a group of packages matching a regexp, use `add_all`:
+
+```
+add_all PACKAGE_REGEXP:
+```
+
+Examples:
+
+```
+add_all skelcd-control-.*:
+```
+
+Note that you cannot associate any actions to such an entry directly. Use
+templates (see below) if you don't want to install the packages as a whole.
+
+
### Actions
Several actions can be specified using the following syntax:
@@ -266,6 +284,12 @@
p <patch>
```
+- Copy package file (the rpm itself) to directory.
+
+```
+P <dir>
+```
+
- chown/chmod files
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/etc/config
new/installation-images-14.403/etc/config
--- old/installation-images-14.393/etc/config 2018-11-20 13:21:51.000000000
+0100
+++ new/installation-images-14.403/etc/config 2018-12-17 10:16:26.000000000
+0100
@@ -81,19 +81,16 @@
release = openSUSE
skelcd = openSUSE
skelcd_ctrl = openSUSE
-yast = openSUSE
gfxboot = openSUSE
grub2 = openSUSE
plymouth = openSUSE
systemd = openSUSE
-
[Theme SLES]
image = 600
release = unified-installer
skelcd = sles
skelcd_ctrl = leanos
-yast = SLE
gfxboot = SLE
grub2 = SLE
plymouth = SLE
@@ -104,7 +101,6 @@
release = unified-installer
skelcd = sles
skelcd_ctrl = leanos
-yast = SLE
gfxboot = SLE
grub2 = SLE
plymouth = SLE
@@ -115,19 +111,16 @@
release = unified-installer
skelcd = sled
skelcd_ctrl = leanos
-yast = SLE
gfxboot = SLE
grub2 = SLE
plymouth = SLE
systemd = SLE
-
[Theme CAASP]
image = 600
release = caasp
skelcd = caasp
skelcd_ctrl = CAASP
-yast = SLE
gfxboot = SLE
grub2 = SLE
plymouth = SLE
@@ -138,7 +131,6 @@
release = openSUSE-Tumbleweed-Kubic
skelcd = openSUSE
skelcd_ctrl = Kubic
-yast = openSUSE
gfxboot = openSUSE
grub2 = openSUSE
plymouth = openSUSE
@@ -149,9 +141,7 @@
release = unified-installer
skelcd = sles
skelcd_ctrl = leanos
-yast = SLE
gfxboot = SLE
grub2 = SLE
plymouth = SLE
systemd = SLE
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/install.s390x
new/installation-images-14.403/install.s390x
--- old/installation-images-14.393/install.s390x 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/install.s390x 2018-12-17
10:16:26.000000000 +0100
@@ -35,7 +35,7 @@
install -m 644 data/initrd/s390/parmfile.hmc
$DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile.hmc
install -m 644 data/initrd/s390/parmfile.cd
$DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile.cd
- install -m 644 data/initrd/s390/sles12.exec
$DESTDIR/branding/$theme/CD1/boot/$ARCH/sles12.exec
+ install -m 644 data/initrd/s390/sles.exec
$DESTDIR/branding/$theme/CD1/boot/$ARCH/sles.exec
install -m 644 tmp/base/usr/share/doc/packages/s390-tools/zpxe.rexx
$DESTDIR/branding/$theme/CD1/boot/$ARCH/zpxe.rexx
# create cd.ikr and remove no longer needed parmfile.cd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/lib/AddFiles.pm
new/installation-images-14.403/lib/AddFiles.pm
--- old/installation-images-14.393/lib/AddFiles.pm 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/lib/AddFiles.pm 2018-12-17
10:16:26.000000000 +0100
@@ -330,6 +330,23 @@
$packs->[-1]{rpmdir} = $rpm_dir;
}
+ elsif(/^add_all\s+(\S+):$/) {
+ my $pattern = $1;
+ my $rpms = RealRPMs $pattern;
+ print "add_all: $pattern = (", join(", ", @$rpms), ")\n";
+ for my $p (@$rpms) {
+ my $rpm_dir = ReadRPM $p;
+
+ next unless $rpm_dir;
+
+ my $entry = {};
+ $entry->{name} = RealRPM($p)->{name};
+ $entry->{version} = ReadFile "$rpm_dir/version";
+ $entry->{rpmdir} = $rpm_dir;
+
+ push @$packs, $entry;
+ }
+ }
else {
push @{$packs->[-1]{tasks}}, { src => $src_line, line => $_ };
}
@@ -539,9 +556,12 @@
}
}
+ my $rpm_file;
+
if($pack->{name} ne '') {
+ $rpm_file = "$ConfigData{tmp_cache_dir}/.rpms/$pack->{name}.rpm";
+
if(exists $pack->{tags}{direct}) {
- my $rpm_file = "$ConfigData{tmp_cache_dir}/.rpms/$pack->{name}.rpm";
print "installing package $pack->{name}
[$pack->{version}]$all_scripts$by\n";
die "$rpm_file: rpm file missing" unless -r $rpm_file;
my $abs_dir = File::Spec->rel2abs($dir);
@@ -670,6 +690,15 @@
SUSystem "patch -d $dir -p0 --no-backup-if-mismatch <$ext_dir/$1" and
warn "$Script: failed to apply patch $1";
}
+ elsif(/^P\s+(\S+)$/) {
+ if($rpm_file && -r $rpm_file) {
+ SUSystem "cp -L $rpm_file $dir/$1 2>/dev/null" and
+ warn "$Script: failed to copy rpm to $1";
+ }
+ else {
+ warn "$Script: no package file";
+ }
+ }
elsif(/^A\s+(\S+)\s+(\S+)$/) {
SUSystem "sh -c 'cat $ext_dir/$1 >>$dir/$2'" and
warn "$Script: failed to append $1 to $2";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.393/lib/ReadConfig.pm
new/installation-images-14.403/lib/ReadConfig.pm
--- old/installation-images-14.393/lib/ReadConfig.pm 2018-11-20
13:21:51.000000000 +0100
+++ new/installation-images-14.403/lib/ReadConfig.pm 2018-12-17
10:16:26.000000000 +0100
@@ -165,7 +165,7 @@
@ISA = qw ( Exporter );
@EXPORT = qw (
$Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath
- $TmpBase %ConfigData ReadFile RealRPM ReadRPM $SUBinary SUSystem Print2File
$MToolsCfg $AutoBuild
+ $TmpBase %ConfigData ReadFile RealRPM RealRPMs ReadRPM $SUBinary SUSystem
Print2File $MToolsCfg $AutoBuild
ResolveDeps
);
@@ -322,6 +322,31 @@
}
+# Return list of RPMs matching (regexp) pattern. The list is empty if no
+# match was found.
+#
+sub RealRPMs
+{
+ my $pattern = shift;
+ my @packages;
+
+ if($ConfigData{obs}) {
+ # running outside obs
+ @packages = @{$ConfigData{packages}};
+ # entries in ConfigData are "PACKAGE PROJECT", remove the PROJECT part
+ map { s/\s.*$// } @packages;
+ }
+ else {
+ # running in an obs build
+ @packages = <$ConfigData{suse_base}/*.rpm>;
+ # remove superfluous file name parts
+ map { s#^.*/|\.rpm$##g } @packages;
+ }
+
+ return [ grep { /^$pattern$/ } @packages ];
+}
+
+
#
# 'rpm' is hash as returned from RealRPM().
#
