Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2013-01-10 13:06:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-11 11:25:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2013-01-10 13:06:06.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Jan 9 10:31:25 CET 2013 - [email protected] + +- turn on efi graphics + +------------------------------------------------------------------- +Tue Jan 8 15:00:11 CET 2013 - [email protected] + +- unscd -> nscd +- adjust module config +- switch to grub2 for efi boot iso + +------------------------------------------------------------------- Old: ---- installation-images-13.61.tar.bz2 New: ---- installation-images-13.63.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.7ttHep/_old 2013-01-10 13:06:07.000000000 +0100 +++ /var/tmp/diff_new_pack.7ttHep/_new 2013-01-10 13:06:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package installation-images # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ %define with_vnc 1 %define with_vbox 0 %define with_plymouth 1 +%define with_efi_graphics 1 BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: aaa_base @@ -194,7 +195,7 @@ BuildRequires: telnet-server BuildRequires: termcap BuildRequires: terminfo -BuildRequires: unscd +BuildRequires: nscd BuildRequires: usbutils BuildRequires: util-linux BuildRequires: uuid-runtime @@ -342,6 +343,9 @@ BuildRequires: gfxboot-branding-SLED BuildRequires: gfxboot-branding-SLES %endif +%if %with_efi_graphics +BuildRequires: grub2-branding-openSUSE +%endif %endif %ifnarch s390 s390x #BuildRequires: enic-kmp-default fnic-kmp-default ofed-kmp-default @@ -367,9 +371,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.61 +Version: 13.63 Release: 0 -Source: installation-images-13.61.tar.bz2 +Source: installation-images-13.63.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.61.tar.bz2 -> installation-images-13.63.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/Makefile new/installation-images-13.63/Makefile --- old/installation-images-13.61/Makefile 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/Makefile 2013-01-08 14:59:59.000000000 +0100 @@ -15,7 +15,7 @@ endif ifneq ($(filter x86_64, $(ARCH)),) -ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel boot-efi boot boot-themes $(COMMON_TARGETS) +ALL_TARGETS := initrd-themes initrd biostest initrd+modules+gefrickel boot-grub2-efi boot boot-themes $(COMMON_TARGETS) INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS) BOOT_PARTS := boot/* initrd biostest efi endif @@ -140,6 +140,12 @@ rm -rf tmp/boot-efi/efi/boot/initrd ; \ 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 ; \ + done + boot: base image=boot fs=dir bin/mk_image diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/VERSION new/installation-images-13.63/VERSION --- old/installation-images-13.61/VERSION 2012-12-11 11:00:05.000000000 +0100 +++ new/installation-images-13.63/VERSION 2013-01-09 10:31:19.000000000 +0100 @@ -1 +1 @@ -13.61 +13.63 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/bin/mk_image new/installation-images-13.63/bin/mk_image --- old/installation-images-13.61/bin/mk_image 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/bin/mk_image 2013-01-08 14:59:59.000000000 +0100 @@ -181,7 +181,8 @@ next if $x =~ m#^/proc/#; next if $x =~ m#^/dev/#; - next if -e "$dir$x"; + # don't verify symlinks to symlinks + next if -l "$dir$x" || -e _; } else { next if -e; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/changelog new/installation-images-13.63/changelog --- old/installation-images-13.61/changelog 2012-12-11 11:00:08.000000000 +0100 +++ new/installation-images-13.63/changelog 2013-01-09 10:31:23.000000000 +0100 @@ -1,4 +1,12 @@ -2012-12-11: HEAD +2013-01-09: HEAD + - turn on efi graphics + +2013-01-08: 13.62 + - unscd -> nscd + - adjust module config + - switch to grub2 for efi boot iso + +2012-12-11: 13.61 - adust to package changes 2012-11-26: 13.60 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/base/base.file_list new/installation-images-13.63/data/base/base.file_list --- old/installation-images-13.61/data/base/base.file_list 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/data/base/base.file_list 2013-01-08 14:59:59.000000000 +0100 @@ -345,6 +345,26 @@ x mk_yast2_trans bin/mk_yast2_trans E mk_yast2_trans yast2-trans-allpacks.requires +libfuse*: + / + +libudev*: + / + +device-mapper: + / + +?grub2: + / + +?grub2-efi: + / + +?grub2-i386-pc: + / + +?grub2-x86_64-efi: + / : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/boot/grub.cfg new/installation-images-13.63/data/boot/grub.cfg --- old/installation-images-13.61/data/boot/grub.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-13.63/data/boot/grub.cfg 2013-01-08 14:59:54.000000000 +0100 @@ -0,0 +1,56 @@ +with_gfx=0 + +gfxmode=auto +locale_dir=$prefix/locale +lang=en_US + +insmod efi_gop +insmod efi_uga +insmod gfxterm +insmod gzio +insmod gettext +terminal_output gfxterm + +loadfont $prefix/unicode.pf2 + +if [ "$with_gfx" = 1 ] ; then + theme=$prefix/themes/openSUSE/theme.txt + export theme + + insmod gfxmenu + insmod png + + loadfont $prefix/themes/openSUSE/ascii.pf2 + loadfont $prefix/themes/openSUSE/DejaVuSans10.pf2 + loadfont $prefix/themes/openSUSE/DejaVuSans12.pf2 + loadfont $prefix/themes/openSUSE/DejaVuSans-Bold14.pf2 +fi + +if sleep --interruptible 0 ; then + timeout=60 +fi + +menuentry 'Installation' --class opensuse --class gnu-linux --class gnu --class os { + set gfxpayload=keep + echo 'Loading kernel ...' + linux /boot/x86_64/loader/linux + echo 'Loading initial ramdisk ...' + initrd /boot/x86_64/loader/initrd +} + +menuentry 'Rescue System' --class opensuse --class gnu-linux --class gnu { + set gfxpayload=keep + echo 'Loading kernel ...' + linux /boot/x86_64/loader/linux rescue=1 + echo 'Loading initial ramdisk ...' + initrd /boot/x86_64/loader/initrd +} + +menuentry 'Check Installaton Media' --class opensuse --class gnu-linux --class gnu { + set gfxpayload=keep + echo 'Loading kernel ...' + linux /boot/x86_64/loader/linux mediacheck=1 + echo 'Loading initial ramdisk ...' + initrd /boot/x86_64/loader/initrd +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/boot/grub2-efi.file_list new/installation-images-13.63/data/boot/grub2-efi.file_list --- old/installation-images-13.61/data/boot/grub2-efi.file_list 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-13.63/data/boot/grub2-efi.file_list 2013-01-08 14:59:54.000000000 +0100 @@ -0,0 +1,7 @@ +d /efi/boot + +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 +# elsif arch eq 'ia64' +endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/boot/theme.file_list new/installation-images-13.63/data/boot/theme.file_list --- old/installation-images-13.61/data/boot/theme.file_list 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/data/boot/theme.file_list 2013-01-09 10:30:18.000000000 +0100 @@ -21,3 +21,22 @@ endif + +if arch eq 'x86_64' + d grub2-efi + x grub.cfg grub2-efi + e cp -a /usr/lib/grub2/x86_64-efi grub2-efi + e rm grub2-efi/x86_64-efi/*.module + e cp /usr/share/grub2/unicode.pf2 grub2-efi + + # grub2-efi with graphics + if 1 + ?grub2-branding-<splash_theme>: + 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} + + R s/^with_gfx=0/with_gfx=1/ grub2-efi/grub.cfg + endif + +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/initrd/initrd.file_list new/installation-images-13.63/data/initrd/initrd.file_list --- old/installation-images-13.61/data/initrd/initrd.file_list 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/data/initrd/initrd.file_list 2013-01-09 09:33:16.000000000 +0100 @@ -275,9 +275,6 @@ dhcpcd: / -libnl-*: - / - libnl3-*: / @@ -431,7 +428,7 @@ libpcre*: / -unscd: +nscd: # remaining files are in root image d /var/run/nscd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/rescue/rescue.file_list new/installation-images-13.63/data/rescue/rescue.file_list --- old/installation-images-13.61/data/rescue/rescue.file_list 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/data/rescue/rescue.file_list 2013-01-09 09:33:32.000000000 +0100 @@ -30,9 +30,6 @@ libtalloc*: /usr/lib*/libtalloc.so.* -libxtables*: - / - libkmod*: / @@ -158,7 +155,7 @@ libpopt*: / -unscd: +nscd: / tcpd: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/data/root/root.file_list new/installation-images-13.63/data/root/root.file_list --- old/installation-images-13.61/data/root/root.file_list 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/data/root/root.file_list 2013-01-08 15:00:00.000000000 +0100 @@ -704,9 +704,9 @@ libnscd: / -unscd: +nscd: /etc - /usr/sbin + /usr libustr-*-*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/etc/module.config new/installation-images-13.63/etc/module.config --- old/installation-images-13.61/etc/module.config 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/etc/module.config 2013-01-08 15:00:00.000000000 +0100 @@ -135,6 +135,11 @@ libore objlayoutdriver virtio_pci,-,-,,virtio_blk virtio_net virtio_balloon +ac97_bus +target_core_mod +rc-core +ezusb + kernel/drivers/hv/.* kernel/drivers/staging/hv/.* kernel/arch/.*/crypto/.* @@ -252,6 +257,8 @@ virtio_net,"Virtio network" vmxnet3,VMware vmxnet3 virtual NIC xen-vnif,"Xen Network" +vxlan +af_packet_diag kernel/drivers/net/hyperv/.* kernel/drivers/net/team/.* @@ -260,7 +267,10 @@ kernel/drivers/net/tokenring/.* kernel/drivers/net/can/.* kernel/drivers/net/phy/.* +kernel/drivers/net/ieee802154/.* kernel/drivers/misc/sgi-xp/.* +kernel/net/ieee802154/.* +kernel/net/mac802154/.* kernel/net/ipv4/.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.61/etc/module.list new/installation-images-13.63/etc/module.list --- old/installation-images-13.61/etc/module.list 2012-12-11 10:59:40.000000000 +0100 +++ new/installation-images-13.63/etc/module.list 2013-01-08 15:00:00.000000000 +0100 @@ -205,6 +205,13 @@ kernel/drivers/hv/ kernel/drivers/staging/hv/ +kernel/drivers/usb/misc/ezusb.ko +kernel/net/ieee802154/ieee802154.ko +kernel/net/mac802154/ +kernel/drivers/media/rc/rc-core.ko +kernel/sound/ac97_bus.ko +kernel/drivers/target/target_core_mod.ko + # kmps updates/ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
