Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2013-01-14 14:04:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2013-01-10 13:06:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2013-01-14 14:04:16.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Jan 14 11:06:40 CET 2013 - [email protected] + +- add complete lvm2 package (bnc #790724) + +------------------------------------------------------------------- +Mon Jan 14 08:54:28 CET 2013 - [email protected] + +- insserv -> insserv-compat +- reworked grub2 efi config +- support shim + +------------------------------------------------------------------- Old: ---- installation-images-13.63.tar.bz2 New: ---- installation-images-13.65.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.bfrmaI/_old 2013-01-14 14:04:18.000000000 +0100 +++ /var/tmp/diff_new_pack.bfrmaI/_new 2013-01-14 14:04:18.000000000 +0100 @@ -371,9 +371,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.63 +Version: 13.65 Release: 0 -Source: installation-images-13.63.tar.bz2 +Source: installation-images-13.65.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.63.tar.bz2 -> installation-images-13.65.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/VERSION new/installation-images-13.65/VERSION --- old/installation-images-13.63/VERSION 2013-01-09 10:31:19.000000000 +0100 +++ new/installation-images-13.65/VERSION 2013-01-14 11:06:34.000000000 +0100 @@ -1 +1 @@ -13.63 +13.65 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/changelog new/installation-images-13.65/changelog --- old/installation-images-13.63/changelog 2013-01-09 10:31:23.000000000 +0100 +++ new/installation-images-13.65/changelog 2013-01-14 11:06:37.000000000 +0100 @@ -1,4 +1,14 @@ -2013-01-09: HEAD +2013-01-14: HEAD + - add complete lvm2 package (bnc #790724) + +2013-01-14: 13.64 + - insserv -> insserv-compat + - replace grub2 title + - reworked grub2 efi config + - support shim + - better grub2 efi config + +2013-01-09: 13.63 - turn on efi graphics 2013-01-08: 13.62 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/base/base.file_list new/installation-images-13.65/data/base/base.file_list --- old/installation-images-13.63/data/base/base.file_list 2013-01-08 14:59:59.000000000 +0100 +++ new/installation-images-13.65/data/base/base.file_list 2013-01-14 08:54:07.000000000 +0100 @@ -208,9 +208,17 @@ libjpeg*: / -insserv: - /etc - /sbin +perl-base: + /usr/{bin,lib} + +perl: + /usr/{bin,lib} + +perl-HTML-Parser: + /usr/lib + +insserv-compat: + / aaa_base: prein,postin e prein @@ -234,15 +242,6 @@ r /var/adm/fillup-templates t /etc/fstab -perl-base: - /usr/{bin,lib} - -perl: - /usr/{bin,lib} - -perl-HTML-Parser: - /usr/lib - libdb-*: / @@ -354,6 +353,9 @@ device-mapper: / +gettext-runtime: + / + ?grub2: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/boot/grub.cfg new/installation-images-13.65/data/boot/grub.cfg --- old/installation-images-13.63/data/boot/grub.cfg 2013-01-08 14:59:54.000000000 +0100 +++ new/installation-images-13.65/data/boot/grub.cfg 2013-01-14 08:54:04.000000000 +0100 @@ -6,21 +6,23 @@ insmod efi_gop insmod efi_uga -insmod gfxterm insmod gzio insmod gettext -terminal_output gfxterm -loadfont $prefix/unicode.pf2 +color_normal=light-gray/black +color_highlight=white/light-gray if [ "$with_gfx" = 1 ] ; then - theme=$prefix/themes/openSUSE/theme.txt - export theme - + insmod gfxterm insmod gfxmenu insmod png - loadfont $prefix/themes/openSUSE/ascii.pf2 + terminal_output gfxterm + + theme=$prefix/themes/openSUSE/theme.txt + export theme + + loadfont $prefix/unicode.pf2 loadfont $prefix/themes/openSUSE/DejaVuSans10.pf2 loadfont $prefix/themes/openSUSE/DejaVuSans12.pf2 loadfont $prefix/themes/openSUSE/DejaVuSans-Bold14.pf2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/boot/grub2-efi.file_list new/installation-images-13.65/data/boot/grub2-efi.file_list --- old/installation-images-13.63/data/boot/grub2-efi.file_list 2013-01-08 14:59:54.000000000 +0100 +++ new/installation-images-13.65/data/boot/grub2-efi.file_list 2013-01-14 08:54:07.000000000 +0100 @@ -2,6 +2,17 @@ if arch eq 'x86_64' e grub2-mkimage -d /usr/lib/grub2/x86_64-efi -O x86_64-efi -o efi/boot/bootx64.efi -p "(cd0)/boot/<arch>/grub2-efi" iso9660 + + # if we have shim, use it + if exists(shim-signed) || exists(shim) + e mv efi/boot/bootx64.efi efi/boot/grub.efi + ?shim: + m /usr/lib64/efi/shim.efi efi/boot/bootx64.efi + ?shim-signed: + m /usr/lib64/efi/shim.efi efi/boot/bootx64.efi + endif + # elsif arch eq 'ia64' + endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/boot/grub2_head.po new/installation-images-13.65/data/boot/grub2_head.po --- old/installation-images-13.63/data/boot/grub2_head.po 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-13.65/data/boot/grub2_head.po 2013-01-14 08:54:04.000000000 +0100 @@ -0,0 +1,2 @@ +msgid "GNU GRUB version %s" +msgstr "product_name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/boot/theme.file_list new/installation-images-13.65/data/boot/theme.file_list --- old/installation-images-13.63/data/boot/theme.file_list 2013-01-09 10:30:18.000000000 +0100 +++ new/installation-images-13.65/data/boot/theme.file_list 2013-01-14 08:54:07.000000000 +0100 @@ -29,6 +29,15 @@ e rm grub2-efi/x86_64-efi/*.module e cp /usr/share/grub2/unicode.pf2 grub2-efi + if 0 + # only for text mode: show product name in title instead of default grub string + d grub2-efi/locale + x grub2_head.po . + R s/product_name/<product_name>/ grub2_head.po + e msgfmt -o grub2-efi/locale/en.mo grub2_head.po + r grub2_head.po + endif + # grub2-efi with graphics if 1 ?grub2-branding-<splash_theme>: @@ -36,6 +45,8 @@ m /usr/share/grub2/backgrounds/<splash_theme>/default-43.png grub2-efi/themes/openSUSE/background.png r grub2-efi/themes/<splash_theme>/{activate-theme,COPYING.CC-BY-SA-3.0,README} + e cp /usr/share/grub2/unicode.pf2 grub2-efi + R s/^with_gfx=0/with_gfx=1/ grub2-efi/grub.cfg endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/rescue/rescue.file_list new/installation-images-13.65/data/rescue/rescue.file_list --- old/installation-images-13.63/data/rescue/rescue.file_list 2013-01-09 09:33:32.000000000 +0100 +++ new/installation-images-13.65/data/rescue/rescue.file_list 2013-01-14 10:54:04.000000000 +0100 @@ -64,7 +64,7 @@ iproute2: / -insserv: +insserv-compat: / libpcre*: @@ -724,6 +724,12 @@ libdbus-1-*: / +perl-base: + /usr/bin/perl + /usr/lib/perl* + +perl: + /usr/lib/perl* ### # to keep postin scripts happy @@ -749,11 +755,7 @@ E postin lvm2: postin - /etc - /lib* - /sbin - /usr - /var/adm + / # NOT /var/lock ! E postin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/root/root.file_list new/installation-images-13.65/data/root/root.file_list --- old/installation-images-13.63/data/root/root.file_list 2013-01-08 15:00:00.000000000 +0100 +++ new/installation-images-13.65/data/root/root.file_list 2013-01-14 10:55:13.000000000 +0100 @@ -86,9 +86,8 @@ fillup: / -insserv: - /etc - /sbin +insserv-compat: + / tar: /bin/tar @@ -517,9 +516,7 @@ /etc/{services,protocols} lvm2: - /sbin/lv* - /sbin/pv* - /sbin/vg* + / libsepol*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/data/root/zenroot.file_list new/installation-images-13.65/data/root/zenroot.file_list --- old/installation-images-13.63/data/root/zenroot.file_list 2013-01-08 15:00:00.000000000 +0100 +++ new/installation-images-13.65/data/root/zenroot.file_list 2013-01-14 10:55:42.000000000 +0100 @@ -41,14 +41,13 @@ / libudev*: - /lib* + / fillup: / -insserv: - /etc - /sbin +insserv-compat: + / aaa_base: prein,postin e prein @@ -110,11 +109,11 @@ ?libx86emu1: / -libxml2: - /usr/lib*/libxml2.so.* +libxml2-*: + / -libexpat1: - /lib*/libexpat.so.* +libexpat*: + / libglib-2_0-0: / @@ -151,16 +150,16 @@ /sbin/sfdisk /usr/sbin/setctsid -sysfsutils: - /lib*/libsysfs.so* +libblkid*: + / -libblkid1: - /lib* +libuuid*: + / -libuuid1: - /lib* +libpolkit*: + / -PolicyKit: +polkit: / libselinux1: @@ -190,7 +189,6 @@ /lib*/{libcrypt,libdl,libnsl}{.,-}* /lib*/{libnss_compat,libnss_dns,libnss_files,libnss_hesiod}{.,-}* /lib*/{libnss_nis,libnss_nisplus,libresolv,librt,libutil}{.,-}* - /usr/sbin/rpcinfo /usr/bin /etc/rpc r /usr/bin/{catchsegv,gencat,getconf,getent,glibcbug,iconv,lddlibc4,mtrace,rpcgen,sprof} @@ -213,26 +211,23 @@ /lib*/libcom_err.so.* /lib*/libss.so.* -libuuid1: - /lib*/libuuid.so.* +libsmbios*: + / -libblkid1: - /lib*/libblkid.so.* +libreiserfs-*-*: + / -libsmbios2: - /usr/lib*/libsmbios.so.* +file: + /usr/bin/file -libreiserfs: - /usr/lib*/libdal-*.so.* - /usr/lib*/libreiserfs-*.so.* +libmagic*: + / -file: +libmagic-data: m /usr/share/misc/magic /etc/magic - /usr/lib*/libmagic.so* - /usr/bin/file lilo: - /sbin/{activate,lilo} + / dosfstools: /sbin/{mkdosfs,mkfs.msdos,dosfsck,fsck.msdos} @@ -246,7 +241,7 @@ /etc /sbin /var/adm/fillup-templates -e postin +E postin libtirpc1: /etc @@ -332,8 +327,8 @@ / eject: - /bin/eject - c 755 0 0 /bin/eject + /bin + /usr/bin # remove these: r root mnt tmp usr/libexec @@ -342,9 +337,7 @@ /etc/{services,protocols} lvm2: - /sbin/lv* - /sbin/pv* - /sbin/vg* + / device-mapper: /lib* @@ -403,8 +396,7 @@ /sbin/ip ntfsprogs: - /usr/sbin/ntfsresize - /usr/lib*/libntfs.so* + / dmidecode: /usr/sbin/dmidecode @@ -420,8 +412,7 @@ # /sbin/modify_resolvconf pciutils: - /sbin - /lib*/libpci.so.* + / pciutils-ids: m /usr/share/pci.ids.d/pci.ids.dist /usr/share/pci.ids @@ -448,12 +439,8 @@ dos2unix: /usr/bin/dos2unix -ncpfs: - /etc - /sbin - /usr/bin - /usr/sbin - /usr/lib* +?ncpfs: + / ftp: /usr/bin/ftp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/install.i386 new/installation-images-13.65/install.i386 --- old/installation-images-13.63/install.i386 2013-01-08 15:00:00.000000000 +0100 +++ new/installation-images-13.65/install.i386 2013-01-14 08:54:07.000000000 +0100 @@ -42,6 +42,9 @@ [ -f "$i" ] && cp $i $DESTDIR/branding/$theme/CD1/boot/$ARCH done + # might be missing if theme does not really exist + mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH/loader + # initrd goes to 'loader' dir if [ -e $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd ] ; then mv $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd $DESTDIR/branding/$theme/CD1/boot/$ARCH/loader/initrd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.63/lib/AddFiles.pm new/installation-images-13.65/lib/AddFiles.pm --- old/installation-images-13.63/lib/AddFiles.pm 2013-01-08 15:00:00.000000000 +0100 +++ new/installation-images-13.65/lib/AddFiles.pm 2013-01-14 08:54:07.000000000 +0100 @@ -213,13 +213,16 @@ print "*$ifmsg" if $debug =~ /\bif\b/; + undef $p; + undef $s; + if(/^include\s+(\S+)$/) { die "$Script: recursive include not supported" if $inc_it; $inc_file = $1; die "$Script: no such file list: $inc_file" unless open I, "$ext_dir/$inc_file"; $inc_it = 1; } - elsif(/^(\S*):\s*(\S+)?\s*$/ || !defined($current_pack)) { + elsif((/^(\S*):\s*(\S+)?\s*$/ && ($p = $1, $s = $2, 1)) || !defined($current_pack)) { undef %script; undef @scripts; undef @requires; @@ -228,9 +231,6 @@ undef $current_pack; - $p = $1; - my $s = $2; - if($p =~ s/^\?// && !RealRPM($p)) { print "skipping package $p\n"; next; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
