Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-06-02 07:03:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-05-26 10:27:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-06-02 07:03:03.000000000 +0200 @@ -1,0 +2,30 @@ +Fri May 30 15:11:23 CEST 2014 - snwint@suse.de + +- remove tightvnc from buildrequires + +------------------------------------------------------------------- +Fri May 30 13:49:06 CEST 2014 - snwint@suse.de + +- get package solver working in sub-images +- cleaned up biostest image +- 14.101 + +------------------------------------------------------------------- +Wed May 28 16:19:40 CEST 2014 - snwint@suse.de + +- enable wicked in rescue system +- improve dhcpcd script to accept ethX +- fix 32 bit build +- 14.100 + +------------------------------------------------------------------- +Tue May 27 14:18:16 CEST 2014 - snwint@suse.de + +- reworked dangling symlink checking +- added ca-certificates (bnc #877004) +- added sle12-desktop-migration (bnc #876992) +- pata_macio added to modules.conf +- syslog also to console 4 +- 14.99 + +------------------------------------------------------------------- Old: ---- installation-images-14.98.tar.xz New: ---- installation-images-14.101.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.B7VgdR/_old 2014-06-02 07:03:05.000000000 +0200 +++ /var/tmp/diff_new_pack.B7VgdR/_new 2014-06-02 07:03:05.000000000 +0200 @@ -41,6 +41,7 @@ %if %theme == SLES BuildRequires: sles-release BuildRequires: sles-release-MINI +BuildRequires: sle12-desktop-migration %else BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini @@ -147,7 +148,6 @@ BuildRequires: ntfs-3g BuildRequires: ntfsprogs BuildRequires: open-iscsi -BuildRequires: openct BuildRequires: openldap2-client BuildRequires: openslp-server BuildRequires: openssh @@ -287,9 +287,6 @@ BuildRequires: xf86-video-r128 BuildRequires: xf86-video-sis BuildRequires: xf86-video-vesa -%if %{with vnc} -BuildRequires: tightvnc -%endif %endif %ifarch ppc ppc64 ppc64le %ifnarch ppc64le @@ -355,10 +352,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.98 +Version: 14.101 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.98.tar.xz +Source: installation-images-14.101.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.98.tar.xz -> installation-images-14.101.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/README new/installation-images-14.101/README --- old/installation-images-14.98/README 2013-11-18 11:49:20.000000000 +0100 +++ new/installation-images-14.101/README 2014-05-27 12:51:16.000000000 +0200 @@ -278,6 +278,12 @@ X <src> <dst> + - allowed dangling symlink + Sometimes a symlink is ok because it points to a different image which + can't be verified automatically. + + D <from> <to> + Extensions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/VERSION new/installation-images-14.101/VERSION --- old/installation-images-14.98/VERSION 2014-05-23 14:41:00.000000000 +0200 +++ new/installation-images-14.101/VERSION 2014-05-30 13:48:54.000000000 +0200 @@ -1 +1 @@ -14.98 +14.101 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/bin/mk_image new/installation-images-14.101/bin/mk_image --- old/installation-images-14.98/bin/mk_image 2014-01-21 13:06:47.000000000 +0100 +++ new/installation-images-14.101/bin/mk_image 2014-05-27 13:44:53.000000000 +0200 @@ -72,7 +72,9 @@ mkdir $tmpdir || die "$Script: failed to create $tmpdir"; } - AddFiles $tmpdir, "${srcdir}/$fl.file_list", $srcdir or + $dangling_links = {}; + + AddFiles $tmpdir, "${srcdir}/$fl.file_list", $srcdir, $dangling_links or die "$Script: failed to setup image"; if(-f "$tmpdir.rpmlog") { @@ -176,11 +178,13 @@ for (`find $dir -type l`) { chomp; - 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; + + my $ds = $_; + $ds =~ s#^$dir/?##; + + next if $dangling_links->{$ds} eq $x; + if($x =~ /^\//) { next if $x =~ m#^/lbin/#; next if $x =~ m#^/proc/#; @@ -193,7 +197,9 @@ next if -e; } $err = 1; - print STDERR "$_ -> $x\n"; + my $n = $_; + $n =~ s#^$dir##; + print STDERR "invalid: $n -> $x\n"; } return $err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/bin/yast2-deps new/installation-images-14.101/bin/yast2-deps --- old/installation-images-14.98/bin/yast2-deps 2013-11-18 11:49:20.000000000 +0100 +++ new/installation-images-14.101/bin/yast2-deps 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -#! /usr/bin/perl - -# Check yast2 packages dependencies. - -BEGIN { $ENV{silent} = 1 } -BEGIN { unshift @INC, ( $0 =~ /(.*?)((?"$c" - wicked ifup "$1" + wicked ifup $iface } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/initrd/initrd.file_list new/installation-images-14.101/data/initrd/initrd.file_list --- old/installation-images-14.98/data/initrd/initrd.file_list 2014-05-22 12:17:49.000000000 +0200 +++ new/installation-images-14.101/data/initrd/initrd.file_list 2014-05-27 12:01:49.000000000 +0200 @@ -522,8 +522,9 @@ # here we just copy the files from there # the packages are listed here just so they show up in the package list later ca-certificates: nodeps - # do nothing - t tmp + /etc/ca-certificates + /etc/pki + /usr ca-certificates-mozilla: nodeps # copy ssl certificates @@ -532,6 +533,9 @@ : +d /usr/share/pki/trust/anchors + + include theme.file_list : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/initrd/scripts/early_setup new/installation-images-14.101/data/initrd/scripts/early_setup --- old/installation-images-14.98/data/initrd/scripts/early_setup 2014-05-22 09:12:54.000000000 +0200 +++ new/installation-images-14.101/data/initrd/scripts/early_setup 2014-05-23 15:50:35.000000000 +0200 @@ -47,3 +47,8 @@ } 2>/var/log/wickedd.log fi +# log also to console 4 if it exists +if [ -c /dev/tty4 ] ; then + echo "*.* /dev/tty4" >>/etc/syslog.conf +fi + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/rescue/bashrc new/installation-images-14.101/data/rescue/bashrc --- old/installation-images-14.98/data/rescue/bashrc 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.101/data/rescue/bashrc 2014-05-28 16:08:13.000000000 +0200 @@ -0,0 +1,53 @@ +PS1='\l:\H:\w # ' +if [ -x /bin/hostname ] ; then + PS1='\l:$(/bin/hostname 2>/dev/null):\w # ' +fi + +export LIBGL_ALWAYS_INDIRECT=1 + +alias ll="ls -l" +alias la="ls -la" +alias ..="cd .." +alias ...="cd ../.." +alias ....="cd ../../.." +alias .....="cd ../../../.." +alias ......="cd ../../../../.." + +function dhcpcd { + if [ -z "$1" ] ; then + x= + x=$( cd /sys/class/net ; for i in * ; do [ "$i" = lo ] || x="$x $i" ; done ; echo $x ) + echo "available interfaces: $x" + return + fi + + act=up + + if [ "$1" = "-k" ] ; then + act=down + shift + fi + + iface=$1 + + # match ethX to x-th ethernet interface + if [ ! -d /sys/class/net/$iface ] ; then + x= + x=($( cd /sys/class/net ; for i in e* ; do [ -d "$i" ] && x="$x $i" ; done ; echo $x )) + iface1= + case $iface in eth*) iface1=${x[${iface/eth/}]} ;; esac + if [ -n "$iface1" ] ; then + echo "$iface = $iface1" + iface=$iface1 + fi + fi + + if [ "$act" = down ] ; then + wicked ifdown $iface + return + fi + + c="/etc/sysconfig/network/ifcfg-$iface" + [ ! -f "$c" ] && echo -e "BOOTPROTO='dhcp'\nSTARTMODE='auto'" >"$c" + wicked ifup $iface +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/rescue/rescue.file_list new/installation-images-14.101/data/rescue/rescue.file_list --- old/installation-images-14.98/data/rescue/rescue.file_list 2014-05-16 13:38:15.000000000 +0200 +++ new/installation-images-14.101/data/rescue/rescue.file_list 2014-05-28 16:11:10.000000000 +0200 @@ -316,6 +316,17 @@ : +# enable wicked service +s ../wickedd.service usr/lib/systemd/system/multi-user.target.wants +s ../wickedd-auto4.service usr/lib/systemd/system/multi-user.target.wants +s ../wickedd-dhcp4.service usr/lib/systemd/system/multi-user.target.wants +s ../wickedd-dhcp6.service usr/lib/systemd/system/multi-user.target.wants +s ../wickedd-nanny.service usr/lib/systemd/system/multi-user.target.wants +s ../wicked.service usr/lib/systemd/system/multi-user.target.wants + +# activate our bashrc +x bashrc root/.profile + # create it now (see filesystem package above) d /sys @@ -363,3 +374,5 @@ d lib/firmware usr/lib/microcode +# allowed dangling symlinks +D /var/cache/gio-2.0/gnome-defaults.list /usr/share/applications/defaults.list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/root/bind.file_list new/installation-images-14.101/data/root/bind.file_list --- old/installation-images-14.98/data/root/bind.file_list 2013-11-18 11:49:20.000000000 +0100 +++ new/installation-images-14.101/data/root/bind.file_list 2014-05-30 13:35:33.000000000 +0200 @@ -1,12 +1,11 @@ -bind-utils: - /usr/bin - -bind-libs: - /usr/lib* - -libcap2: - /lib* +TEMPLATE: + / +bind-utils: openldap2-client: - /usr/bin/ldapsearch +AUTODEPS: + +: +# remove files we don't want to show up at all +r /usr/share/{doc,info,locale,man} /usr/src/packages /var/adm/fillup-templates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/root/gdb.file_list new/installation-images-14.101/data/root/gdb.file_list --- old/installation-images-14.98/data/root/gdb.file_list 2014-01-20 14:55:49.000000000 +0100 +++ new/installation-images-14.101/data/root/gdb.file_list 2014-05-30 13:32:00.000000000 +0200 @@ -1,21 +1,14 @@ -gdb: - / - -libpython*-*: - / - -python-base: +TEMPLATE: / +gdb: ?valgrind: - / - +AUTODEPS: : x gdb.init .init x gdb.done .done -# remove, ehm, things... -r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates - +# remove files we don't want to show up at all +r /usr/share/{doc,info,locale,man} /usr/src/packages /var/adm/fillup-templates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/data/root/root.file_list new/installation-images-14.101/data/root/root.file_list --- old/installation-images-14.98/data/root/root.file_list 2014-05-23 14:29:34.000000000 +0200 +++ new/installation-images-14.101/data/root/root.file_list 2014-05-27 16:41:17.000000000 +0200 @@ -155,6 +155,9 @@ xfsdump: xfsprogs: xz: +p11-kit-tools: +p11-kit: +?sle12-desktop-migration: if theme eq 'SLES' sles-release: @@ -640,3 +643,11 @@ # add yast preferred font list d /usr/share/libyui/data x lang_fonts /usr/share/libyui/data/lang_fonts + +# 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 +D /var/cache/gio-2.0/gnome-defaults.list /usr/share/applications/defaults.list +D ../share/cracklib/pw_dict.pwi /usr/lib/cracklib_dict.pwi +D ../share/cracklib/pw_dict.pwd /usr/lib/cracklib_dict.pwd +D ../share/cracklib/pw_dict.hwm /usr/lib/cracklib_dict.hwm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/etc/module.config new/installation-images-14.101/etc/module.config --- old/installation-images-14.98/etc/module.config 2014-04-23 17:12:57.000000000 +0200 +++ new/installation-images-14.101/etc/module.config 2014-05-27 08:29:14.000000000 +0200 @@ -459,6 +459,7 @@ pata_pdc2027x,"Promise PDC20268 to PDC20277",,,,1 pata_sil680,SI680 PATA QS20,,,,1 pata_sl82c105,"W82C105 PATA IDE",,,,1 +pata_macio,"PowerMac PATA IDE",,,,1 ahci,"AHCI SATA driver",,,,1 sata_sil,"Silicon Image SATA",,,,1 sata_sil24,"Silicon Image 3124/3132 SATA",,,,1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/lib/AddFiles.pm new/installation-images-14.101/lib/AddFiles.pm --- old/installation-images-14.98/lib/AddFiles.pm 2014-04-25 11:13:23.000000000 +0200 +++ new/installation-images-14.101/lib/AddFiles.pm 2014-05-30 12:55:21.000000000 +0200 @@ -71,6 +71,8 @@ my $src_line; my $templates; my $used_packs; +my $dangling_links; +my $dir; # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -78,14 +80,13 @@ { local $_; - my ($dir, $file_list, $ext_dir, $arch, $if_val, $if_taken); + my ($file_list, $ext_dir, $arch, $if_val, $if_taken); my ($inc_file, $inc_it, $debug, $ifmsg, $old_warn); - my ($rpm_dir, $rpm_file); - my ($current_pack); + my ($rpm_dir, $rpm_file, $current_pack); my $su = "$SUBinary -q 0 " if $SUBinary; - ($dir, $file_list, $ext_dir) = @_; + ($dir, $file_list, $ext_dir, $dangling_links) = @_; $debug = "pkg"; $debug = $ENV{'debug'} if exists $ENV{'debug'}; @@ -374,7 +375,6 @@ # print Dumper($used_packs); - open my $f, ">${dir}.rpms"; open my $l, ">${dir}.rpmlog"; for (sort keys %$used_packs) { $_ = $used_packs->{$_}; @@ -387,10 +387,8 @@ $by = ''; } } - print $f "$_->{name}\n"; print $l "$_->{name} [$_->{version}]$by\n"; } - close $f; close $l; $SIG{'__WARN__'} = $old_warn; @@ -562,6 +560,9 @@ SUSystem "ln -sf $1 $dir/$2" and warn "$Script: failed to symlink $1 to $2"; } + elsif(/^D\s+(\S+)\s+\/?(\S+?)$/) { + $dangling_links->{$2} = $1; + } elsif(/^m\s+(\S+)\s+(\S+)$/) { SUSystem "sh -c \"cp -a $tdir/$1 $dir/$2\"" and warn "$Script: failed to move $1 to $2"; @@ -752,6 +753,7 @@ my $ignore; my $all; + my $old; print "resolving package dependencies...\n"; @@ -763,7 +765,59 @@ delete $all->{$_} for (keys %$ignore); - my $r = ResolveDeps [ keys %$all ], [ keys %$ignore ]; + if($old->{name} = $ENV{disjunct}) { + $old->{dir} = $dir; + $old->{dir} =~ s#[^/]+$#$old->{name}#; + if(open my $f, "$old->{dir}.rpmlog") { + my $p; + while(<$f>) { + $p = (split)[0]; + $old->{packs}{$p} = 1 if $p ne ""; + } + close $f; + } + else { + die "$old->{dir}.romlog: $old package list missing"; + } + if(open my $f, "$old->{dir}.solv") { + while(<$f>) { + chomp; + if(s/^\-//) { + $old->{ignore}{$_} = 1; + } + else { + $old->{all}{$_} = 1; + } + } + close $f; + } + else { + die "$old->{dir}.solv: $old package solv list missing"; + } + } + + # print Dumper($old); + + for (keys %$all) { + $old->{all}{$_} = 1; + delete $old->{ignore}{$_}; + } + + for (keys %$ignore) { + delete $old->{all}{$_}; + $old->{ignore}{$_} = 1; + } + + $all = $old->{all}; + $ignore = $old->{ignore}; + + if(open my $f, ">${dir}.solv") { + print $f "$_\n" for sort keys %$all; + print $f "-$_\n" for sort keys %$ignore; + close $f; + } + + my $r = ResolveDeps [ keys %$all ], [ keys %$ignore ], $old->{packs}; # print Dumper($r); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.98/lib/ReadConfig.pm new/installation-images-14.101/lib/ReadConfig.pm --- old/installation-images-14.98/lib/ReadConfig.pm 2014-04-30 11:06:19.000000000 +0200 +++ new/installation-images-14.101/lib/ReadConfig.pm 2014-05-30 12:54:56.000000000 +0200 @@ -216,6 +216,7 @@ local $_; my $packages = shift; my $ignore = shift; + my $old = shift; my $p1; @@ -231,6 +232,7 @@ my $cnt = 0; for (keys %$p1) { + next if $old->{$_}; $p2->{$_} = show_package_deps($_, $p1); $cnt++; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org