March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit kiwi for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package kiwi for openSUSE:12.3 checked in at 2013-03-01 07:23:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kiwi (Old) and /work/SRC/openSUSE:12.3/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/kiwi/kiwi.changes 2013-02-23 08:08:34.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kiwi.new/kiwi.changes 2013-03-01 07:23:43.000000000 +0100 @@ -1,0 +2,39 @@ +Thu Feb 28 12:42:42 CET 2013 - ms(a)suse.de + +- v5.04.56 released + +------------------------------------------------------------------- +Thu Feb 28 12:40:22 CET 2013 - ms(a)suse.de + +- fixed KIWILinuxRC::installBootLoaderGrub2() + + install grub2 only in BIOS mode, in EFI mode this doesn't make sense + + make sure the grub2 config file also lands on the EFI (fat) partition + when in UEFI mode the precompiled and signed grub.efi image searches + there for the configuration + +------------------------------------------------------------------- +Wed Feb 27 23:34:30 CET 2013 - ms(a)suse.de + +- v5.04.55 released + +------------------------------------------------------------------- +Wed Feb 27 19:07:20 CET 2013 - ms(a)suse.de + +- fixed UEFI bootloader setup for grub2 based disk images + + fixed creation of image install CDs in EFI mode + + call findAndCopyMagicBlock only if hybrid is requested + +------------------------------------------------------------------- +Mon Feb 25 09:50:01 CET 2013 - ms(a)suse.de + +- v5.04.54 released + +------------------------------------------------------------------- +Mon Feb 25 09:47:51 CET 2013 - ms(a)suse.de + +- added vmxFlavour-uefi and xenFlavour-uefi profiles to the + suse-SLE11-JeOS template image description. Given that + SLE11 SP3 is used these profiles can be used to build + UEFI images based on grub2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.zPLHfY/_old 2013-03-01 07:23:44.000000000 +0100 +++ /var/tmp/diff_new_pack.zPLHfY/_new 2013-03-01 07:23:44.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.53 +Version: 5.04.56 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 @@ -1 +1 @@ -4111e7b900c8cdba3be23213c31ced08931c297b +a3bdf56b57a7da45ec3c0b1a317ad7a197a1efa4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2013-02-27 23:54:12.000000000 +0100 @@ -904,13 +904,14 @@ my $base; my $opts; if ($bootloader eq "grub2") { - # let mkisofs run grub2 eltorito image... - $base = "-V \"$volid\" -A \"$appid\" "; - $base.= "-R -J -f -b boot/grub2/i386-pc/eltorito.img -no-emul-boot "; - $base.= "-boot-load-size 4 -boot-info-table -udf -allow-limited-size "; + # let mkisofs run grub2 efi or eltorito image... + $base = "-V \"$volid\" -A \"$appid\" -R -J -f "; if (($firmware eq "efi") || ($firmware eq "uefi")) { - $base.= "-eltorito-alt-boot -b boot/$efi_arch/efi "; - $base.= "-no-emul-boot "; + $base.= "-b boot/$efi_arch/efi -no-emul-boot "; + } else { + $base.= "-b boot/grub2/i386-pc/eltorito.img -no-emul-boot "; + $base.= "-boot-load-size 4 -boot-info-table -udf "; + $base.= "-allow-limited-size "; } $opts.= "-joliet-long "; } elsif ($bootloader eq "grub") { @@ -3326,8 +3327,8 @@ #========================================== # Stage files #------------------------------------------ - $stages{bios}{initrd} = "'usr/lib/grub2/$grubpc/*'"; - $stages{bios}{stageSRC} = "/usr/lib/grub2/$grubpc"; + $stages{bios}{initrd} = "'usr/lib/$grub/$grubpc/*'"; + $stages{bios}{stageSRC} = "/usr/lib/$grub/$grubpc"; $stages{bios}{stageDST} = "/boot/grub2/$grubpc"; if (($firmware eq "efi") || ($firmware eq "uefi")) { $stages{efi}{initrd} = "'usr/lib/$grub/$efipc/*'"; @@ -3341,12 +3342,27 @@ $stages{efi}{signed} = "usr/$lib/efi/grub.efi"; } #========================================== + # Module lists for self created grub images + #------------------------------------------ + my @bios_core_modules = ( + 'biosdisk','part_msdos','part_gpt','ext2', + 'iso9660','chain','normal','linux','echo', + 'vga','vbe','png','video_bochs','video_cirrus', + 'gzio','multiboot','search','configfile','fat' + ); + my @efi_core_modules = ( + 'fat','ext2','part_gpt','efi_gop','iso9660','chain', + 'linux','echo','configfile','boot','search_label', + 'search_fs_file','search','search_fs_uuid','ls', + 'video','video_fb','normal' + ); + #========================================== # Boot directories #------------------------------------------ my @bootdir = (); if (($firmware eq "efi") || ($firmware eq "uefi")) { push @bootdir,"$tmpdir/boot/grub2-efi/$efipc"; - push @bootdir,"$tmpdir/boot/grub2/$grubpc"; + push @bootdir,"$tmpdir/boot/grub2/$efipc"; push @bootdir,"$tmpdir/EFI/BOOT"; } else { push @bootdir,"$tmpdir/boot/grub2/$grubpc"; @@ -3364,7 +3380,8 @@ #------------------------------------------ $kiwi -> info ("Creating grub2 boot partition map"); foreach my $bootfile ($bootbios,$bootefi) { - next if (($bootfile eq $bootefi) && ($firmware ne "efi")); + next if (($bootfile eq $bootbios) && ($firmware =~ /efi/)); + next if (($bootfile eq $bootefi) && ($firmware eq 'bios')); my $bpfd = FileHandle -> new(); if (! $bpfd -> open(">$bootfile")) { $kiwi -> failed (); @@ -3416,7 +3433,8 @@ # import Grub2 stage files... #------------------------------------------ foreach my $stage ('bios','efi') { - next if (($stage eq "efi") && ($firmware !~ /efi/)); + next if (($stage eq "bios") && ($firmware =~ /efi/)); + next if (($stage eq "efi") && ($firmware eq 'bios')); my $stageD = $stages{$stage}{stageSRC}; my $stageT = $stages{$stage}{stageDST}; if (glob($tmpdir.$stageD.'/*')) { @@ -3444,57 +3462,29 @@ } $kiwi -> done(); #========================================== - # Create core/eltorito grub2 boot images + # Lookup grub2 mkimage tool #------------------------------------------ - $kiwi -> info ("Creating grub2 core boot image"); - my $core = "$tmpdir/boot/grub2/$grubpc/core.img"; - my @modules = ( - 'biosdisk','part_msdos','part_gpt','ext2', - 'iso9660','chain','normal','linux','echo', - 'vga','vbe','png','video_bochs','video_cirrus', - 'gzio','multiboot','search','configfile','fat' - ); - $status = qxx ( - "grub2-mkimage -O i386-pc -o $core -c $bootbios @modules 2>&1" - ); - $result = $? >> 8; - if ($result != 0) { + my $locator = KIWILocator -> new(); + my $grub2_mkimage = $locator -> getExecPath ("grub2-mkimage"); + if ($firmware =~ /efi/) { + my $grub2_efi_mkimage = $locator -> getExecPath ( + "grub2-efi-mkimage" + ); + if ($grub2_efi_mkimage) { + $grub2_mkimage = $grub2_efi_mkimage; + } + } + if (! $grub2_mkimage) { $kiwi -> failed (); - $kiwi -> error ("Couldn't create core boot image: $status"); + $kiwi -> error ("Can't find grub2 mkimage tool"); $kiwi -> failed (); return; } - $kiwi -> done(); - if ((defined $type) && ($type eq "iso")) { - $kiwi -> info ("Creating grub2 eltorito boot image"); - my $cdimg = "$tmpdir/boot/grub2/$grubpc/eltorito.img"; - my $cdcore = "$tmpdir/boot/grub2/$grubpc/cdboot.img"; - $status = qxx ("cat $cdcore $core > $cdimg 2>&1"); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> failed (); - $kiwi -> error ("Couldn't create eltorito image: $status"); - $kiwi -> failed (); - return; - } - $kiwi -> done(); - } #========================================== # Create core efi boot image, standard EFI #------------------------------------------ if ($firmware eq "efi") { $kiwi -> info ("Creating grub2 efi boot image"); - my $locator = KIWILocator -> new(); - my $grub2_mkimage = $locator -> getExecPath ("grub2-efi-mkimage"); - if (! $grub2_mkimage) { - $grub2_mkimage = $locator -> getExecPath ("grub2-mkimage"); - } - if (! $grub2_mkimage) { - $kiwi -> failed (); - $kiwi -> error ("Can't find grub2 mkimage tool"); - $kiwi -> failed (); - return; - } my $core = "$tmpdir/EFI/BOOT/bootx64.efi"; my @modules = ( 'fat','ext2','part_gpt','efi_gop','iso9660','chain', @@ -3582,6 +3572,44 @@ } $kiwi -> done(); } + #========================================== + # Create core grub2 boot images + #------------------------------------------ + if ($firmware eq 'bios') { + $kiwi -> info ("Creating grub2 core boot image"); + my $format = $grubpc; + my $bootconf = $bootbios; + my @modules = @bios_core_modules; + my $core = "$tmpdir/boot/grub2/$format/core.img"; + my $cdimg = "$tmpdir/boot/grub2/$format/eltorito.img"; + my $cdcore = "$tmpdir/boot/grub2/$format/cdboot.img"; + my $status = qxx ( + "$grub2_mkimage -O $format -o $core -c $bootconf @modules 2>&1" + ); + my $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create core boot image: $status"); + $kiwi -> failed (); + return; + } + $kiwi -> done(); + #========================================== + # Create eltorito grub2 boot image + #------------------------------------------ + if ((defined $type) && ($type eq "iso")) { + $kiwi -> info ("Creating grub2 eltorito boot image"); + $status = qxx ("cat $cdcore $core > $cdimg"); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create eltorito image: $status"); + $kiwi -> failed (); + return; + } + $kiwi -> done(); + } + } } #========================================== # Grub @@ -4219,6 +4247,12 @@ } } $FD -> close(); + #========================================== + # copy grub2 config file to efi path too + #------------------------------------------ + if ($config eq 'grub2-efi') { + qxx ("cp $tmpdir/boot/$config/grub.cfg $tmpdir/EFI/BOOT 2>&1"); + } } $kiwi -> done(); } @@ -5024,7 +5058,7 @@ #========================================== # No install required with EFI bios #------------------------------------------ - if ($firmware ne "efi") { + if (($firmware ne "efi") && ($firmware ne "uefi")) { $kiwi -> info ("Installing grub2 on device: $diskname"); #========================================== # Create device map for the disk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2013-02-22 15:07:56.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-02-28 12:43:42.000000000 +0100 @@ -294,7 +294,10 @@ push @UmountStack,"kpartx -d $loop"; $this->{UmountStack} = \@UmountStack; $loop =~ s/\/dev\///; - $source = "/dev/mapper/".$loop."p2"; + $source = "/dev/mapper/".$loop."p3"; + if (! -b $source) { + $source = "/dev/mapper/".$loop."p2"; + } if (! -b $source) { $source = "/dev/mapper/".$loop."p1"; } @@ -931,7 +934,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.53"; + $data{Version} = "5.04.56"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/modules/KIWIIsoLinux.pm 2013-02-27 23:54:12.000000000 +0100 @@ -806,6 +806,7 @@ my $ldir_cnt = 0; my %type; my $cmdln; + my $hybrid; #========================================== # Lookup firmware setup #------------------------------------------ @@ -815,6 +816,9 @@ if ($type{firmware}) { $firmware = $type{firmware}; } + if ($type{hybrid}) { + $hybrid = $type{hybrid}; + } #========================================== # check for pre bootloader install #------------------------------------------ @@ -860,7 +864,7 @@ #========================================== # Call mkisofs second stage #------------------------------------------ - if ($firmware eq "efi" || $firmware eq "uefi") { + if (($hybrid) && (($firmware eq "efi" || $firmware eq "uefi"))) { if (! $this -> findAndCopyMagicBlock()) { $kiwi -> error ("Failed to read magic iso header"); $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2013-02-28 12:43:42.000000000 +0100 @@ -887,26 +887,55 @@ # ---- local confTool=grub2-mkconfig local instTool=grub2-install - local confPath=/boot/grub2/grub.cfg - if [ "$partedTableType" = "gpt" ];then + local confPath_grub=/boot/grub2/grub.cfg + local confPath_uefi=/boot/EFI/EFI/BOOT/grub.cfg + local isEFI=0 + #====================================== + # check for EFI and mount EFI partition + #-------------------------------------- + if [ ! -z "$kiwi_JumpPart" ] && [ -d /boot/EFI ];then + local jdev=$(ddn $imageDiskDevice $kiwi_JumpPart) + if ! mount $jdev /boot/EFI;then + Echo "Failed to mount EFI boot partition" + return 1 + fi + isEFI=1 + fi + #====================================== + # lookup grub2 mkconfig tool + #-------------------------------------- + if [ $isEFI -eq 1 ];then which grub2-efi-mkconfig &>/dev/null && confTool=grub2-efi-mkconfig - which grub2-efi-install &>/dev/null && instTool=grub2-efi-install - confPath=/boot/grub2-efi/grub.cfg + confPath_grub=/boot/grub2-efi/grub.cfg fi if ! which $confTool &>/dev/null;then Echo "Image doesn't have grub2 installed" Echo "Can't install boot loader" return 1 fi - $confTool > $confPath + #====================================== + # create grub2 configuration + #-------------------------------------- + $confTool > $confPath_grub if [ ! $? = 0 ];then Echo "Failed to create grub2 boot configuration" return 1 fi - $instTool $imageDiskDevice 1>&2 - if [ ! $? = 0 ];then - Echo "Failed to install boot loader" + if [ $isEFI -eq 1 ] && [ -e $confPath_uefi ];then + cp $confPath_grub $confPath_uefi + umount /boot/EFI + fi + #====================================== + # install grub2 in BIOS mode + #-------------------------------------- + if [ $isEFI -eq 0 ];then + $instTool $imageDiskDevice 1>&2 + if [ ! $? = 0 ];then + Echo "Failed to install boot loader" + return 1 + fi fi + return 0 } #====================================== # installBootLoaderYaboot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE11-JeOS/config.xml new/kiwi/template/ix86/suse-SLE11-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE11-JeOS/config.xml 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE11-JeOS/config.xml 2013-02-27 23:54:12.000000000 +0100 @@ -2,17 +2,19 @@ <image schemaversion="5.6" name="LimeJeOS-SLE11"> <description type="system"> - <author>Christoph Thiel</author> - <contact>cthiel(a)novell.com</contact> + <author>Marcus Schäfer</author> + <contact>ms(a)suse.de</contact> <specification>SUSE Linux Enterprise 11 JeOS</specification> </description> <profiles> <profile name="vmxFlavour" description="VMX with default kernel" import="true"/> + <profile name="vmxFlavour-uefi" description="VMX with default kernel and UEFI support"/> <profile name="xenFlavour" description="VMX with Xen kernel"/> + <profile name="xenFlavour-uefi" description="VMX with Xen kernel and UEFI support"/> <profile name="vmxFlavour-s390" description="VMX for s390 with default kernel"/> </profiles> <preferences> - <version>1.1.0</version> + <version>1.11.3</version> <packagemanager>zypper</packagemanager> <bootsplash-theme>SLES</bootsplash-theme> <bootloader-theme>SLES</bootloader-theme> @@ -57,6 +59,41 @@ </machine> </type> </preferences> + <preferences profiles="xenFlavour-uefi"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" bootprofile="xen" bootkernel="xenk" bootloader="grub2" firmware="uefi"> + <machine memory="512" domain="domU"> + <vmdisk controller="ide" id="0" device="/dev/xvda"/> + <vmnic interface=""/> + </machine> + </type> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" bootprofile="xen" bootkernel="xenk" installiso="true" bootloader="grub2" firmware="uefi"> + <oemconfig> + <oem-systemsize>2048</oem-systemsize> + <oem-swap>true</oem-swap> + </oemconfig> + <machine domain="dom0"> + <vmdisk controller="scsi" id="0"/> + </machine> + </type> + </preferences> + <preferences profiles="vmxFlavour-uefi"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" format="vmdk" bootloader="grub2" firmware="uefi"> + <machine memory="512" guestOS="suse" HWversion="4"> + <vmdisk controller="scsi" id="0"/> + <vmnic driver="e1000" interface="0" mode="bridged"/> + </machine> + </type> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" installiso="true" bootloader="grub2" firmware="uefi"> + <oemconfig> + <oem-systemsize>2048</oem-systemsize> + <oem-swap>true</oem-swap> + </oemconfig> + <machine memory="512" guestOS="suse" HWversion="4"> + <vmdisk controller="scsi" id="0"/> + <vmnic driver="e1000" interface="0" mode="bridged"/> + </machine> + </type> + </preferences> <users group="root"> <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> </users> @@ -117,6 +154,12 @@ <package name="lvm2"/> <package name="syslinux"/> </packages> + <packages type="image" profiles="vmxFlavour-uefi,xenFlavour-uefi"> + <package name="grub2" bootinclude="true"/> + <package name="grub2-x86_64-efi" arch="x86_64" bootinclude="true"/> + <package name="shim" arch="x86_64" bootinclude="true"/> + <package name="bootsplash-branding-SLES" bootinclude="true" bootdelete="true"/> + </packages> <packages type="image" profiles="vmxFlavour,xenFlavour"> <package name="grub"/> <package name="bootsplash-branding-SLES" bootinclude="true" bootdelete="true"/> @@ -125,13 +168,13 @@ <packages type="image" profiles="vmxFlavour-s390"> <package name="zipl"/> </packages> - <packages type="image" profiles="xenFlavour"> + <packages type="image" profiles="xenFlavour,xenFlavour-uefi"> <package name="kernel-xen" replaces="kernel-default"/> <package name="kernel-xen-base" replaces="kernel-default-base"/> <package name="xen-tools-domU" replaces=""/> <package name="xen" replaces=""/> </packages> - <packages type="image" profiles="vmxFlavour,vmxFlavour-s390"> + <packages type="image" profiles="vmxFlavour,vmxFlavour-s390,vmxFlavour-uefi"> <package name="kernel-default" replaces="kernel-xen"/> <package name="kernel-default-base" replaces="kernel-xen-base"/> <package name="kernel-default-base" replaces="xen-tools-domU"/> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2013-03-01 07:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2013-02-23 08:08:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-03-01 07:23:33.000000000 +0100 @@ -1,0 +2,39 @@ +Thu Feb 28 12:42:42 CET 2013 - ms(a)suse.de + +- v5.04.56 released + +------------------------------------------------------------------- +Thu Feb 28 12:40:22 CET 2013 - ms(a)suse.de + +- fixed KIWILinuxRC::installBootLoaderGrub2() + + install grub2 only in BIOS mode, in EFI mode this doesn't make sense + + make sure the grub2 config file also lands on the EFI (fat) partition + when in UEFI mode the precompiled and signed grub.efi image searches + there for the configuration + +------------------------------------------------------------------- +Wed Feb 27 23:34:30 CET 2013 - ms(a)suse.de + +- v5.04.55 released + +------------------------------------------------------------------- +Wed Feb 27 19:07:20 CET 2013 - ms(a)suse.de + +- fixed UEFI bootloader setup for grub2 based disk images + + fixed creation of image install CDs in EFI mode + + call findAndCopyMagicBlock only if hybrid is requested + +------------------------------------------------------------------- +Mon Feb 25 09:50:01 CET 2013 - ms(a)suse.de + +- v5.04.54 released + +------------------------------------------------------------------- +Mon Feb 25 09:47:51 CET 2013 - ms(a)suse.de + +- added vmxFlavour-uefi and xenFlavour-uefi profiles to the + suse-SLE11-JeOS template image description. Given that + SLE11 SP3 is used these profiles can be used to build + UEFI images based on grub2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.XuOdPi/_old 2013-03-01 07:23:35.000000000 +0100 +++ /var/tmp/diff_new_pack.XuOdPi/_new 2013-03-01 07:23:35.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.53 +Version: 5.04.56 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 @@ -1 +1 @@ -4111e7b900c8cdba3be23213c31ced08931c297b +a3bdf56b57a7da45ec3c0b1a317ad7a197a1efa4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2013-02-27 23:54:12.000000000 +0100 @@ -904,13 +904,14 @@ my $base; my $opts; if ($bootloader eq "grub2") { - # let mkisofs run grub2 eltorito image... - $base = "-V \"$volid\" -A \"$appid\" "; - $base.= "-R -J -f -b boot/grub2/i386-pc/eltorito.img -no-emul-boot "; - $base.= "-boot-load-size 4 -boot-info-table -udf -allow-limited-size "; + # let mkisofs run grub2 efi or eltorito image... + $base = "-V \"$volid\" -A \"$appid\" -R -J -f "; if (($firmware eq "efi") || ($firmware eq "uefi")) { - $base.= "-eltorito-alt-boot -b boot/$efi_arch/efi "; - $base.= "-no-emul-boot "; + $base.= "-b boot/$efi_arch/efi -no-emul-boot "; + } else { + $base.= "-b boot/grub2/i386-pc/eltorito.img -no-emul-boot "; + $base.= "-boot-load-size 4 -boot-info-table -udf "; + $base.= "-allow-limited-size "; } $opts.= "-joliet-long "; } elsif ($bootloader eq "grub") { @@ -3326,8 +3327,8 @@ #========================================== # Stage files #------------------------------------------ - $stages{bios}{initrd} = "'usr/lib/grub2/$grubpc/*'"; - $stages{bios}{stageSRC} = "/usr/lib/grub2/$grubpc"; + $stages{bios}{initrd} = "'usr/lib/$grub/$grubpc/*'"; + $stages{bios}{stageSRC} = "/usr/lib/$grub/$grubpc"; $stages{bios}{stageDST} = "/boot/grub2/$grubpc"; if (($firmware eq "efi") || ($firmware eq "uefi")) { $stages{efi}{initrd} = "'usr/lib/$grub/$efipc/*'"; @@ -3341,12 +3342,27 @@ $stages{efi}{signed} = "usr/$lib/efi/grub.efi"; } #========================================== + # Module lists for self created grub images + #------------------------------------------ + my @bios_core_modules = ( + 'biosdisk','part_msdos','part_gpt','ext2', + 'iso9660','chain','normal','linux','echo', + 'vga','vbe','png','video_bochs','video_cirrus', + 'gzio','multiboot','search','configfile','fat' + ); + my @efi_core_modules = ( + 'fat','ext2','part_gpt','efi_gop','iso9660','chain', + 'linux','echo','configfile','boot','search_label', + 'search_fs_file','search','search_fs_uuid','ls', + 'video','video_fb','normal' + ); + #========================================== # Boot directories #------------------------------------------ my @bootdir = (); if (($firmware eq "efi") || ($firmware eq "uefi")) { push @bootdir,"$tmpdir/boot/grub2-efi/$efipc"; - push @bootdir,"$tmpdir/boot/grub2/$grubpc"; + push @bootdir,"$tmpdir/boot/grub2/$efipc"; push @bootdir,"$tmpdir/EFI/BOOT"; } else { push @bootdir,"$tmpdir/boot/grub2/$grubpc"; @@ -3364,7 +3380,8 @@ #------------------------------------------ $kiwi -> info ("Creating grub2 boot partition map"); foreach my $bootfile ($bootbios,$bootefi) { - next if (($bootfile eq $bootefi) && ($firmware ne "efi")); + next if (($bootfile eq $bootbios) && ($firmware =~ /efi/)); + next if (($bootfile eq $bootefi) && ($firmware eq 'bios')); my $bpfd = FileHandle -> new(); if (! $bpfd -> open(">$bootfile")) { $kiwi -> failed (); @@ -3416,7 +3433,8 @@ # import Grub2 stage files... #------------------------------------------ foreach my $stage ('bios','efi') { - next if (($stage eq "efi") && ($firmware !~ /efi/)); + next if (($stage eq "bios") && ($firmware =~ /efi/)); + next if (($stage eq "efi") && ($firmware eq 'bios')); my $stageD = $stages{$stage}{stageSRC}; my $stageT = $stages{$stage}{stageDST}; if (glob($tmpdir.$stageD.'/*')) { @@ -3444,57 +3462,29 @@ } $kiwi -> done(); #========================================== - # Create core/eltorito grub2 boot images + # Lookup grub2 mkimage tool #------------------------------------------ - $kiwi -> info ("Creating grub2 core boot image"); - my $core = "$tmpdir/boot/grub2/$grubpc/core.img"; - my @modules = ( - 'biosdisk','part_msdos','part_gpt','ext2', - 'iso9660','chain','normal','linux','echo', - 'vga','vbe','png','video_bochs','video_cirrus', - 'gzio','multiboot','search','configfile','fat' - ); - $status = qxx ( - "grub2-mkimage -O i386-pc -o $core -c $bootbios @modules 2>&1" - ); - $result = $? >> 8; - if ($result != 0) { + my $locator = KIWILocator -> new(); + my $grub2_mkimage = $locator -> getExecPath ("grub2-mkimage"); + if ($firmware =~ /efi/) { + my $grub2_efi_mkimage = $locator -> getExecPath ( + "grub2-efi-mkimage" + ); + if ($grub2_efi_mkimage) { + $grub2_mkimage = $grub2_efi_mkimage; + } + } + if (! $grub2_mkimage) { $kiwi -> failed (); - $kiwi -> error ("Couldn't create core boot image: $status"); + $kiwi -> error ("Can't find grub2 mkimage tool"); $kiwi -> failed (); return; } - $kiwi -> done(); - if ((defined $type) && ($type eq "iso")) { - $kiwi -> info ("Creating grub2 eltorito boot image"); - my $cdimg = "$tmpdir/boot/grub2/$grubpc/eltorito.img"; - my $cdcore = "$tmpdir/boot/grub2/$grubpc/cdboot.img"; - $status = qxx ("cat $cdcore $core > $cdimg 2>&1"); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> failed (); - $kiwi -> error ("Couldn't create eltorito image: $status"); - $kiwi -> failed (); - return; - } - $kiwi -> done(); - } #========================================== # Create core efi boot image, standard EFI #------------------------------------------ if ($firmware eq "efi") { $kiwi -> info ("Creating grub2 efi boot image"); - my $locator = KIWILocator -> new(); - my $grub2_mkimage = $locator -> getExecPath ("grub2-efi-mkimage"); - if (! $grub2_mkimage) { - $grub2_mkimage = $locator -> getExecPath ("grub2-mkimage"); - } - if (! $grub2_mkimage) { - $kiwi -> failed (); - $kiwi -> error ("Can't find grub2 mkimage tool"); - $kiwi -> failed (); - return; - } my $core = "$tmpdir/EFI/BOOT/bootx64.efi"; my @modules = ( 'fat','ext2','part_gpt','efi_gop','iso9660','chain', @@ -3582,6 +3572,44 @@ } $kiwi -> done(); } + #========================================== + # Create core grub2 boot images + #------------------------------------------ + if ($firmware eq 'bios') { + $kiwi -> info ("Creating grub2 core boot image"); + my $format = $grubpc; + my $bootconf = $bootbios; + my @modules = @bios_core_modules; + my $core = "$tmpdir/boot/grub2/$format/core.img"; + my $cdimg = "$tmpdir/boot/grub2/$format/eltorito.img"; + my $cdcore = "$tmpdir/boot/grub2/$format/cdboot.img"; + my $status = qxx ( + "$grub2_mkimage -O $format -o $core -c $bootconf @modules 2>&1" + ); + my $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create core boot image: $status"); + $kiwi -> failed (); + return; + } + $kiwi -> done(); + #========================================== + # Create eltorito grub2 boot image + #------------------------------------------ + if ((defined $type) && ($type eq "iso")) { + $kiwi -> info ("Creating grub2 eltorito boot image"); + $status = qxx ("cat $cdcore $core > $cdimg"); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create eltorito image: $status"); + $kiwi -> failed (); + return; + } + $kiwi -> done(); + } + } } #========================================== # Grub @@ -4219,6 +4247,12 @@ } } $FD -> close(); + #========================================== + # copy grub2 config file to efi path too + #------------------------------------------ + if ($config eq 'grub2-efi') { + qxx ("cp $tmpdir/boot/$config/grub.cfg $tmpdir/EFI/BOOT 2>&1"); + } } $kiwi -> done(); } @@ -5024,7 +5058,7 @@ #========================================== # No install required with EFI bios #------------------------------------------ - if ($firmware ne "efi") { + if (($firmware ne "efi") && ($firmware ne "uefi")) { $kiwi -> info ("Installing grub2 on device: $diskname"); #========================================== # Create device map for the disk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2013-02-22 15:07:56.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-02-28 12:43:42.000000000 +0100 @@ -294,7 +294,10 @@ push @UmountStack,"kpartx -d $loop"; $this->{UmountStack} = \@UmountStack; $loop =~ s/\/dev\///; - $source = "/dev/mapper/".$loop."p2"; + $source = "/dev/mapper/".$loop."p3"; + if (! -b $source) { + $source = "/dev/mapper/".$loop."p2"; + } if (! -b $source) { $source = "/dev/mapper/".$loop."p1"; } @@ -931,7 +934,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.53"; + $data{Version} = "5.04.56"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/modules/KIWIIsoLinux.pm 2013-02-27 23:54:12.000000000 +0100 @@ -806,6 +806,7 @@ my $ldir_cnt = 0; my %type; my $cmdln; + my $hybrid; #========================================== # Lookup firmware setup #------------------------------------------ @@ -815,6 +816,9 @@ if ($type{firmware}) { $firmware = $type{firmware}; } + if ($type{hybrid}) { + $hybrid = $type{hybrid}; + } #========================================== # check for pre bootloader install #------------------------------------------ @@ -860,7 +864,7 @@ #========================================== # Call mkisofs second stage #------------------------------------------ - if ($firmware eq "efi" || $firmware eq "uefi") { + if (($hybrid) && (($firmware eq "efi" || $firmware eq "uefi"))) { if (! $this -> findAndCopyMagicBlock()) { $kiwi -> error ("Failed to read magic iso header"); $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2013-02-28 12:43:42.000000000 +0100 @@ -887,26 +887,55 @@ # ---- local confTool=grub2-mkconfig local instTool=grub2-install - local confPath=/boot/grub2/grub.cfg - if [ "$partedTableType" = "gpt" ];then + local confPath_grub=/boot/grub2/grub.cfg + local confPath_uefi=/boot/EFI/EFI/BOOT/grub.cfg + local isEFI=0 + #====================================== + # check for EFI and mount EFI partition + #-------------------------------------- + if [ ! -z "$kiwi_JumpPart" ] && [ -d /boot/EFI ];then + local jdev=$(ddn $imageDiskDevice $kiwi_JumpPart) + if ! mount $jdev /boot/EFI;then + Echo "Failed to mount EFI boot partition" + return 1 + fi + isEFI=1 + fi + #====================================== + # lookup grub2 mkconfig tool + #-------------------------------------- + if [ $isEFI -eq 1 ];then which grub2-efi-mkconfig &>/dev/null && confTool=grub2-efi-mkconfig - which grub2-efi-install &>/dev/null && instTool=grub2-efi-install - confPath=/boot/grub2-efi/grub.cfg + confPath_grub=/boot/grub2-efi/grub.cfg fi if ! which $confTool &>/dev/null;then Echo "Image doesn't have grub2 installed" Echo "Can't install boot loader" return 1 fi - $confTool > $confPath + #====================================== + # create grub2 configuration + #-------------------------------------- + $confTool > $confPath_grub if [ ! $? = 0 ];then Echo "Failed to create grub2 boot configuration" return 1 fi - $instTool $imageDiskDevice 1>&2 - if [ ! $? = 0 ];then - Echo "Failed to install boot loader" + if [ $isEFI -eq 1 ] && [ -e $confPath_uefi ];then + cp $confPath_grub $confPath_uefi + umount /boot/EFI + fi + #====================================== + # install grub2 in BIOS mode + #-------------------------------------- + if [ $isEFI -eq 0 ];then + $instTool $imageDiskDevice 1>&2 + if [ ! $? = 0 ];then + Echo "Failed to install boot loader" + return 1 + fi fi + return 0 } #====================================== # installBootLoaderYaboot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE11-JeOS/config.xml new/kiwi/template/ix86/suse-SLE11-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE11-JeOS/config.xml 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE11-JeOS/config.xml 2013-02-27 23:54:12.000000000 +0100 @@ -2,17 +2,19 @@ <image schemaversion="5.6" name="LimeJeOS-SLE11"> <description type="system"> - <author>Christoph Thiel</author> - <contact>cthiel(a)novell.com</contact> + <author>Marcus Schäfer</author> + <contact>ms(a)suse.de</contact> <specification>SUSE Linux Enterprise 11 JeOS</specification> </description> <profiles> <profile name="vmxFlavour" description="VMX with default kernel" import="true"/> + <profile name="vmxFlavour-uefi" description="VMX with default kernel and UEFI support"/> <profile name="xenFlavour" description="VMX with Xen kernel"/> + <profile name="xenFlavour-uefi" description="VMX with Xen kernel and UEFI support"/> <profile name="vmxFlavour-s390" description="VMX for s390 with default kernel"/> </profiles> <preferences> - <version>1.1.0</version> + <version>1.11.3</version> <packagemanager>zypper</packagemanager> <bootsplash-theme>SLES</bootsplash-theme> <bootloader-theme>SLES</bootloader-theme> @@ -57,6 +59,41 @@ </machine> </type> </preferences> + <preferences profiles="xenFlavour-uefi"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" bootprofile="xen" bootkernel="xenk" bootloader="grub2" firmware="uefi"> + <machine memory="512" domain="domU"> + <vmdisk controller="ide" id="0" device="/dev/xvda"/> + <vmnic interface=""/> + </machine> + </type> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" bootprofile="xen" bootkernel="xenk" installiso="true" bootloader="grub2" firmware="uefi"> + <oemconfig> + <oem-systemsize>2048</oem-systemsize> + <oem-swap>true</oem-swap> + </oemconfig> + <machine domain="dom0"> + <vmdisk controller="scsi" id="0"/> + </machine> + </type> + </preferences> + <preferences profiles="vmxFlavour-uefi"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" format="vmdk" bootloader="grub2" firmware="uefi"> + <machine memory="512" guestOS="suse" HWversion="4"> + <vmdisk controller="scsi" id="0"/> + <vmnic driver="e1000" interface="0" mode="bridged"/> + </machine> + </type> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" installiso="true" bootloader="grub2" firmware="uefi"> + <oemconfig> + <oem-systemsize>2048</oem-systemsize> + <oem-swap>true</oem-swap> + </oemconfig> + <machine memory="512" guestOS="suse" HWversion="4"> + <vmdisk controller="scsi" id="0"/> + <vmnic driver="e1000" interface="0" mode="bridged"/> + </machine> + </type> + </preferences> <users group="root"> <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> </users> @@ -117,6 +154,12 @@ <package name="lvm2"/> <package name="syslinux"/> </packages> + <packages type="image" profiles="vmxFlavour-uefi,xenFlavour-uefi"> + <package name="grub2" bootinclude="true"/> + <package name="grub2-x86_64-efi" arch="x86_64" bootinclude="true"/> + <package name="shim" arch="x86_64" bootinclude="true"/> + <package name="bootsplash-branding-SLES" bootinclude="true" bootdelete="true"/> + </packages> <packages type="image" profiles="vmxFlavour,xenFlavour"> <package name="grub"/> <package name="bootsplash-branding-SLES" bootinclude="true" bootdelete="true"/> @@ -125,13 +168,13 @@ <packages type="image" profiles="vmxFlavour-s390"> <package name="zipl"/> </packages> - <packages type="image" profiles="xenFlavour"> + <packages type="image" profiles="xenFlavour,xenFlavour-uefi"> <package name="kernel-xen" replaces="kernel-default"/> <package name="kernel-xen-base" replaces="kernel-default-base"/> <package name="xen-tools-domU" replaces=""/> <package name="xen" replaces=""/> </packages> - <packages type="image" profiles="vmxFlavour,vmxFlavour-s390"> + <packages type="image" profiles="vmxFlavour,vmxFlavour-s390,vmxFlavour-uefi"> <package name="kernel-default" replaces="kernel-xen"/> <package name="kernel-default-base" replaces="kernel-xen-base"/> <package name="kernel-default-base" replaces="xen-tools-domU"/> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package installation-images for openSUSE:12.3 checked in at 2013-03-01 07:22:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/installation-images/installation-images.changes 2013-02-26 06:52:09.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.installation-images.new/installation-images.changes 2013-03-01 07:22:22.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 26 15:12:41 CET 2013 - snwint(a)suse.de + +- add nfs mount to initrd (bnc #799496) + +------------------------------------------------------------------- +Tue Feb 26 12:10:52 CET 2013 - snwint(a)suse.de + +- ppc64 fixes + +------------------------------------------------------------------- Old: ---- installation-images-13.75.tar.bz2 New: ---- installation-images-13.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.KfYOLl/_old 2013-03-01 07:22:23.000000000 +0100 +++ /var/tmp/diff_new_pack.KfYOLl/_new 2013-03-01 07:22:23.000000000 +0100 @@ -375,9 +375,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.75 +Version: 13.77 Release: 0 -Source: installation-images-13.75.tar.bz2 +Source: installation-images-13.77.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.75.tar.bz2 -> installation-images-13.77.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/VERSION new/installation-images-13.77/VERSION --- old/installation-images-13.75/VERSION 2013-02-25 16:05:54.000000000 +0100 +++ new/installation-images-13.77/VERSION 2013-02-26 15:12:37.000000000 +0100 @@ -1 +1 @@ -13.75 +13.77 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/bin/mk_ppc_installation-images_bootbinaries.sh new/installation-images-13.77/bin/mk_ppc_installation-images_bootbinaries.sh --- old/installation-images-13.75/bin/mk_ppc_installation-images_bootbinaries.sh 2013-02-06 14:17:27.000000000 +0100 +++ new/installation-images-13.77/bin/mk_ppc_installation-images_bootbinaries.sh 2013-02-26 12:08:47.000000000 +0100 @@ -46,8 +46,8 @@ gzip -fcv9 /boot/vmlinux-*-default > $CD1/suseboot/linux32.gz fi if test "$do_64" = "true" ; then -cp -pfv $bdir/initrd-ppc64 $CD1/suseboot/initrd64 -gzip -fcv9 /boot/vmlinux-*-ppc64 > $CD1/suseboot/linux64.gz +cp -pfv $bdir/initrd-default $CD1/suseboot/initrd64 +gzip -fcv9 /boot/vmlinux-*-default > $CD1/suseboot/linux64.gz fi if [ -f /lib/lilo/chrp/mkzimage_cmdline ] ; then @@ -59,15 +59,15 @@ if test "$do_64" = "true" ; then /bin/mkzimage \ --board chrp \ - --vmlinux /boot/vmlinux-*-ppc64 \ - --initrd $bdir/initrd-ppc64 \ + --vmlinux /boot/vmlinux-*-default \ + --initrd $bdir/initrd-default \ --output $CD1/suseboot/inst64 # if test "42" = "false" ; then /bin/mkzimage \ --board iseries \ - --vmlinux /boot/vmlinux-*-ppc64 \ - --initrd $bdir/initrd-ppc64 \ + --vmlinux /boot/vmlinux-*-default \ + --initrd $bdir/initrd-default \ --output $CD1/ISERIES64 fi # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/changelog new/installation-images-13.77/changelog --- old/installation-images-13.75/changelog 2013-02-25 16:05:57.000000000 +0100 +++ new/installation-images-13.77/changelog 2013-02-26 15:12:40.000000000 +0100 @@ -1,4 +1,10 @@ -2013-02-25: sl_12.3-HEAD +2013-02-26: sl_12.3-HEAD + - add nfs mount to initrd (bnc #799496) + +2013-02-26: sl_12.3-13.76 + - ppc64 fixes + +2013-02-25: sl_12.3-13.75 - include ip compat links 2013-02-13: sl_12.3-13.74 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/initrd/all_modules new/installation-images-13.77/data/initrd/all_modules --- old/installation-images-13.75/data/initrd/all_modules 2013-02-06 14:17:27.000000000 +0100 +++ new/installation-images-13.77/data/initrd/all_modules 2013-02-26 12:08:47.000000000 +0100 @@ -2089,6 +2089,8 @@ mtouch i586 ia64 ppc x86_64 multipath i586 ia64 ppc ppc64 s390x x86_64 mv643xx_eth ppc +mv88e6060 ppc ppc64 +mv88e6xxx_drv ppc ppc64 mvsas i586 ia64 ppc ppc64 x86_64 mwave i586 x86_64 mwifiex i586 ia64 ppc ppc64 x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/initrd/initrd.file_list new/installation-images-13.77/data/initrd/initrd.file_list --- old/installation-images-13.75/data/initrd/initrd.file_list 2013-02-25 12:53:39.000000000 +0100 +++ new/installation-images-13.77/data/initrd/initrd.file_list 2013-02-26 15:11:17.000000000 +0100 @@ -60,6 +60,9 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +netcfg: + /etc/protocols + libkmod*: / @@ -314,6 +317,10 @@ /usr/sbin/blkid nfs-client: + /sbin/mount.nfs + /sbin/mount.nfs4 + /sbin/umount.nfs + /sbin/umount.nfs4 /var/lib/nfs gpg2: @@ -512,7 +519,7 @@ libdrm*: / - libdrm_intel*: + ?libdrm_intel*: / libdrm_nouveau*: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/rescue/rescue.file_list new/installation-images-13.77/data/rescue/rescue.file_list --- old/installation-images-13.75/data/rescue/rescue.file_list 2013-02-07 13:17:11.000000000 +0100 +++ new/installation-images-13.77/data/rescue/rescue.file_list 2013-02-26 12:08:47.000000000 +0100 @@ -492,9 +492,6 @@ librtas*: / - libservicelog-*-*: - / - libsqlite*-*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/root/root.file_list new/installation-images-13.77/data/root/root.file_list --- old/installation-images-13.75/data/root/root.file_list 2013-02-06 14:35:33.000000000 +0100 +++ new/installation-images-13.77/data/root/root.file_list 2013-02-26 12:08:47.000000000 +0100 @@ -552,6 +552,7 @@ fbset: /etc/fb.modes /sbin/fbset + /usr/sbin/fbset hfsutils: /usr/bin/hattrib @@ -1020,7 +1021,7 @@ xf86-input-synaptics: / - xf86-input-vmmouse: + ?xf86-input-vmmouse: / xf86-input-void: @@ -1038,7 +1039,7 @@ xf86-video-fbdev: / - xf86-video-intel: + ?xf86-video-intel: /usr/<lib>/xorg xf86-video-modesetting: @@ -1059,7 +1060,7 @@ ?xf86-video-vmware: / - libxatracker*: + ?libxatracker*: / # /usr/lib*/xorg/modules/*.uc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/etc/module.config new/installation-images-13.77/etc/module.config --- old/installation-images-13.75/etc/module.config 2013-02-06 14:17:27.000000000 +0100 +++ new/installation-images-13.77/etc/module.config 2013-02-26 12:08:47.000000000 +0100 @@ -405,6 +405,8 @@ 8139too,"RealTek RTL8139" ; pegasos mv643xx_eth,"Marvell MV643XX" +mv88e6060,"mv88e6060" +mv88e6xxx_drv,"mv88e6060" via-rhine,"VIA VT86c100A Rhine-II" ; efika -libphy,"PHY library",- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2013-03-01 07:22:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2013-02-26 07:02:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2013-03-01 07:22:20.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 26 15:12:41 CET 2013 - snwint(a)suse.de + +- add nfs mount to initrd (bnc #799496) + +------------------------------------------------------------------- +Tue Feb 26 12:10:52 CET 2013 - snwint(a)suse.de + +- ppc64 fixes + +------------------------------------------------------------------- Old: ---- installation-images-13.75.tar.bz2 New: ---- installation-images-13.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.EevMb3/_old 2013-03-01 07:22:22.000000000 +0100 +++ /var/tmp/diff_new_pack.EevMb3/_new 2013-03-01 07:22:22.000000000 +0100 @@ -375,9 +375,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.75 +Version: 13.77 Release: 0 -Source: installation-images-13.75.tar.bz2 +Source: installation-images-13.77.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.75.tar.bz2 -> installation-images-13.77.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/VERSION new/installation-images-13.77/VERSION --- old/installation-images-13.75/VERSION 2013-02-25 16:05:54.000000000 +0100 +++ new/installation-images-13.77/VERSION 2013-02-26 15:12:37.000000000 +0100 @@ -1 +1 @@ -13.75 +13.77 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/bin/mk_ppc_installation-images_bootbinaries.sh new/installation-images-13.77/bin/mk_ppc_installation-images_bootbinaries.sh --- old/installation-images-13.75/bin/mk_ppc_installation-images_bootbinaries.sh 2013-02-06 14:17:27.000000000 +0100 +++ new/installation-images-13.77/bin/mk_ppc_installation-images_bootbinaries.sh 2013-02-26 12:08:47.000000000 +0100 @@ -46,8 +46,8 @@ gzip -fcv9 /boot/vmlinux-*-default > $CD1/suseboot/linux32.gz fi if test "$do_64" = "true" ; then -cp -pfv $bdir/initrd-ppc64 $CD1/suseboot/initrd64 -gzip -fcv9 /boot/vmlinux-*-ppc64 > $CD1/suseboot/linux64.gz +cp -pfv $bdir/initrd-default $CD1/suseboot/initrd64 +gzip -fcv9 /boot/vmlinux-*-default > $CD1/suseboot/linux64.gz fi if [ -f /lib/lilo/chrp/mkzimage_cmdline ] ; then @@ -59,15 +59,15 @@ if test "$do_64" = "true" ; then /bin/mkzimage \ --board chrp \ - --vmlinux /boot/vmlinux-*-ppc64 \ - --initrd $bdir/initrd-ppc64 \ + --vmlinux /boot/vmlinux-*-default \ + --initrd $bdir/initrd-default \ --output $CD1/suseboot/inst64 # if test "42" = "false" ; then /bin/mkzimage \ --board iseries \ - --vmlinux /boot/vmlinux-*-ppc64 \ - --initrd $bdir/initrd-ppc64 \ + --vmlinux /boot/vmlinux-*-default \ + --initrd $bdir/initrd-default \ --output $CD1/ISERIES64 fi # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/changelog new/installation-images-13.77/changelog --- old/installation-images-13.75/changelog 2013-02-25 16:05:57.000000000 +0100 +++ new/installation-images-13.77/changelog 2013-02-26 15:12:40.000000000 +0100 @@ -1,4 +1,10 @@ -2013-02-25: sl_12.3-HEAD +2013-02-26: sl_12.3-HEAD + - add nfs mount to initrd (bnc #799496) + +2013-02-26: sl_12.3-13.76 + - ppc64 fixes + +2013-02-25: sl_12.3-13.75 - include ip compat links 2013-02-13: sl_12.3-13.74 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/initrd/all_modules new/installation-images-13.77/data/initrd/all_modules --- old/installation-images-13.75/data/initrd/all_modules 2013-02-06 14:17:27.000000000 +0100 +++ new/installation-images-13.77/data/initrd/all_modules 2013-02-26 12:08:47.000000000 +0100 @@ -2089,6 +2089,8 @@ mtouch i586 ia64 ppc x86_64 multipath i586 ia64 ppc ppc64 s390x x86_64 mv643xx_eth ppc +mv88e6060 ppc ppc64 +mv88e6xxx_drv ppc ppc64 mvsas i586 ia64 ppc ppc64 x86_64 mwave i586 x86_64 mwifiex i586 ia64 ppc ppc64 x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/initrd/initrd.file_list new/installation-images-13.77/data/initrd/initrd.file_list --- old/installation-images-13.75/data/initrd/initrd.file_list 2013-02-25 12:53:39.000000000 +0100 +++ new/installation-images-13.77/data/initrd/initrd.file_list 2013-02-26 15:11:17.000000000 +0100 @@ -60,6 +60,9 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +netcfg: + /etc/protocols + libkmod*: / @@ -314,6 +317,10 @@ /usr/sbin/blkid nfs-client: + /sbin/mount.nfs + /sbin/mount.nfs4 + /sbin/umount.nfs + /sbin/umount.nfs4 /var/lib/nfs gpg2: @@ -512,7 +519,7 @@ libdrm*: / - libdrm_intel*: + ?libdrm_intel*: / libdrm_nouveau*: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/rescue/rescue.file_list new/installation-images-13.77/data/rescue/rescue.file_list --- old/installation-images-13.75/data/rescue/rescue.file_list 2013-02-07 13:17:11.000000000 +0100 +++ new/installation-images-13.77/data/rescue/rescue.file_list 2013-02-26 12:08:47.000000000 +0100 @@ -492,9 +492,6 @@ librtas*: / - libservicelog-*-*: - / - libsqlite*-*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/data/root/root.file_list new/installation-images-13.77/data/root/root.file_list --- old/installation-images-13.75/data/root/root.file_list 2013-02-06 14:35:33.000000000 +0100 +++ new/installation-images-13.77/data/root/root.file_list 2013-02-26 12:08:47.000000000 +0100 @@ -552,6 +552,7 @@ fbset: /etc/fb.modes /sbin/fbset + /usr/sbin/fbset hfsutils: /usr/bin/hattrib @@ -1020,7 +1021,7 @@ xf86-input-synaptics: / - xf86-input-vmmouse: + ?xf86-input-vmmouse: / xf86-input-void: @@ -1038,7 +1039,7 @@ xf86-video-fbdev: / - xf86-video-intel: + ?xf86-video-intel: /usr/<lib>/xorg xf86-video-modesetting: @@ -1059,7 +1060,7 @@ ?xf86-video-vmware: / - libxatracker*: + ?libxatracker*: / # /usr/lib*/xorg/modules/*.uc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.75/etc/module.config new/installation-images-13.77/etc/module.config --- old/installation-images-13.75/etc/module.config 2013-02-06 14:17:27.000000000 +0100 +++ new/installation-images-13.77/etc/module.config 2013-02-26 12:08:47.000000000 +0100 @@ -405,6 +405,8 @@ 8139too,"RealTek RTL8139" ; pegasos mv643xx_eth,"Marvell MV643XX" +mv88e6060,"mv88e6060" +mv88e6xxx_drv,"mv88e6060" via-rhine,"VIA VT86c100A Rhine-II" ; efika -libphy,"PHY library",- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-shell for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package gnome-shell for openSUSE:12.3 checked in at 2013-03-01 07:21:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/gnome-shell (Old) and /work/SRC/openSUSE:12.3/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/gnome-shell/gnome-shell.changes 2013-02-14 20:38:57.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.gnome-shell.new/gnome-shell.changes 2013-03-01 07:21:10.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 22 21:58:09 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 3.6.3.1: + + Fix regression in reentrancy fix for 3.6.3 (bgo#689295). + + Updated translations. +- Drop g-s-fix-notification-expansion.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- g-s-fix-notification-expansion.patch gnome-shell-3.6.3.tar.xz New: ---- gnome-shell-3.6.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.ambFMq/_old 2013-03-01 07:21:10.000000000 +0100 +++ /var/tmp/diff_new_pack.ambFMq/_new 2013-03-01 07:21:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-shell -Version: 3.6.3 +Version: 3.6.3.1 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -28,10 +28,8 @@ Patch1: gnome-shell-private-connection.patch # PATCH-FIX-UPSTREAM gnome-shell-nmlibexecdir.patch bgo#693590 dimstar(a)opensuse.org -- Allow NetworkManager installation to use different libexecdir than gnome-shell Patch2: gnome-shell-nmlibexecdir.patch -# PATCH-FIX-UPSTREAM g-s-fix-notification-expansion.patch bgo#689295 badshah400(a)gmail.com -- Fix notification not expanding into tray, a regression due to earlier commits; patch taken from upstream git -Patch3: g-s-fix-notification-expansion.patch BuildRequires: docbook-xsl-stylesheets -# Needed for patch4 +# Needed for patch2 BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream @@ -137,11 +135,10 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 translation-update-upstream %build -# Needed for patch4 +# Needed for patch2 NOCONFIGURE=1 gnome-autogen.sh export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins %configure \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-shell for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2013-03-01 07:20:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2013-02-14 20:38:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2013-03-01 07:20:52.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 22 21:58:09 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 3.6.3.1: + + Fix regression in reentrancy fix for 3.6.3 (bgo#689295). + + Updated translations. +- Drop g-s-fix-notification-expansion.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- g-s-fix-notification-expansion.patch gnome-shell-3.6.3.tar.xz New: ---- gnome-shell-3.6.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.CVjiRd/_old 2013-03-01 07:20:53.000000000 +0100 +++ /var/tmp/diff_new_pack.CVjiRd/_new 2013-03-01 07:20:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-shell -Version: 3.6.3 +Version: 3.6.3.1 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -28,10 +28,8 @@ Patch1: gnome-shell-private-connection.patch # PATCH-FIX-UPSTREAM gnome-shell-nmlibexecdir.patch bgo#693590 dimstar(a)opensuse.org -- Allow NetworkManager installation to use different libexecdir than gnome-shell Patch2: gnome-shell-nmlibexecdir.patch -# PATCH-FIX-UPSTREAM g-s-fix-notification-expansion.patch bgo#689295 badshah400(a)gmail.com -- Fix notification not expanding into tray, a regression due to earlier commits; patch taken from upstream git -Patch3: g-s-fix-notification-expansion.patch BuildRequires: docbook-xsl-stylesheets -# Needed for patch4 +# Needed for patch2 BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream @@ -137,11 +135,10 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 translation-update-upstream %build -# Needed for patch4 +# Needed for patch2 NOCONFIGURE=1 gnome-autogen.sh export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins %configure \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-packagekit for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:12.3 checked in at 2013-03-01 07:20:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/gnome-packagekit (Old) and /work/SRC/openSUSE:12.3/.gnome-packagekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-packagekit", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/gnome-packagekit/gnome-packagekit.changes 2013-02-11 11:00:08.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.gnome-packagekit.new/gnome-packagekit.changes 2013-03-01 07:20:31.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 26 22:26:58 UTC 2013 - dimstar(a)opensuse.org + +- Update gnome-packagekit-OnlyShowIn.patch: change NoDisplay to + false for gpk-prefs and gpk-update-viewer (bnc#803201). +- Don't mangle categories of gpk-prefs: the upstream ones are just + fine (showing up in Settings). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.Lgs2Dv/_old 2013-03-01 07:20:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Lgs2Dv/_new 2013-03-01 07:20:32.000000000 +0100 @@ -111,7 +111,7 @@ %suse_update_desktop_file gpk-install-catalog %suse_update_desktop_file gpk-install-local-file %suse_update_desktop_file gpk-log Settings -%suse_update_desktop_file -r gpk-prefs GTK GNOME System X-SuSE-ServiceConfiguration +%suse_update_desktop_file gpk-prefs %suse_update_desktop_file gpk-service-pack %suse_update_desktop_file gpk-update-viewer ++++++ gnome-packagekit-OnlyShowIn.patch ++++++ --- /var/tmp/diff_new_pack.Lgs2Dv/_old 2013-03-01 07:20:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Lgs2Dv/_new 2013-03-01 07:20:32.000000000 +0100 @@ -1,7 +1,7 @@ -Index: gnome-packagekit-3.6.0/data/gpk-application.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-application.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-application.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-application.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-application.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-application.desktop.in @@ -6,6 +6,6 @@ Exec=gpk-application Terminal=false Type=Application @@ -10,32 +10,35 @@ +OnlyShowIn=GNOME; StartupNotify=true -Index: gnome-packagekit-3.6.0/data/gpk-log.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-log.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-log.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-log.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-log.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-log.desktop.in @@ -8,4 +8,4 @@ Type=Application NoDisplay=true Categories=GNOME;GTK;System; StartupNotify=true - +OnlyShowIn=GNOME; -Index: gnome-packagekit-3.6.0/data/gpk-prefs.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-prefs.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-prefs.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-prefs.desktop.in -@@ -6,6 +6,6 @@ Exec=gpk-prefs +--- gnome-packagekit-3.6.1.orig/data/gpk-prefs.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-prefs.desktop.in +@@ -5,7 +5,7 @@ Icon=gpk-prefs + Exec=gpk-prefs Terminal=false Type=Application - Categories=Settings;X-GNOME-SystemSettings; +-Categories=Settings;X-GNOME-SystemSettings; -NotShowIn=KDE; ++Categories=Settings;X-GNOME-Settings-Panel; +OnlyShowIn=GNOME; StartupNotify=true - NoDisplay=true -Index: gnome-packagekit-3.6.0/data/gpk-update-viewer.desktop.in +-NoDisplay=true ++NoDisplay=false +Index: gnome-packagekit-3.6.1/data/gpk-update-viewer.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-update-viewer.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-update-viewer.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-update-viewer.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-update-viewer.desktop.in @@ -6,6 +6,6 @@ Exec=gpk-update-viewer Terminal=false Type=Application @@ -43,21 +46,22 @@ -NotShowIn=KDE; +OnlyShowIn=GNOME; StartupNotify=true - NoDisplay=true -Index: gnome-packagekit-3.6.0/data/gpk-service-pack.desktop.in +-NoDisplay=true ++NoDisplay=false +Index: gnome-packagekit-3.6.1/data/gpk-service-pack.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-service-pack.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-service-pack.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-service-pack.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-service-pack.desktop.in @@ -8,4 +8,5 @@ Type=Application NoDisplay=true Categories=GNOME;GTK;System; StartupNotify=true +OnlyShowIn=GNOME; -Index: gnome-packagekit-3.6.0/data/gpk-distro-upgrade.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-distro-upgrade.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-distro-upgrade.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-distro-upgrade.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-distro-upgrade.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-distro-upgrade.desktop.in @@ -6,5 +6,5 @@ Exec=gpk-distro-upgrade Terminal=false Type=Application -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-packagekit for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at 2013-03-01 07:20:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-packagekit (Old) and /work/SRC/openSUSE:Factory/.gnome-packagekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-packagekit", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-packagekit/gnome-packagekit.changes 2013-02-11 11:00:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-packagekit.new/gnome-packagekit.changes 2013-03-01 07:20:28.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 26 22:26:58 UTC 2013 - dimstar(a)opensuse.org + +- Update gnome-packagekit-OnlyShowIn.patch: change NoDisplay to + false for gpk-prefs and gpk-update-viewer (bnc#803201). +- Don't mangle categories of gpk-prefs: the upstream ones are just + fine (showing up in Settings). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.CcpwLl/_old 2013-03-01 07:20:29.000000000 +0100 +++ /var/tmp/diff_new_pack.CcpwLl/_new 2013-03-01 07:20:29.000000000 +0100 @@ -111,7 +111,7 @@ %suse_update_desktop_file gpk-install-catalog %suse_update_desktop_file gpk-install-local-file %suse_update_desktop_file gpk-log Settings -%suse_update_desktop_file -r gpk-prefs GTK GNOME System X-SuSE-ServiceConfiguration +%suse_update_desktop_file gpk-prefs %suse_update_desktop_file gpk-service-pack %suse_update_desktop_file gpk-update-viewer ++++++ gnome-packagekit-OnlyShowIn.patch ++++++ --- /var/tmp/diff_new_pack.CcpwLl/_old 2013-03-01 07:20:29.000000000 +0100 +++ /var/tmp/diff_new_pack.CcpwLl/_new 2013-03-01 07:20:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: gnome-packagekit-3.6.0/data/gpk-application.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-application.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-application.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-application.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-application.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-application.desktop.in @@ -6,6 +6,6 @@ Exec=gpk-application Terminal=false Type=Application @@ -10,32 +10,35 @@ +OnlyShowIn=GNOME; StartupNotify=true -Index: gnome-packagekit-3.6.0/data/gpk-log.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-log.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-log.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-log.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-log.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-log.desktop.in @@ -8,4 +8,4 @@ Type=Application NoDisplay=true Categories=GNOME;GTK;System; StartupNotify=true - +OnlyShowIn=GNOME; -Index: gnome-packagekit-3.6.0/data/gpk-prefs.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-prefs.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-prefs.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-prefs.desktop.in -@@ -6,6 +6,6 @@ Exec=gpk-prefs +--- gnome-packagekit-3.6.1.orig/data/gpk-prefs.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-prefs.desktop.in +@@ -5,7 +5,7 @@ Icon=gpk-prefs + Exec=gpk-prefs Terminal=false Type=Application - Categories=Settings;X-GNOME-SystemSettings; +-Categories=Settings;X-GNOME-SystemSettings; -NotShowIn=KDE; ++Categories=Settings;X-GNOME-Settings-Panel; +OnlyShowIn=GNOME; StartupNotify=true - NoDisplay=true -Index: gnome-packagekit-3.6.0/data/gpk-update-viewer.desktop.in +-NoDisplay=true ++NoDisplay=false +Index: gnome-packagekit-3.6.1/data/gpk-update-viewer.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-update-viewer.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-update-viewer.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-update-viewer.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-update-viewer.desktop.in @@ -6,6 +6,6 @@ Exec=gpk-update-viewer Terminal=false Type=Application @@ -43,21 +46,22 @@ -NotShowIn=KDE; +OnlyShowIn=GNOME; StartupNotify=true - NoDisplay=true -Index: gnome-packagekit-3.6.0/data/gpk-service-pack.desktop.in +-NoDisplay=true ++NoDisplay=false +Index: gnome-packagekit-3.6.1/data/gpk-service-pack.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-service-pack.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-service-pack.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-service-pack.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-service-pack.desktop.in @@ -8,4 +8,5 @@ Type=Application NoDisplay=true Categories=GNOME;GTK;System; StartupNotify=true +OnlyShowIn=GNOME; -Index: gnome-packagekit-3.6.0/data/gpk-distro-upgrade.desktop.in +Index: gnome-packagekit-3.6.1/data/gpk-distro-upgrade.desktop.in =================================================================== ---- gnome-packagekit-3.6.0.orig/data/gpk-distro-upgrade.desktop.in -+++ gnome-packagekit-3.6.0/data/gpk-distro-upgrade.desktop.in +--- gnome-packagekit-3.6.1.orig/data/gpk-distro-upgrade.desktop.in ++++ gnome-packagekit-3.6.1/data/gpk-distro-upgrade.desktop.in @@ -6,5 +6,5 @@ Exec=gpk-distro-upgrade Terminal=false Type=Application -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:12.3 checked in at 2013-03-01 07:20:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/gnome-control-center (Old) and /work/SRC/openSUSE:12.3/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/gnome-control-center/gnome-control-center.changes 2013-01-31 01:18:12.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.gnome-control-center.new/gnome-control-center.changes 2013-03-01 07:20:09.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 26 20:23:09 UTC 2013 - dimstar(a)opensuse.org + +- Do not package gnome-control-center.rules (bnc#804966): On + openSUSE defining the use of the wheel group is up to the + administrator. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.gVmo1E/_old 2013-03-01 07:20:10.000000000 +0100 +++ /var/tmp/diff_new_pack.gVmo1E/_new 2013-03-01 07:20:10.000000000 +0100 @@ -26,7 +26,6 @@ Name: gnome-control-center Version: 3.6.3 Release: 0 -# FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center License: GPL-2.0+ @@ -191,10 +190,10 @@ %install %make_install -%if 0%{?suse_version} <= 1120 -rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif find %{buildroot} -type f -name "*.la" -delete -print + +# We do not package gnome-control-center.rules (bnc#804966) +rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-2.0-timezones %{name}-2.0.lang %suse_update_desktop_file gnome-control-center @@ -245,7 +244,8 @@ %{_datadir}/icons/hicolor/*/*/*.svg %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy -%{_datadir}/polkit-1/rules.d/gnome-control-center.rules +# We do not package gnome-control-center.rules +#{_datadir}/polkit-1/rules.d/gnome-control-center.rules %dir %{_datadir}/sounds/gnome %dir %{_datadir}/sounds/gnome/default %dir %{_datadir}/sounds/gnome/default/alerts -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2013-03-01 07:20:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2013-01-30 15:10:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2013-03-01 07:20:02.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 26 20:23:09 UTC 2013 - dimstar(a)opensuse.org + +- Do not package gnome-control-center.rules (bnc#804966): On + openSUSE defining the use of the wheel group is up to the + administrator. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.jtlEJ0/_old 2013-03-01 07:20:03.000000000 +0100 +++ /var/tmp/diff_new_pack.jtlEJ0/_new 2013-03-01 07:20:03.000000000 +0100 @@ -26,7 +26,6 @@ Name: gnome-control-center Version: 3.6.3 Release: 0 -# FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center License: GPL-2.0+ @@ -191,10 +190,10 @@ %install %make_install -%if 0%{?suse_version} <= 1120 -rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif find %{buildroot} -type f -name "*.la" -delete -print + +# We do not package gnome-control-center.rules (bnc#804966) +rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-2.0-timezones %{name}-2.0.lang %suse_update_desktop_file gnome-control-center @@ -245,7 +244,8 @@ %{_datadir}/icons/hicolor/*/*/*.svg %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy -%{_datadir}/polkit-1/rules.d/gnome-control-center.rules +# We do not package gnome-control-center.rules +#{_datadir}/polkit-1/rules.d/gnome-control-center.rules %dir %{_datadir}/sounds/gnome %dir %{_datadir}/sounds/gnome/default %dir %{_datadir}/sounds/gnome/default/alerts -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0