Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2014-01-29 07:14:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2014-01-15 19:35:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2014-01-29 07:14:52.000000000 +0100
@@ -1,0 +2,40 @@
+Tue Jan 28 10:20:32 CET 2014 - [email protected]
+
+- added dmapi.ko
+
+-------------------------------------------------------------------
+Mon Jan 27 12:07:40 CET 2014 - [email protected]
+
+- fix dracut vs. mkinitrd build problems
+
+-------------------------------------------------------------------
+Fri Jan 24 12:01:46 CET 2014 - [email protected]
+
+- start dbus and wicked in initrd
+
+-------------------------------------------------------------------
+Thu Jan 23 10:18:14 CET 2014 - [email protected]
+
+- ppc64: yaboot binary only for chrp
+
+-------------------------------------------------------------------
+Wed Jan 22 11:40:40 CET 2014 - [email protected]
+
+- another try to resolve dracut vs. mkinitrd
+
+-------------------------------------------------------------------
+Wed Jan 22 10:47:22 CET 2014 - [email protected]
+
+- ignore dracut in initrd
+- use xz for compression
+
+-------------------------------------------------------------------
+Tue Jan 21 10:49:42 CET 2014 - [email protected]
+
+- add dbus to initrd
+- s390: added ls, tr, and chzdev to initrd (needed by qeth_configure)
+- fix module info
+- don't strip debuginfo
+- moved last commit from myudevstart to early_setup script
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.26.tar.bz2
New:
----
installation-images-14.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.iQKIET/_old 2014-01-29 07:14:52.000000000 +0100
+++ /var/tmp/diff_new_pack.iQKIET/_new 2014-01-29 07:14:52.000000000 +0100
@@ -211,7 +211,10 @@
BuildRequires: terminfo
BuildRequires: usbutils
BuildRequires: util-linux
+%ifnarch ppc64le
+BuildRequires: ltrace
BuildRequires: valgrind
+%endif
BuildRequires: vim
BuildRequires: wget
BuildRequires: wicked
@@ -274,7 +277,6 @@
##BuildIgnore: kernel-xen
%endif
%endif
-BuildRequires: ltrace
%ifnarch s390 s390x
BuildRequires: iprutils
BuildRequires: kbd
@@ -305,7 +307,6 @@
%endif
%ifarch ppc ppc64 ppc64le
BuildRequires: lilo
-BuildRequires: pdisk
BuildRequires: powerpc-utils
%endif
%ifarch %ix86 x86_64
@@ -389,9 +390,9 @@
Summary: Installation Image Files
License: GPL-2.0+
Group: Metapackages
-Version: 14.26
+Version: 14.32
Release: 0
-Source: installation-images-14.26.tar.bz2
+Source: installation-images-14.32.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.26.tar.bz2 -> installation-images-14.32.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/VERSION
new/installation-images-14.32/VERSION
--- old/installation-images-14.26/VERSION 2014-01-15 10:56:07.000000000
+0100
+++ new/installation-images-14.32/VERSION 2014-01-28 10:20:22.000000000
+0100
@@ -1 +1 @@
-14.26
+14.32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/bin/mk_image
new/installation-images-14.32/bin/mk_image
--- old/installation-images-14.26/bin/mk_image 2013-11-18 11:49:20.000000000
+0100
+++ new/installation-images-14.32/bin/mk_image 2014-01-21 13:06:47.000000000
+0100
@@ -56,7 +56,8 @@
$debug = exists($ENV{'debug'}) ? $ENV{'debug'} : "";
$imagetype = $ENV{fs};
$imagetype = "none" unless $imagetype;
-$use_gzip = 1 if $imagetype =~ s/\.gz$//;
+$use_compress = 'gzip' if $imagetype =~ s/\.gz$//;
+$use_compress = 'xz' if $imagetype =~ s/\.xz$//;
# modes: keep, add, "" (default)
@mode{split ",", $ENV{mode}} = ( 1 .. 10 );
@@ -159,8 +160,8 @@
$i = -s $image;
print "$Script: created \"$image\" ($i bytes)\n";
- if($use_gzip) {
- $i = CompressImage $image;
+ if($use_compress) {
+ $i = CompressImage $image, $use_compress;
print "$Script: compressed \"$image\" ($i bytes)\n";
}
}
@@ -177,6 +178,7 @@
next if m#^$dir/usr/lib/cracklib_dict#;
next if m#^$dir/usr/share/applications/defaults.list#;
+ next if m#^$dir/usr/lib/debug/\.build-id/#;
$x = readlink;
if($x =~ /^\//) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.26/bin/mk_ppc_installation-images_bootbinaries.sh
new/installation-images-14.32/bin/mk_ppc_installation-images_bootbinaries.sh
---
old/installation-images-14.26/bin/mk_ppc_installation-images_bootbinaries.sh
2013-11-18 11:49:20.000000000 +0100
+++
new/installation-images-14.32/bin/mk_ppc_installation-images_bootbinaries.sh
2014-01-23 10:12:39.000000000 +0100
@@ -35,7 +35,7 @@
mkdir -pv $CD1/ppc
# to trigger the HFS part, avoid 8.3 filenames and allow OF booting
mkdir -pv $CD1/suseboot
-cp -pfv /lib/lilo/pmac/yaboot $CD1/suseboot/yaboot
+cp -pfv /lib/lilo/chrp/yaboot $CD1/suseboot/yaboot
cp -pfv /lib/lilo/chrp/yaboot.chrp $CD1/suseboot/yaboot.ibm
if test "$do_32" = "true" ; then
# provide PS3 bootloader only on openSuSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/bin/strip_dir
new/installation-images-14.32/bin/strip_dir
--- old/installation-images-14.26/bin/strip_dir 2013-11-18 11:49:20.000000000
+0100
+++ new/installation-images-14.32/bin/strip_dir 2014-01-20 14:42:58.000000000
+0100
@@ -14,7 +14,8 @@
for $f (`find $dir -type f`) {
chomp $f;
next if $f =~ /modules/ && $f !~ /X11R6\/lib\/modules/; # skip modules
- next if $f =~ /\.uc$/; # some X.org modules
+ next if $f =~ /\.uc$/; # skip some
X.org modules
+ next if $f =~ m#usr/lib/debug/#; # skip debuginfo
$f0 = $f;
$f =~ s/'/'\\''/g;
$_ = `file '$f'`;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/changelog
new/installation-images-14.32/changelog
--- old/installation-images-14.26/changelog 2014-01-15 10:56:11.000000000
+0100
+++ new/installation-images-14.32/changelog 2014-01-28 10:20:26.000000000
+0100
@@ -1,4 +1,31 @@
-2014-01-15: HEAD
+2014-01-28: HEAD
+ - added dmapi.ko
+
+2014-01-27: 14.31
+ - fix dracut vs. mkinitrd build problems
+
+2014-01-24: 14.30
+ - start dbus and wicked in initrd
+
+2014-01-23: 14.29
+ - We're in transition to grub2, we build yaboot binary only for chrp.
+ - fix version number
+ - another try to resolve dracut vs. mkinitrd
+
+2014-01-22: 14.28
+ - ignore dracut in initrd
+ - use xz for compression
+
+2014-01-21: 14.27
+ - add dbus to initrd
+ - s390: added ls, tr, and chzdev to initrd (needed by qeth_configure)
+ - fix module info
+ - don't strip debuginfo
+ - moved last commit from myudevstart to early_setup script
+ - better not to enables SLES themes ATM
+ - enabled SLES themes
+
+2014-01-15: 14.26
- Merge branch 'master' of github.com:openSUSE/installation-images
- Conflicts:
data/root/root.file_list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.26/data/initrd/etc/myudevstart
new/installation-images-14.32/data/initrd/etc/myudevstart
--- old/installation-images-14.26/data/initrd/etc/myudevstart 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.32/data/initrd/etc/myudevstart 2014-01-16
11:21:01.000000000 +0100
@@ -28,7 +28,3 @@
# 10 min - just long enough
/usr/bin/udevadm settle --timeout=100
-echo "Mounting rpc_pipefs on /var/lib/nfs/rpc_pipefs"
-mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-echo "Starting /usr/sbin/rpc.idmapd"
-/usr/sbin/rpc.idmapd < /dev/null
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.26/data/initrd/initrd.file_list
new/installation-images-14.32/data/initrd/initrd.file_list
--- old/installation-images-14.26/data/initrd/initrd.file_list 2014-01-15
10:52:21.000000000 +0100
+++ new/installation-images-14.32/data/initrd/initrd.file_list 2014-01-27
12:01:44.000000000 +0100
@@ -1,7 +1,8 @@
-d bin dev etc mnt proc sys tmp run
+d bin dev etc mnt proc sys tmp
+d run/dbus
d var/run var/spool var/lock/libstorage var/tmp var/log/YaST2 var/adm/mount
d var/lib/YaST2 var/lib/dhcpcd var/lib/hardware/unique-keys var/lib/autoinstall
-d var/run/dbus var/run/hotplug var/cache/fontconfig
+d var/run/hotplug var/cache/fontconfig
d var/lib/sshd var/lib/empty var/run/ntp var/lib/rpcbind
d var/cache/sax/files var/cache/sax/sysp/rdbms var/cache/xfine var/cache/zypp
var/lib/sax
d etc/sysconfig
@@ -66,6 +67,7 @@
AUTODEPS:
+dbus-1-x11: ignore
diffutils: ignore
dirmngr: ignore
dummy-release: ignore
@@ -79,8 +81,6 @@
libcrack*: ignore
libmagic*: ignore
logrotate: ignore
-mkinitrd: ignore
-nfsidmap: ignore
openssl: ignore
permissions: ignore
pinentry: ignore
@@ -88,8 +88,9 @@
?suspend: ignore
sysconfig: ignore
systemd: ignore
-terminfo-base: ignore
update-alternatives: ignore
+?dracut: ignore
+?mkinitrd: ignore
samba-libs: nodeps
/usr/lib*/samba/libreplace.so
@@ -128,6 +129,12 @@
g /usr/share/linuxrc/linuxrc-16.psfu.gz
usr/share/kbd/consolefonts/linuxrc-16.psfu
g /usr/share/linuxrc/linuxrc2-16.psfu.gz
usr/share/kbd/consolefonts/linuxrc2-16.psfu
+terminfo-base:
+ /usr/share/terminfo
+
+terminfo:
+ /usr/share/terminfo/i/ibm3151
+
netcfg:
/etc/protocols
@@ -148,6 +155,7 @@
/sbin/ctc_configure
/sbin/qeth_configure
/sbin/dasdinfo
+ /sbin/chzdev
/etc/udev
kbd:
@@ -192,14 +200,22 @@
coreutils:
/usr/bin/cat
/usr/bin/chmod
+ /usr/bin/chown
/usr/bin/date
/usr/bin/false
+ /usr/bin/head
/usr/bin/ln
+ /usr/bin/ls
/usr/bin/mkdir
/usr/bin/mv
+ /usr/bin/rm
/usr/bin/rmdir
/usr/bin/sleep
+ /usr/bin/stty
+ /usr/bin/tail
/usr/bin/touch
+ /usr/bin/tr
+ /usr/bin/tty
/usr/bin/true
/usr/bin/uname
# linuxrc needs it in /bin
@@ -340,6 +356,14 @@
plymouth-branding-openSUSE: nodeps
endif
+procps:
+ /bin/ps
+
+# maybe we don't need everything...
+systemd:
+ /usr/lib*/libsystemd-journal.so.*
+ /usr/lib*/libsystemd-login.so.*
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
@@ -351,9 +375,11 @@
E prein
r boot
/etc/rc.status
+ /etc/inputrc
/usr/sbin/service
dbus-1:
+ /
E prein
openssh: nodeps
@@ -364,6 +390,10 @@
/
E groupadd -r tape
+# we just want the user & group entries
+polkit: nodeps
+ E prein
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
@@ -393,9 +423,6 @@
libprocps*:
/
- procps:
- /bin/ps
-
psmisc:
/bin/fuser
/usr/bin/killall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.26/data/initrd/scripts/early_setup
new/installation-images-14.32/data/initrd/scripts/early_setup
--- old/installation-images-14.26/data/initrd/scripts/early_setup
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.32/data/initrd/scripts/early_setup
2014-01-24 11:37:10.000000000 +0100
@@ -15,3 +15,24 @@
echo "warning: no build keys!"
fi
+# needed for nfs
+echo "Mounting rpc_pipefs on /var/lib/nfs/rpc_pipefs"
+mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+
+if [ -x /usr/sbin/rpc.idmapd ] ; then
+ echo "Starting rpc.idmapd"
+ /usr/sbin/rpc.idmapd < /dev/null
+fi
+
+if [ -x /bin/dbus-daemon ] ; then
+ echo "Starting dbus-daemon"
+ /bin/dbus-uuidgen --ensure
+ /bin/dbus-daemon --system
+fi
+
+if [ -x usr/sbin/wickedd ] ; then
+ echo "Starting wicked"
+ /usr/sbin/wickedd
+ for i in /usr/lib/wicked/bin/wickedd-* ; do $i ; done
+fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.26/data/rescue/rescue.file_list
new/installation-images-14.32/data/rescue/rescue.file_list
--- old/installation-images-14.26/data/rescue/rescue.file_list 2014-01-15
10:53:34.000000000 +0100
+++ new/installation-images-14.32/data/rescue/rescue.file_list 2014-01-27
12:04:05.000000000 +0100
@@ -73,7 +73,7 @@
dhcpcd:
diffutils:
dosfstools:
-# ?dracut:
+?dracut:
?mkinitrd:
dump:
e2fsprogs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/data/root/etc/inst_setup
new/installation-images-14.32/data/root/etc/inst_setup
--- old/installation-images-14.26/data/root/etc/inst_setup 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.32/data/root/etc/inst_setup 2014-01-24
11:22:38.000000000 +0100
@@ -102,8 +102,8 @@
ldconfig
-# start dbus
-if [ -x /bin/dbus-daemon ] ; then
+# don't start dbus - done by linuxrc
+if [ -x /bin/dbus-daemonXXX ] ; then
rm -f /var/run/dbus/pid
echo -n "starting dbus..."
if /bin/dbus-daemon --system ; then
@@ -264,7 +264,7 @@
rcnscd stop
# stop various daemons
-killall dbus-daemon >/dev/null 2>&1
+# killall dbus-daemon >/dev/null 2>&1
killall slpd >/dev/null 2>&1
killall Xvnc >/dev/null 2>&1
killall sshd >/dev/null 2>&1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/data/root/gdb.file_list
new/installation-images-14.32/data/root/gdb.file_list
--- old/installation-images-14.26/data/root/gdb.file_list 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.32/data/root/gdb.file_list 2014-01-20
14:55:49.000000000 +0100
@@ -1,5 +1,5 @@
gdb:
- /usr/bin/gdb
+ /
libpython*-*:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/data/root/root.file_list
new/installation-images-14.32/data/root/root.file_list
--- old/installation-images-14.26/data/root/root.file_list 2014-01-15
10:54:36.000000000 +0100
+++ new/installation-images-14.32/data/root/root.file_list 2014-01-27
12:04:14.000000000 +0100
@@ -48,7 +48,6 @@
luit: ignore
mdadm: ignore
mingetty: ignore
-mkinitrd: ignore
mtools: ignore
nfsidmap: ignore
pam-config: ignore
@@ -65,7 +64,6 @@
pkg-config: ignore
syslog-service: ignore
kmod: ignore
-dbus-1-x11: ignore
gio-branding-upstream: ignore
hicolor-icon-theme: ignore
yast2-nfs-common: ignore
@@ -73,6 +71,8 @@
yast2-security: ignore
udev: ignore
unzip: ignore
+?dracut: ignore
+?mkinitrd: ignore
?efibootmgr:
?elilo:
@@ -216,13 +216,6 @@
/usr/bin/reset
/usr/bin/tset
-terminfo-base:
- /usr/share/terminfo
- s ../share/terminfo /usr/lib/terminfo
-
-terminfo:
- /usr/share/terminfo/i/ibm3151
-
?hdparm:
/usr/sbin/hdparm
@@ -584,10 +577,6 @@
/
E postin
-dbus-1:
- /
- E prein
-
?s390-tools:
/
E postin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/etc/config
new/installation-images-14.32/etc/config
--- old/installation-images-14.26/etc/config 2013-12-04 15:04:54.000000000
+0100
+++ new/installation-images-14.32/etc/config 2014-01-28 10:19:59.000000000
+0100
@@ -68,7 +68,7 @@
splash = openSUSE
yast = openSUSE-Oxygen
product = openSUSE
-version = 13.1
+version = 13.2
sle = 12
update = /linux/suse/<arch>-<rel>
image = 350
@@ -78,7 +78,7 @@
splash = SLES
yast = SLE
product = SUSE Linux Enterprise Server 12
-version = 12
+version = 13.2
sle = 12
update = /linux/suse/<arch>-<sles>
image = 200
@@ -88,7 +88,7 @@
splash = SLED
yast = SLE
product = SUSE Linux Enterprise Desktop 12
-version = 12
+version = 13.2
sle = 12
update = /linux/suse/<arch>-<sled>
image = 200
@@ -98,7 +98,7 @@
splash = SLES
yast = SLE
product = ZENworks
-version = 12
+version = 13.2
sle = 12
update = /linux/suse/<arch>-<sles>
image = 200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/etc/module.config
new/installation-images-14.32/etc/module.config
--- old/installation-images-14.26/etc/module.config 2013-12-02
13:48:04.000000000 +0100
+++ new/installation-images-14.32/etc/module.config 2014-01-28
10:17:36.000000000 +0100
@@ -367,6 +367,7 @@
crc16,,-
auth_rpcgss,,-
autofs4,,-
+dmapi,,-
[ppc]
@@ -487,7 +488,7 @@
st,"SCSI Tape Driver"
sd_mod,"SCSI Disk Driver",-
sr_mod,"SCSI CD-ROM driver",-
--sg,"-Generic SCSI interface",-
+sg,"-Generic SCSI interface",-
scsi_debug,"Simulate a host adapter"
firmware_class,"-sysfs firmware upload",-
iscsi_tcp,"iSCSI/TCP data-path",,,,1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/etc/module.list
new/installation-images-14.32/etc/module.list
--- old/installation-images-14.26/etc/module.list 2013-11-26
10:46:51.000000000 +0100
+++ new/installation-images-14.32/etc/module.list 2014-01-20
12:22:52.000000000 +0100
@@ -62,6 +62,7 @@
kernel/drivers/ssb/
kernel/drivers/leds/led-class.ko
kernel/drivers/mmc/core/
+kernel/fs/autofs4/
kernel/fs/cramfs/
kernel/fs/ext2/
kernel/fs/ext3/
@@ -195,6 +196,7 @@
kernel/drivers/gpu/drm/
# kernel/drivers/gpu/drm/drm.ko
kernel/drivers/video/sis/
+kernel/drivers/video/hyperv_fb.ko
kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
kernel/drivers/misc/cs5535-mfgpt.ko
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/gefrickel
new/installation-images-14.32/gefrickel
--- old/installation-images-14.26/gefrickel 2013-11-18 11:49:20.000000000
+0100
+++ new/installation-images-14.32/gefrickel 2014-01-21 12:46:18.000000000
+0100
@@ -11,7 +11,7 @@
function squash {
mkdir -p parts
- $mksquashfs $1 parts/$2 -noappend -no-progress
+ $mksquashfs $1 parts/$2 -comp xz -noappend -no-progress
chmod 644 parts/$2
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/lib/CompressImage.pm
new/installation-images-14.32/lib/CompressImage.pm
--- old/installation-images-14.26/lib/CompressImage.pm 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.32/lib/CompressImage.pm 2014-01-21
13:24:28.000000000 +0100
@@ -18,12 +18,14 @@
sub CompressImage
{
local $_;
- my ($image, $name, $size, $image2);
+ my ($image, $name, $size, $image2, $prog, $prog_opt);
$name = $image = shift;
$name =~ s#^.*/##;
+ $prog = shift || 'gzip';
+
$size = -s $image;
return if !$size || !$name;
@@ -34,9 +36,13 @@
print "compressing $image...\n";
- die "$Script: gzip failed" if system "gzip -f9N '$image2'";
+ $prog_opt = '-cf9N' if $prog eq 'gzip';
+ $prog_opt = '-cf' if $prog eq 'xz';
+
+ die "$Script: $prog failed" if system "$prog $prog_opt '$image2'
>'$image2.tmp'";
- die "$Script: $!" unless rename "$image2.gz", $image;
+ die "$Script: $!" unless rename "$image2.tmp", $image;
+ die "$Script: $!" unless unlink $image2;
return -s $image;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/lib/Conv2Image.pm
new/installation-images-14.32/lib/Conv2Image.pm
--- old/installation-images-14.26/lib/Conv2Image.pm 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.32/lib/Conv2Image.pm 2014-01-21
12:25:22.000000000 +0100
@@ -56,7 +56,7 @@
die "$Script: no mksquashfs\n" unless $mksquashfs;
SUSystem "rm -f $image";
system "touch $image $image.log"; # just to ensure the image gets the
correct owner
- SUSystem "sh -c '$mksquashfs $dir $image -noappend -no-progress
>$image.log'" and die "$Script: mksquashfs failed";
+ SUSystem "sh -c '$mksquashfs $dir $image -comp xz -noappend -no-progress
>$image.log'" and die "$Script: mksquashfs failed";
$size = -s $image;
die "$Script: no image?" if $size == 0;
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.26/lib/ReadConfig.pm
new/installation-images-14.32/lib/ReadConfig.pm
--- old/installation-images-14.26/lib/ReadConfig.pm 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.32/lib/ReadConfig.pm 2014-01-27
12:05:19.000000000 +0100
@@ -332,8 +332,8 @@
if($rpm->{obs} && ! -f $rpm->{file}) {
# retry up to 3 times
for ($i = 0; $i < 3; $i++) {
- $log .= `curl -o '$rpm->{file}'
'$ConfigData{obs_server}/build/$rpm->{obs}/$ConfigData{obs_arch}/_repository/$rpm->{name}.rpm'
2>&1`;
- # system "curl -s -o '$rpm->{file}' '$ConfigData{obs_url}/$rpm->{obs}'";
+ $log .= `curl -k -o '$rpm->{file}'
'$ConfigData{obs_server}/build/$rpm->{obs}/$ConfigData{obs_arch}/_repository/$rpm->{name}.rpm'
2>&1`;
+ # system "curl -k -s -o '$rpm->{file}'
'$ConfigData{obs_url}/$rpm->{obs}'";
last if -f $rpm->{file};
}
if(! -f $rpm->{file}) {
@@ -533,7 +533,7 @@
# print "($prj, $repo)\n";
- for (`curl -s '$ConfigData{obs_server}/source/$prj/_meta'`) {
+ for (`curl -k -s '$ConfigData{obs_server}/source/$prj/_meta'`) {
if($inrepo) {
if(/<path/) {
my $x;
@@ -623,7 +623,7 @@
print $f "$p $r\n";
die "$Script: failed to create $ConfigData{tmp_cache_dir}/.obs/$p/$r ($!)"
unless make_path "$ConfigData{tmp_cache_dir}/.obs/$p/$r";
- for (`curl -s
'$ConfigData{obs_server}/build/$p/$r/$ConfigData{obs_arch}/_repository?view=binaryversions&nometa=1'`)
{
+ for (`curl -k -s
'$ConfigData{obs_server}/build/$p/$r/$ConfigData{obs_arch}/_repository?view=binaryversions&nometa=1'`)
{
if(/<binary\s+name="([^"]+)\.rpm"/) {
push @packages, "$1 $p/$r" unless $seen{$1};
$seen{$1} = 1;
@@ -670,7 +670,7 @@
my @err;
my %added;
- open $f, "curl -s -T $t -X POST
'$ConfigData{obs_server}/build/$prj/$repo/$ConfigData{obs_arch}/_repository/_buildinfo?debug=1'
|";
+ open $f, "curl -k -s -T $t -X POST
'$ConfigData{obs_server}/build/$prj/$repo/$ConfigData{obs_arch}/_repository/_buildinfo?debug=1'
|";
while(<$f>) {
print $_ if $ENV{debug} =~ /solv/;
$added{$1} = $2 if /^added (\S+) because of (\S+?)(:|$)/;
@@ -711,7 +711,7 @@
$repo->add_solv("/tmp/instsys.solv") or die "/tmp/instsys.solv: no solv
file";
$pool->addfileprovides();
$pool->createwhatprovides();
- $pool->set_debuglevel(3) if $ENV{debug} =~ /solv/;
+ $pool->set_debuglevel(4) if $ENV{debug} =~ /solv/;
my $solver = $pool->Solver();
$solver->set_flag($solv::Solver::SOLVER_FLAG_IGNORE_RECOMMENDED, 1);
@@ -722,6 +722,7 @@
}
my $blackpkg = $repo->add_solvable();
+ $blackpkg->{evr} = "1-1";
$blackpkg->{name} = "blacklist_package";
$blackpkg->{arch} = "noarch";
@@ -764,7 +765,9 @@
my @err;
for my $problem (@problems) {
- push @err, "$Script: " .
$problem->findproblemrule()->info()->problemstr() . "\n";
+ for my $pr ($problem->findallproblemrules()) {
+ push @err, "$Script: " . $pr->info()->problemstr() . "\n";
+ }
}
warn join('', @err);
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
