Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-09-28 12:32:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Thu Sep 28 12:32:54 2017 rev:21 rq:528952 version:14.335
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-09-13 22:18:05.706998082 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-09-28 12:32:56.872118875 +0200
@@ -0,0 +1,36 @@
+--------------------------------------------------------------------
+Wed Sep 27 12:00:21 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#205
+- control.xml is now optional
+- 14.335
+
+--------------------------------------------------------------------
+Tue Sep 26 10:05:47 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#204
+- adjust xorg input & video driver list
+- 14.334
+
+--------------------------------------------------------------------
+Thu Sep 21 12:06:22 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#203
+- system-user-root needs to be treated specially
+- python-argparse is gone
+- 14.333
+
+--------------------------------------------------------------------
+Wed Sep 20 10:26:43 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#202
+- allow adding packages by running rpm directly
+- 14.332
+
+--------------------------------------------------------------------
+Mon Sep 18 10:16:09 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#201
+- include all mouse drivers (bsc#1055628)
+- 14.331
+
Old:
----
installation-images-14.330.tar.xz
New:
----
installation-images-14.335.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.DyRqGG/_old 2017-09-28 12:32:57.612014839 +0200
+++ /var/tmp/diff_new_pack.DyRqGG/_new 2017-09-28 12:32:57.616014276 +0200
@@ -451,11 +451,11 @@
BuildRequires: iprutils
%endif
BuildRequires: kbd
-BuildRequires: xf86-input-evdev
%ifarch %ix86 x86_64
BuildRequires: xf86-video-intel
BuildRequires: xf86-video-vesa
-BuildRequires: xf86-video-vmware
+BuildRequires: xf86-video-qxl
+BuildRequires: xf86-video-amdgpu
%endif
BuildRequires: xf86-input-wacom
BuildRequires: xf86-video-fbdev
@@ -537,7 +537,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.330
+Version: 14.335
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.330.tar.xz -> installation-images-14.335.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/VERSION
new/installation-images-14.335/VERSION
--- old/installation-images-14.330/VERSION 2017-09-11 14:07:30.000000000
+0200
+++ new/installation-images-14.335/VERSION 2017-09-27 14:00:21.000000000
+0200
@@ -1 +1 @@
-14.330
+14.335
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/changelog
new/installation-images-14.335/changelog
--- old/installation-images-14.330/changelog 2017-09-11 14:07:30.000000000
+0200
+++ new/installation-images-14.335/changelog 2017-09-27 14:00:21.000000000
+0200
@@ -1,3 +1,19 @@
+2017-09-27: 14.335
+ - control.xml is now optional
+
+2017-09-26: 14.334
+ - adjust xorg input & video driver list
+
+2017-09-21: 14.333
+ - python-argparse is gone
+ - system-user-root needs to be treated specially
+
+2017-09-19: 14.332
+ - allow adding packages by running rpm directly
+
+2017-09-18: 14.331
+ - include all mouse drivers (bsc #1055628)
+
2017-09-11: 14.330
- enhance documentation of 'exists' function in file lists
- adjust to work with the graphviz package split
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/data/base/base.file_list
new/installation-images-14.335/data/base/base.file_list
--- old/installation-images-14.330/data/base/base.file_list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/base/base.file_list 2017-09-27
14:00:21.000000000 +0200
@@ -46,6 +46,8 @@
# not needed
r /usr/bin/dbus-launch*
+TEMPLATE system-user-root: direct
+
TEMPLATE:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/data/boot/tftp.file_list
new/installation-images-14.335/data/boot/tftp.file_list
--- old/installation-images-14.330/data/boot/tftp.file_list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/boot/tftp.file_list 2017-09-27
14:00:21.000000000 +0200
@@ -51,9 +51,9 @@
# new skelcd package format: all files are below /usr/lib/skelcd
skelcd-control-<skelcd_ctrl_theme>:
- if exists(skelcd-control-<skelcd_ctrl_theme>, /usr/lib/skelcd)
+ if exists(skelcd-control-<skelcd_ctrl_theme>, /usr/lib/skelcd/control.xml)
m usr/lib/skelcd/CD1/control.xml <tftp_dir>/<instsys_dir>
- else
+ elsif exists(skelcd-control-<skelcd_ctrl_theme>, /CD1/control.xml)
m CD1/control.xml <tftp_dir>/<instsys_dir>
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.330/data/initrd/initrd.file_list
new/installation-images-14.335/data/initrd/initrd.file_list
--- old/installation-images-14.330/data/initrd/initrd.file_list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/initrd/initrd.file_list 2017-09-27
14:00:21.000000000 +0200
@@ -28,6 +28,8 @@
#
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+TEMPLATE system-user-root: direct
+
TEMPLATE:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.330/data/rescue/rescue.file_list
new/installation-images-14.335/data/rescue/rescue.file_list
--- old/installation-images-14.330/data/rescue/rescue.file_list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/rescue/rescue.file_list 2017-09-27
14:00:21.000000000 +0200
@@ -30,6 +30,8 @@
/
E postin
+TEMPLATE system-user-root: direct
+
TEMPLATE:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.330/data/root/libstoragemgmt.file_list
new/installation-images-14.335/data/root/libstoragemgmt.file_list
--- old/installation-images-14.330/data/root/libstoragemgmt.file_list
2017-09-11 14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/root/libstoragemgmt.file_list
2017-09-27 14:00:21.000000000 +0200
@@ -6,7 +6,7 @@
libstoragemgmt1:
libstoragemgmt-netapp-plugin:
libstoragemgmt-smis-plugin:
-python-argparse:
+?python-argparse:
AUTODEPS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/data/root/root.file_list
new/installation-images-14.335/data/root/root.file_list
--- old/installation-images-14.330/data/root/root.file_list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/root/root.file_list 2017-09-27
14:00:21.000000000 +0200
@@ -442,12 +442,13 @@
e [ -f usr/<lib>/xorg/modules/extensions/xorg/xorg-libglx.so ] && ln -snf
xorg/xorg-libglx.so usr/<lib>/xorg/modules/extensions/libglx.so ; true
xrandr:
- xf86-input-evdev:
+ ?xf86-input-evdev:
?xf86-input-libinput:
- ?xf86-input-vmmouse:
xf86-input-wacom:
xf86-video-fbdev:
?xf86-video-vesa:
+ ?xf86-video-qxl:
+ ?xf86-video-amdgpu:
?xf86-video-intel: nodeps
/usr/<lib>/xorg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.330/data/root/zenroot.file_list
new/installation-images-14.335/data/root/zenroot.file_list
--- old/installation-images-14.330/data/root/zenroot.file_list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/data/root/zenroot.file_list 2017-09-27
14:00:21.000000000 +0200
@@ -22,6 +22,7 @@
#
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+TEMPLATE system-user-root: direct
TEMPLATE:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/doc/files.md
new/installation-images-14.335/doc/files.md
--- old/installation-images-14.330/doc/files.md 2017-09-11 14:07:30.000000000
+0200
+++ new/installation-images-14.335/doc/files.md 2017-09-27 14:00:21.000000000
+0200
@@ -135,7 +135,7 @@
This syntax can be used to include files from a given package.
```
-PACKAGE_NAME: [ignore|nodeps|requires]
+PACKAGE_NAME: [direct|ignore|nodeps|requires]
```
It unpacks the selected package into a temporary directory.
@@ -146,6 +146,7 @@
- requires: create a file `PACKAGE_NAME.requires` in the image root
- nodeps: ignore package dependencies when solving
- ignore: ignore package ('BuildIgnore')
+ - direct: run rpm command to install the package
`PACKAGE_NAME` may be empty which can be used to tell the parser that
subsequent lines do not belong to any package.
@@ -156,6 +157,11 @@
If `PACKAGE_NAME` starts with a `'?'`, the package is optional.
This is a handy shortcut if you'd otherwise use an `if` with `exists()`.
+If you use 'direct', basically `rpm -i PACKAGE_NAME` is run to install the
+package. This means that all scripts are run and all files are unpacked. If
+you don't need all files from the package you can still use 'r' to remove
+the parts you don't need later.
+
Examples:
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/etc/module.config
new/installation-images-14.335/etc/module.config
--- old/installation-images-14.330/etc/module.config 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/etc/module.config 2017-09-27
14:00:21.000000000 +0200
@@ -43,7 +43,6 @@
ali-agp,-,-
amd-k7-agp,-,-
amd64-agp,-,-
-appletouch,"Apple PowerBook Touchpad",-
ati-agp,-,-
binfmt_misc
blkcipher,-,-
@@ -182,6 +181,7 @@
kernel/drivers/.*/crypto/.*
kernel/drivers/firmware/.*
kernel/drivers/i2c/.*
+kernel/drivers/input/mouse/.*
kernel/drivers/leds/.*
kernel/drivers/usb/core/ledtrig-usbport.ko
kernel/drivers/md/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/etc/module.list
new/installation-images-14.335/etc/module.list
--- old/installation-images-14.330/etc/module.list 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/etc/module.list 2017-09-27
14:00:21.000000000 +0200
@@ -16,8 +16,7 @@
# kernel/drivers/input/
-kernel/drivers/input/joystick
-kernel/drivers/input/gameport
-kernel/drivers/input/mouse/psmouse.ko
-kernel/drivers/input/mouse/appletouch.ko
+kernel/drivers/input/mouse/
kernel/drivers/input/serio/hyperv-keyboard.ko
kernel/drivers/input/input-polldev.ko
kernel/drivers/iseries/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.330/lib/AddFiles.pm
new/installation-images-14.335/lib/AddFiles.pm
--- old/installation-images-14.330/lib/AddFiles.pm 2017-09-11
14:07:30.000000000 +0200
+++ new/installation-images-14.335/lib/AddFiles.pm 2017-09-27
14:00:21.000000000 +0200
@@ -61,6 +61,7 @@
$Data::Dumper::Indent = 1;
use ReadConfig;
+use File::Spec;
sub add_pack;
sub _add_pack;
@@ -265,7 +266,7 @@
if(defined $s) {
my @tags = split /,/, $s;
- @tags = grep { /^(requires|nodeps|ignore)$/ } @tags;
+ @tags = grep { /^(requires|nodeps|ignore|direct)$/ } @tags;
@{$packs->[-1]{tags}}{@tags} = ();
}
@@ -407,6 +408,19 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Add an RPM as specified in a *.file_list file.
+#
+# add_pack(dir, ext_dir, package)
+#
+# dir: target directory
+# ext_dir: directory extra data (data not in the rpm, cf. 'x' command in
+# *.file_list) is taken from
+# package: package to install; this is the hash reference as returned by
+# RealRPM(), not just the rpm name
+#
+# Note: the difference to _add_pack() is that this function takes package
+# dependencies into account (and calls _add_pack() as needed).
+#
sub add_pack
{
local $_;
@@ -482,6 +496,18 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Add a single RPM as specified in a *.file_list file.
+#
+# _add_pack(dir, ext_dir, package)
+#
+# dir: target directory
+# ext_dir: directory extra data (data not in the rpm, cf. 'x' command in
+# *.file_list) is taken from
+# package: package to install; this is the hash reference as returned by
+# RealRPM(), not just the rpm name
+#
+# Note: do not call this function directly but use add_pack() instead.
+#
sub _add_pack
{
local $_;
@@ -491,7 +517,7 @@
return if exists $pack->{tags}{ignore};
- return if !defined $pack->{tasks};
+ return unless defined $pack->{tasks} || exists $pack->{tags}{direct};
my $tfile = "${TmpBase}.afile";
@@ -514,7 +540,19 @@
}
if($pack->{name} ne '') {
- print "adding package $pack->{name} [$pack->{version}]$all_scripts$by$t\n";
+ 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);
+ my $err = SUSystem "rpm -i --quiet --nosignature --nodeps --root
'$abs_dir' --dbpath /instsys.xxx --rcfile /dev/null '$rpm_file'";
+ SUSystem "rm -rf '$abs_dir/instsys.xxx'";
+ warn "$Script: failed to install $pack->{name}" if $err;
+ }
+ else {
+ print "adding package $pack->{name}
[$pack->{version}]$all_scripts$by$t\n";
+ }
+
$used_packs->{$pack->{name}} = $pack;
}
@@ -523,6 +561,9 @@
$src_line = $t->{src};
if(!/^[a-zA-Z]\s+/) {
+ # if rpm has been used to install the package all files are already there
+ next if exists $pack->{tags}{direct};
+
if($pack->{rpmdir} eq "") {
warn "$Script: no package dir";
next;
