Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2013-07-07 22:28:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-06-28 11:50:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2013-07-07 22:28:07.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Jul 7 16:07:29 UTC 2013 - coolo@suse.com + +- update to git: installation-images-14.3.diff + +------------------------------------------------------------------- +Thu Jul 4 19:27:51 UTC 2013 - coolo@suse.com + +- adapt to package changes + +------------------------------------------------------------------- +Tue Jul 2 11:59:37 CEST 2013 - snwint@suse.de + +- generate debuginfo dependencies +- use new directory of trust anchors + +------------------------------------------------------------------- Old: ---- installation-images-14.2.diff installation-images-14.2.tar.bz2 New: ---- installation-images-14.3.diff installation-images-14.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.WvplDR/_old 2013-07-07 22:28:08.000000000 +0200 +++ /var/tmp/diff_new_pack.WvplDR/_new 2013-07-07 22:28:08.000000000 +0200 @@ -196,7 +196,6 @@ BuildRequires: terminfo BuildRequires: usbutils BuildRequires: util-linux -BuildRequires: uuid-runtime BuildRequires: valgrind BuildRequires: vim BuildRequires: wget @@ -359,9 +358,6 @@ BuildRequires: dmz-icon-theme-cursors BuildRequires: yast2-theme-openSUSE BuildRequires: yast2-theme-openSUSE-Oxygen -%ifnarch s390 -# BuildRequires: blocxx-debuginfo boost-debuginfo bzip2-debuginfo curl-debuginfo dbus-1-debuginfo dbus-1-glib-debuginfo e2fsprogs-debuginfo expat-debuginfo fontconfig-debuginfo gcc44-debuginfo glib2-debuginfo glibc-debuginfo hwinfo-debuginfo icu-debuginfo jpeg-debuginfo libidn-debuginfo libpng12-0-debuginfo libqt4-debuginfo libxcrypt-debuginfo libxml2-debuginfo libzypp-debuginfo openssl-debuginfo pcre-debuginfo perl-debuginfo perl-gettext-debuginfo qt3-debuginfo rpm-debuginfo sysfsutils-debuginfo wireless-tools-debuginfo xorg-x11-libICE-debuginfo xorg-x11-libSM-debuginfo xorg-x11-libX11-debuginfo xorg-x11-libXau-debuginfo xorg-x11-libXdmcp-debuginfo xorg-x11-libXext-debuginfo xorg-x11-libXfixes-debuginfo xorg-x11-libXmu-debuginfo xorg-x11-libXrender-debuginfo xorg-x11-libfontenc-debuginfo xorg-x11-libs-debuginfo xorg-x11-libxcb-debuginfo xorg-x11-server-debuginfo yast2-core-debuginfo yast2-hardware-detection-debuginfo yast2-perl-bindings-debuginfo yast2-pkg-bindings-debuginfo yast2-qt-debuginfo yast2-xml-debuginfo zlib-debuginfo -%endif # Provides: y2image Obsoletes: y2image @@ -370,10 +366,10 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 14.2 +Version: 14.3 Release: 0 -Source: installation-images-14.2.tar.bz2 -Patch0: installation-images-14.2.diff +Source: installation-images-14.3.tar.bz2 +Patch0: installation-images-14.3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -433,6 +429,16 @@ SLES theme for install-initrd package. +%package debuginfodeps +Summary: Debuginfo dependencies for installation-images +Group: Metapackages + +%description debuginfodeps +Package that holds debuginfo dependencies for image files in installation-image. + + +%define __debuginfo_requires xargs grep build-id +%define __debuginfo_path ^/usr/share/debuginfodeps %prep %setup @@ -556,4 +562,8 @@ %dir /usr/lib/install-initrd %ghost /usr/lib/install-initrd/branding +%files debuginfodeps +%defattr(-,root,root) +/usr/share/debuginfodeps + %changelog ++++++ installation-images-14.2.diff -> installation-images-14.3.diff ++++++ --- /work/SRC/openSUSE:Factory/installation-images/installation-images-14.2.diff 2013-06-28 11:50:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images-14.3.diff 2013-07-07 22:28:07.000000000 +0200 @@ -1,62 +1,222 @@ +diff --git a/Makefile b/Makefile +index 6b88292..8f2dfe1 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,7 +236,6 @@ install: + ./install.$(ARCH) + @mkdir -p $(DESTDIR)/usr/share/debuginfodeps + ./debuginfodeps root +- ./debuginfodeps rescue + + install-initrd: + -@rm -rf $(DESTDIR) +diff --git a/bin/check_libs b/bin/check_libs +index 66be22d..d304773 100755 +--- a/bin/check_libs ++++ b/bin/check_libs +@@ -36,6 +36,18 @@ while($dir = shift) { + } + } + ++ # extract build ids ++ open(DLOG, ">$dir.debugids"); ++ for my $f (@ELF) { ++ for (`readelf -n '$dir/$f'`) { ++ if (m/\sBuild ID:\s*([0-9a-z]*)/) { ++ print "Build-ID: $1 $f\n" if ($verbose >= 1); ++ print DLOG "$1 $f\n"; ++ } ++ } ++ } ++ close(DLOG); ++ + print "extracting shared object dependencies...\n"; + + @ELF = map(quotemeta, @ELF); diff --git a/data/base/base.file_list b/data/base/base.file_list -index 247f09e..91d0745 100644 +index 91d0745..2810470 100644 --- a/data/base/base.file_list +++ b/data/base/base.file_list -@@ -368,7 +368,7 @@ ca-certificates: +@@ -182,6 +182,9 @@ endif + libfreetype*: + / + ++libpng*-*: ++ / ++ + libXfont*: + / + +@@ -363,13 +366,12 @@ openssl: + / + + ca-certificates: +- / +- r /etc/ssl/ca-bundle.pem ++ /usr/sbin/update-ca-certificates ++ /usr/lib/ca-certificates/update.d/openssl.run ++ /var/lib/ca-certificates/openssl ca-certificates-mozilla: - # _copy_ certificates so everything is in /etc/ssl -- m /usr/share/ca-certificates/mozilla/* /etc/ssl/certs -+ m /usr/share/pki/trust/anchors/* /etc/ssl/certs - E c_rehash >/dev/null +- # _copy_ certificates so everything is in /etc/ssl +- m /usr/share/pki/trust/anchors/* /etc/ssl/certs +- E c_rehash >/dev/null ++ / systemd: -@@ -413,6 +413,9 @@ libnettle*: + / +@@ -413,6 +415,12 @@ libnettle*: libp11-kit*: / -+libffi*: ++p11-kit: + / + - : ++p11-kit-tools: ++ / ++ + libffi*: + / - # remove things we don't need +@@ -444,3 +452,7 @@ E touch /tmp/xxx + E create-cracklib-dict /tmp/xxx + E rm -f /tmp/xxx + ++# ++E update-ca-certificates -f ++E ls -lR /var/lib/ca-certificates ++E ls -lR /etc/ssl diff --git a/data/rescue/rescue.file_list b/data/rescue/rescue.file_list -index 0aa7f7e..708b745 100644 +index 708b745..08f83ba 100644 --- a/data/rescue/rescue.file_list +++ b/data/rescue/rescue.file_list -@@ -179,6 +179,9 @@ libxtables*: - libselinux*: +@@ -33,6 +33,9 @@ libtalloc*: + libkmod*: / -+libutempter*: ++libpng*-*: + / + - gpart: + libfreetype*: / diff --git a/data/root/root.file_list b/data/root/root.file_list -index 1842599..bdc9afa 100644 +index 18a26db..da0e779 100644 --- a/data/root/root.file_list +++ b/data/root/root.file_list -@@ -1065,9 +1065,6 @@ if arch ne 's390' && arch ne 's390x' - R s/nil2/fixed/ /usr/share/X11/app-defaults/XTerm - /usr/bin/xterm - -- utempter: -- /usr/sbin/utempter -- - gpm: - /usr/sbin/gpm - -@@ -1348,8 +1345,8 @@ screen: - /etc - /usr/bin/screen - --utempter: -- /usr/lib*/libutempter.so.* -+libutempter*: -+ / +@@ -1363,9 +1363,6 @@ multipath-tools: + libharfbuzz*: + / + +-libicu*: +- / +- + graphviz-gnome: + /usr/lib*/graphviz/libgvplugin_pango.so.* + +diff --git a/debuginfodeps b/debuginfodeps +index efc1d56..dc61979 100755 +--- a/debuginfodeps ++++ b/debuginfodeps +@@ -4,71 +4,45 @@ + # + # 1. debuginfodeps <image_name> + # +-# Reads packages from tmp/<image_name>.rpmlog and writes debuginfo packages +-# to images/instsys/usr/share/debuginfodeps/<image_name>. +-# Packages in debuginfodeps-blacklist are known to have no debuginfo +-# packages and are skipped. +-# noarch packages are assumed to have no debuginfo. +-# +-# +-# 2. debuginfodeps -b <image_name> +-# +-# This can be used to create the blacklist. +-# +-# Reads packages from tmp/<image_name>.rpmlog and prints packages that +-# don't have debuginfo packages in the obs repo +-# (tmp/cache/<repo>/.obs/packages) and are not already blacklisted. This +-# requires a successful 'make' run on a normal system (not in obs) to +-# work. ++# Reads build ids from tmp/<image_name>.debugids and writes debuginfo ++# requires to images/instsys/usr/share/debuginfodeps/<image_name>. + # + +-use Getopt::Long; +- +-GetOptions( +- 'blacklist|b' => $opt_black +-); + + $image = shift; + $dst = "$ENV{DESTDIR}/usr/share/debuginfodeps"; +-$blacklist = "debuginfodeps-blacklist"; +-@obs = glob("tmp/cache/*/.obs/packages"); + + die "$image: no package list" unless -f "tmp/$image.rpmlog"; +-die "$dst: no debuginfodeps directory\n" unless -d $dst || $opt_black; +- +-open $f, "tmp/$image.rpmlog"; +-chomp(@rpms = <$f>); +-close $f; +- +-open $f, $blacklist; +-chomp(@blacklist = <$f>); +-close $f; +- +-@blacklist{@blacklist} = (); +- +-if($opt_black) { +- for (glob("tmp/cache/*/.obs/packages")) { +- open $f, $_; +- while(<$f>) { $debuginfo{$1} = 1 if /^(\S+)-debuginfo\s/ } +- close $f; +- } ++die "$dst: no debuginfodeps directory\n" unless -d $dst; ++ ++open $f, "tmp/$image.debugids"; ++my %ids; ++while ( <$f> ){ ++ chomp; ++ next unless (m/^(.*) (.*)/); ++ my $id = $1; ++ my $file = $2; ++ ++ # black list strange binaries ++ next if ($file =~ m,/usr/bin/syslinux,); ++ next if ($file =~ m,/sbin/lilo,); ++ next if ($file =~ m,/usr/lib/getconf/,); ++ # non-stripped ++ next if ($file =~ m,/usr/lib/pt_chown,); ++ # faked ELF binary with just data ++ next if ($file =~ m,/libicudata.so.,); ++ ++ # too large to be useful ++ next if ($file =~ m,/usr/lib.*/dri/,); ++ $ids{$id} = $file; + } ++close $f; + +-for (@rpms) { +- next if /.noarch]$/; +- s/ .*$//; +- next if exists $blacklist{$_}; +- if($opt_black) { +- print "$_\n" unless $debuginfo{$_}; +- } +- else { +- $packages{"$_-debuginfo"} = 1; +- } +-} ++open $d, ">", "$dst/$image"; + +-if(!$opt_black) { +- open $d, ">", "$dst/$image"; +- print $d "$_\n" for sort keys %packages; +- close $d; ++for (sort keys %ids) { ++ print $d "# $ids{$_}\n"; ++ print $d "debuginfo(build-id) = $_\n"; + } - efont-unicode-bitmap-fonts: - /usr/share/fonts/misc/b16.pcf.gz ++close($d); ++++++ installation-images-14.2.tar.bz2 -> installation-images-14.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/Makefile new/installation-images-14.3/Makefile --- old/installation-images-14.2/Makefile 2013-06-07 15:10:40.000000000 +0200 +++ new/installation-images-14.3/Makefile 2013-07-02 11:51:24.000000000 +0200 @@ -234,6 +234,9 @@ -@rm -rf $(DESTDIR) @mkdir -p $(DESTDIR) ./install.$(ARCH) + @mkdir -p $(DESTDIR)/usr/share/debuginfodeps + ./debuginfodeps root + ./debuginfodeps rescue install-initrd: -@rm -rf $(DESTDIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/VERSION new/installation-images-14.3/VERSION --- old/installation-images-14.2/VERSION 2013-06-20 15:09:42.000000000 +0200 +++ new/installation-images-14.3/VERSION 2013-07-02 11:59:31.000000000 +0200 @@ -1 +1 @@ -14.2 +14.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/changelog new/installation-images-14.3/changelog --- old/installation-images-14.2/changelog 2013-06-20 15:09:44.000000000 +0200 +++ new/installation-images-14.3/changelog 2013-07-02 11:59:33.000000000 +0200 @@ -1,4 +1,9 @@ -2013-06-20: HEAD +2013-07-02: HEAD + - generate debuginfo dependencies + - remove utempter, add libutempter + - use new directory of trust anchors + +2013-06-20: 14.2 - added sg_inq (bnc #824300) - adjust to package changes - remove limal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/data/base/base.file_list new/installation-images-14.3/data/base/base.file_list --- old/installation-images-14.2/data/base/base.file_list 2013-06-20 14:10:06.000000000 +0200 +++ new/installation-images-14.3/data/base/base.file_list 2013-07-02 09:47:08.000000000 +0200 @@ -368,7 +368,7 @@ ca-certificates-mozilla: # _copy_ certificates so everything is in /etc/ssl - m /usr/share/ca-certificates/mozilla/* /etc/ssl/certs + m /usr/share/pki/trust/anchors/* /etc/ssl/certs E c_rehash >/dev/null systemd: @@ -413,6 +413,9 @@ libp11-kit*: / +libffi*: + / + : # remove things we don't need diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/data/rescue/rescue.file_list new/installation-images-14.3/data/rescue/rescue.file_list --- old/installation-images-14.2/data/rescue/rescue.file_list 2013-06-20 14:54:33.000000000 +0200 +++ new/installation-images-14.3/data/rescue/rescue.file_list 2013-07-02 09:47:08.000000000 +0200 @@ -179,6 +179,9 @@ libselinux*: / +libutempter*: + / + gpart: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/data/root/root.file_list new/installation-images-14.3/data/root/root.file_list --- old/installation-images-14.2/data/root/root.file_list 2013-06-20 15:07:10.000000000 +0200 +++ new/installation-images-14.3/data/root/root.file_list 2013-07-02 11:39:09.000000000 +0200 @@ -1065,9 +1065,6 @@ R s/nil2/fixed/ /usr/share/X11/app-defaults/XTerm /usr/bin/xterm - utempter: - /usr/sbin/utempter - gpm: /usr/sbin/gpm @@ -1348,8 +1345,8 @@ /etc /usr/bin/screen -utempter: - /usr/lib*/libutempter.so.* +libutempter*: + / efont-unicode-bitmap-fonts: /usr/share/fonts/misc/b16.pcf.gz @@ -1417,6 +1414,9 @@ libsgutils2-*: / +libgraphite2-*: + / + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # # packages with scripts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/debuginfodeps new/installation-images-14.3/debuginfodeps --- old/installation-images-14.2/debuginfodeps 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.3/debuginfodeps 2013-07-02 11:56:57.000000000 +0200 @@ -0,0 +1,74 @@ +#! /usr/bin/perl + +# Usage +# +# 1. debuginfodeps <image_name> +# +# Reads packages from tmp/<image_name>.rpmlog and writes debuginfo packages +# to images/instsys/usr/share/debuginfodeps/<image_name>. +# Packages in debuginfodeps-blacklist are known to have no debuginfo +# packages and are skipped. +# noarch packages are assumed to have no debuginfo. +# +# +# 2. debuginfodeps -b <image_name> +# +# This can be used to create the blacklist. +# +# Reads packages from tmp/<image_name>.rpmlog and prints packages that +# don't have debuginfo packages in the obs repo +# (tmp/cache/<repo>/.obs/packages) and are not already blacklisted. This +# requires a successful 'make' run on a normal system (not in obs) to +# work. +# + +use Getopt::Long; + +GetOptions( + 'blacklist|b' => $opt_black +); + +$image = shift; +$dst = "$ENV{DESTDIR}/usr/share/debuginfodeps"; +$blacklist = "debuginfodeps-blacklist"; +@obs = glob("tmp/cache/*/.obs/packages"); + +die "$image: no package list" unless -f "tmp/$image.rpmlog"; +die "$dst: no debuginfodeps directory\n" unless -d $dst || $opt_black; + +open $f, "tmp/$image.rpmlog"; +chomp(@rpms = <$f>); +close $f; + +open $f, $blacklist; +chomp(@blacklist = <$f>); +close $f; + +@blacklist{@blacklist} = (); + +if($opt_black) { + for (glob("tmp/cache/*/.obs/packages")) { + open $f, $_; + while(<$f>) { $debuginfo{$1} = 1 if /^(\S+)-debuginfo\s/ } + close $f; + } +} + +for (@rpms) { + next if /.noarch]$/; + s/ .*$//; + next if exists $blacklist{$_}; + if($opt_black) { + print "$_\n" unless $debuginfo{$_}; + } + else { + $packages{"$_-debuginfo"} = 1; + } +} + +if(!$opt_black) { + open $d, ">", "$dst/$image"; + print $d "$_\n" for sort keys %packages; + close $d; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.2/debuginfodeps-blacklist new/installation-images-14.3/debuginfodeps-blacklist --- old/installation-images-14.2/debuginfodeps-blacklist 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.3/debuginfodeps-blacklist 2013-07-02 11:30:32.000000000 +0200 @@ -0,0 +1,26 @@ +aaa_base-extras +file-magic +filesystem +glibc-32bit +insserv-compat +libncurses5-32bit +lilo +mkfontdir +perl-Bootloader +perl-XML-NamespaceSupport +perl-XML-Simple +plymouth-scripts +systemd-sysvinit +terminfo +terminfo-base +yast2 +yast2-bootloader +yast2-country +yast2-country-data +yast2-kdump +yast2-mouse +yast2-network +yast2-packager +yast2-tune +yast2-update +yast2-vm -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org