Hello community, here is the log from the commit of package installation-images for openSUSE:12.3 checked in at 2013-02-04 21:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/installation-images (Old) and /work/SRC/openSUSE:12.3/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/installation-images/installation-images.changes 2013-01-31 01:20:15.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.installation-images.new/installation-images.changes 2013-02-04 21:11:21.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 4 16:25:48 CET 2013 - [email protected] + +- update efi booot config + +------------------------------------------------------------------- Old: ---- installation-images-13.67.tar.bz2 New: ---- installation-images-13.68.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.fMDUuz/_old 2013-02-04 21:11:21.000000000 +0100 +++ /var/tmp/diff_new_pack.fMDUuz/_new 2013-02-04 21:11:21.000000000 +0100 @@ -25,6 +25,7 @@ %define with_vbox 0 %define with_plymouth 1 %define with_efi_graphics 1 +%define with_shim 0 BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: aaa_base @@ -318,6 +319,9 @@ BuildRequires: tftp %endif %ifarch x86_64 +%if %with_shim +BuildRequires: shim +%endif BuildRequires: efibootmgr BuildRequires: glibc-32bit BuildRequires: libncurses5-32bit @@ -372,9 +376,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.67 +Version: 13.68 Release: 0 -Source: installation-images-13.67.tar.bz2 +Source: installation-images-13.68.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.67.tar.bz2 -> installation-images-13.68.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/Makefile new/installation-images-13.68/Makefile --- old/installation-images-13.67/Makefile 2013-01-28 13:51:04.000000000 +0100 +++ new/installation-images-13.68/Makefile 2013-02-04 16:25:37.000000000 +0100 @@ -141,9 +141,9 @@ done boot-grub2-efi: base - image=boot-efi src=boot filelist=grub2-efi fs=none bin/mk_image for theme in $(THEMES) ; do \ - bin/hdimage --size 500k --fit-size --chs 0 4 63 --part-ofs 0 --mkfs fat --add-files tmp/boot-efi/* tmp/boot-efi/.p* -- images/$$theme/efi ; \ + theme=$$theme image=$$theme/EFI tmpdir=boot-efi-$$theme src=boot filelist=grub2-efi fs=dir bin/mk_image ; \ + bin/hdimage --size 500k --fit-size --chs 0 4 63 --part-ofs 0 --mkfs fat --add-files tmp/boot-efi-$$theme/* tmp/boot-efi-$$theme/.p* -- images/$$theme/efi ; \ done boot: base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/VERSION new/installation-images-13.68/VERSION --- old/installation-images-13.67/VERSION 2013-01-28 13:51:07.000000000 +0100 +++ new/installation-images-13.68/VERSION 2013-02-04 16:25:42.000000000 +0100 @@ -1 +1 @@ -13.67 +13.68 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/bin/mk_image new/installation-images-13.68/bin/mk_image --- old/installation-images-13.67/bin/mk_image 2013-01-28 13:51:04.000000000 +0100 +++ new/installation-images-13.68/bin/mk_image 2013-02-04 16:25:37.000000000 +0100 @@ -74,8 +74,8 @@ AddFiles $tmpdir, "${srcdir}/$fl.file_list", $srcdir or die "$Script: failed to setup image"; - if(-f "${BasePath}tmp/$imagename.rpmlog") { - SUSystem "perl -pe 's/\\[(.*?)\\].*/\$1/' ${BasePath}tmp/$imagename.rpmlog | sort -u >$tmpdir/.packages.$imagename"; + if(-f "$tmpdir.rpmlog") { + SUSystem "perl -pe 's/\\[(.*?)\\].*/\$1/' $tmpdir.rpmlog | sort -u >$tmpdir/.packages.$fl"; } # print "fix locale...\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/changelog new/installation-images-13.68/changelog --- old/installation-images-13.67/changelog 2013-01-28 13:51:11.000000000 +0100 +++ new/installation-images-13.68/changelog 2013-02-04 16:25:45.000000000 +0100 @@ -1,4 +1,7 @@ -2013-01-28: HEAD +2013-02-04: HEAD + - update efi booot config + +2013-01-28: 13.67 - tcpd -> libwrap - shim -> shim-unsigned diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/data/base/base.file_list new/installation-images-13.68/data/base/base.file_list --- old/installation-images-13.67/data/base/base.file_list 2013-01-28 13:51:04.000000000 +0100 +++ new/installation-images-13.68/data/base/base.file_list 2013-02-04 16:25:37.000000000 +0100 @@ -143,7 +143,10 @@ libmagic*: / -libmagic-data: +file-magic: + / + +file: / libpopt*: @@ -368,15 +371,6 @@ m /usr/share/ca-certificates/mozilla/* /etc/ssl/certs E c_rehash >/dev/null -?grub2: - / - -?grub2-efi: - / - -?grub2-x86_64-efi: - / - : # remove things we don't need diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/data/boot/grub.cfg new/installation-images-13.68/data/boot/grub.cfg --- old/installation-images-13.67/data/boot/grub.cfg 2013-01-28 13:51:04.000000000 +0100 +++ new/installation-images-13.68/data/boot/grub.cfg 2013-02-04 15:55:51.000000000 +0100 @@ -4,6 +4,9 @@ locale_dir=$prefix/locale lang=en_US +search -f /boot/x86_64/efi --set +prefix=($root)/boot/x86_64 + insmod efi_gop insmod efi_uga insmod gzio diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/data/boot/grub2-efi.file_list new/installation-images-13.68/data/boot/grub2-efi.file_list --- old/installation-images-13.67/data/boot/grub2-efi.file_list 2013-01-28 13:51:04.000000000 +0100 +++ new/installation-images-13.68/data/boot/grub2-efi.file_list 2013-02-04 16:25:37.000000000 +0100 @@ -2,15 +2,30 @@ if arch eq 'x86_64' grub2-x86_64-efi: - # m usr/lib64/efi/grubcd.efi efi/boot/bootx64.efi - # we make our own until grub2 package is ready - e grub2-mkimage -d /usr/lib/grub2/x86_64-efi -O x86_64-efi -o efi/boot/bootx64.efi -p "(cd0)/EFI/BOOT" iso9660 part_msdos part_gpt fat normal configfile + a usr/lib64/efi/grub.efi efi/boot/bootx64.efi # if we have shim, use it - if exists(shim-signed) || exists(shim) + if exists(shim) e mv efi/boot/bootx64.efi efi/boot/grub.efi ?shim: - m /usr/lib64/efi/shim-unsigned.efi efi/boot/bootx64.efi + a /usr/lib64/efi/shim.efi efi/boot/bootx64.efi + endif + + x grub.cfg efi/boot + + # show product name in title instead of default grub string + d efi/boot/locale + x grub2_head.po . + R s/product_name/<product_name>/ grub2_head.po + e msgfmt -o efi/boot/locale/en.mo grub2_head.po + r grub2_head.po + + # grub2-efi with graphics + # this is just for patching grub.cfg + # real themes files are unpacked in theme.file_list + if 1 + ?grub2-branding-<splash_theme>: + R s/^with_gfx=0/with_gfx=1/ efi/boot/grub.cfg endif # elsif arch eq 'ia64' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/data/boot/theme.file_list new/installation-images-13.68/data/boot/theme.file_list --- old/installation-images-13.67/data/boot/theme.file_list 2013-01-28 13:51:04.000000000 +0100 +++ new/installation-images-13.68/data/boot/theme.file_list 2013-02-04 16:25:37.000000000 +0100 @@ -23,31 +23,17 @@ if arch eq 'x86_64' - d grub2-efi - x grub.cfg grub2-efi - - # copy modules until grub2 package is ready - e cp -a /usr/lib/grub2/x86_64-efi grub2-efi - e rm grub2-efi/x86_64-efi/*.module - - # 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 - # grub2-efi with graphics + # grub.cfg is patched in grub2-ef.file_list if 1 ?grub2-branding-<splash_theme>: + d grub2-efi m /usr/share/grub2/themes grub2-efi 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} - grub2: - m /usr/share/grub2/unicode.pf2 grub2-efi - - R s/^with_gfx=0/with_gfx=1/ grub2-efi/grub.cfg + grub2: + m /usr/share/grub2/unicode.pf2 grub2-efi endif endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/data/rescue/rescue.file_list new/installation-images-13.68/data/rescue/rescue.file_list --- old/installation-images-13.67/data/rescue/rescue.file_list 2013-01-28 13:51:05.000000000 +0100 +++ new/installation-images-13.68/data/rescue/rescue.file_list 2013-02-04 16:25:37.000000000 +0100 @@ -54,12 +54,11 @@ libmagic*: / -libmagic-data: - /etc - /usr/share/misc +file-magic: + / file: - /usr/bin + / iproute2: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/data/root/root.file_list new/installation-images-13.68/data/root/root.file_list --- old/installation-images-13.67/data/root/root.file_list 2013-01-28 13:51:05.000000000 +0100 +++ new/installation-images-13.68/data/root/root.file_list 2013-02-04 16:25:37.000000000 +0100 @@ -174,8 +174,8 @@ libmagic*: / -libmagic-data: - m /usr/share/misc/magic /etc/magic +file-magic: + / libelf*: / @@ -260,7 +260,7 @@ / file: - /usr/bin/file + / ?efibootmgr: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.67/install.i386 new/installation-images-13.68/install.i386 --- old/installation-images-13.67/install.i386 2013-01-28 13:51:05.000000000 +0100 +++ new/installation-images-13.68/install.i386 2013-02-04 16:25:37.000000000 +0100 @@ -34,6 +34,11 @@ done done + if [ -d images/$theme/EFI ] ; then + mkdir -p $DESTDIR/branding/$theme/CD1/EFI/BOOT + cp -r images/$theme/EFI/efi/boot/* $DESTDIR/branding/$theme/CD1/EFI/BOOT + fi + cp images/$theme/$theme $DESTDIR/branding/$theme/CD1/boot/$ARCH ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding @@ -64,12 +69,6 @@ $DESTDIR/branding/$theme/CD1/boot/$ARCH/mkbootdisk --syslinux=tmp/base/usr/bin/syslinux --out=$DESTDIR/branding/$theme/FTP/boot/$ARCH/floppy/bootdisk tmp/floppy-$theme fi - # move efi files to /efi/boot - if [ -d $DESTDIR/branding/$theme/CD1/boot/$ARCH/grub2-efi ] ; then - mkdir -p $DESTDIR/branding/$theme/CD1/EFI - mv $DESTDIR/branding/$theme/CD1/boot/$ARCH/grub2-efi $DESTDIR/branding/$theme/CD1/EFI/BOOT - fi - done mkdir -p $DESTDIR/usr/share -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
