Hello community, here is the log from the commit of package lilo for openSUSE:11.4 checked in at Fri Feb 18 14:07:04 CET 2011. -------- --- old-versions/11.4/all/lilo/lilo.changes 2010-09-30 11:04:09.000000000 +0200 +++ /mounts/work_src_done/11.4/lilo/lilo.changes 2011-02-11 14:14:04.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 11 13:05:15 UTC 2011 - dvaleev@novell.com + +- don't try to set bootinfo-linux variable + Not needed for fat boot partitions + +------------------------------------------------------------------- +Thu Feb 10 17:51:36 UTC 2011 - dvaleev@novell.com + +- require powerpc-utils 1.2.6 +- changed nvsetenv to nvram + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- lilo.ppc.nvram-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.cez2xs/_old 2011-02-18 14:07:03.000000000 +0100 +++ /var/tmp/diff_new_pack.cez2xs/_new 2011-02-18 14:07:03.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lilo (Version 22.8) +# spec file for package lilo # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -36,9 +36,9 @@ Requires: gawk Requires: sed Requires: coreutils -# for nvsetenv +# for nvram %if 0%{?suse_version} > 1000 -Requires: powerpc-utils +Requires: powerpc-utils >= 1.2.6 %else Requires: util-linux %endif @@ -62,7 +62,7 @@ %endif %endif Version: 22.8 -Release: 51 +Release: 53.<RELEASE2> Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 @@ -71,6 +71,7 @@ Patch8603: lilo.x86.division-by-zero.patch Patch8604: lilo.x86.checkit.patch Patch8605: lilo-no-build-date.patch +Patch8606: lilo.ppc.nvram-fix.patch # $Id: lilo.spec 1188 2008-12-09 14:29:53Z olh $ %description @@ -105,6 +106,7 @@ %patch8604 -p1 %patch8605 popd +%patch8606 %build %ifarch %ix86 x86_64 ++++++ lilo.ppc.nvram-fix.patch ++++++ diff -Nur lilo.ppc.old/lilo-chrp.lib lilo.ppc/lilo-chrp.lib --- lilo.ppc.old/lilo-chrp.lib 2008-11-05 13:54:13.000000000 +0100 +++ lilo.ppc/lilo-chrp.lib 2011-02-11 14:01:35.000000000 +0100 @@ -649,7 +649,10 @@ fi if (( fat_boot == 1 )); then - nvsetenv bootinfo-linux "${boot_path},\\ppc\\bootinfo.txt" + #don't set bootinfo-linux + #as for fat partitions it not needed + #even we have no file there + #nvram --update-config bootinfo-linux="${boot_path},\\ppc\\bootinfo.txt" boot_path=${boot_path},yaboot elif [[ "${p_flags[*]}" != *type=41*type=41* ]]; then # open firmware is confused about more than one PReP partition, in that @@ -660,14 +663,14 @@ if [ "$OPTION_ACTIVATE" = "yes" ] ; then echo "Prepending '$boot_path'" to open firmware variable boot-device - local -a bootdevice=( $(nvsetenv boot-device) ) + local -a bootdevice=( $(nvram --print-config=boot-device) ) bootdevice[0]=${bootdevice[0]#boot-device=} for (( i=${#bootdevice[*]}; i-- >0; )); do if [[ "${bootdevice[$i]}" == ${boot_path}* ]]; then unset bootdevice[$i]; fi done - nvsetenv boot-device "$boot_path ${bootdevice[*]}" + nvram --update-config boot-device="$boot_path ${bootdevice[*]}" else warning "boot path not set to boot linux as requested" \ diff -Nur lilo.ppc.old/lilo-pmac.lib lilo.ppc/lilo-pmac.lib --- lilo.ppc.old/lilo-pmac.lib 2008-11-05 13:54:13.000000000 +0100 +++ lilo.ppc/lilo-pmac.lib 2011-02-11 14:01:51.000000000 +0100 @@ -381,7 +381,7 @@ if [ "$OPTION_ACTIVATE" = "yes" ] ; then NV_BOOT_PATH=$(get_of_path $OPTION_BOOT) echo set OF boot-device $NV_BOOT_PATH",\\\\:tbxi" - nvsetenv boot-device $NV_BOOT_PATH",\\\\:tbxi" + nvram --update-config boot-device=$NV_BOOT_PATH",\\\\:tbxi" fi } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org