Hello community,
here is the log from the commit of package lilo
checked in at Thu May 10 23:31:04 CEST 2007.
--------
--- arch/ppc/lilo/lilo.changes 2007-05-02 10:03:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2007-05-10 14:21:20.075155000 +0200
@@ -1,0 +2,5 @@
+Thu May 10 14:15:54 CEST 2007 - sassmann@suse.de
+
+- added support for ps3 in lilo.new
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.L10620/_old 2007-05-10 23:30:37.000000000 +0200
+++ /var/tmp/diff_new_pack.L10620/_new 2007-05-10 23:30:37.000000000 +0200
@@ -24,7 +24,7 @@
Requires: binutils
Requires: parted
Version: 10.1.22
-Release: 32
+Release: 35
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
# $Id: lilo.spec 870 2006-11-07 12:31:45Z olh $
@@ -157,6 +157,8 @@
%doc %{_mandir}/*/*
%changelog
+* Thu May 10 2007 - sassmann@suse.de
+- added support for ps3 in lilo.new
* Wed May 02 2007 - olh@suse.de
- if the ELF sections in the linker script get renamed, the ld calls
must be updated as well.
++++++ lilo-10.1.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/lilo.new new/lilo-10.1.22/lilo.new
--- old/lilo-10.1.22/lilo.new 2007-04-03 15:58:53.000000000 +0200
+++ new/lilo-10.1.22/lilo.new 2007-05-10 14:20:07.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo.new 955 2007-04-03 13:58:53Z olh $
+# $Id: lilo.new 962 2007-05-10 12:20:07Z sassmann $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -392,6 +392,7 @@
# * chrp
# * pegasos
# * prep
+ # * ps3
# or nothing at all if the boardtype is not recognized
#
local prop
@@ -434,6 +435,9 @@
Pegasos2)
board_type=pegasos
;;
+ PS3PF)
+ board_type=ps3
+ ;;
esac
if test "$board_type" = "pmac"
then
@@ -723,7 +727,7 @@
# work around a YaST bug, which comes from a certain kind of
# intel-architecture blindness, some architectures can guess boot
# drive :-)
- if [[ "$MACHINE" != @(chrp|prep|pegasos) ]]; then
+ if [[ "$MACHINE" != @(chrp|prep|pegasos|ps3) ]]; then
error "boot=<partition> is not specified!"
fi
else
@@ -812,6 +816,55 @@
parse_config_file
check_config_file
+function running_on_ps3() {
+local device
+local kernel_filename
+local initrd_filename
+local root_mount boot_mount
+local file_majorminor file_major file_minor
+local file_sysfs_path
+
+ if [ -f /etc/kboot.conf ]; then
+ return
+ fi
+
+ root_mount=`stat -L -c %D /`
+ boot_mount=`stat -L -c %D /boot/vmlinux`
+
+ if [ "$root_mount" = "$boot_mount" ]; then
+ kernel_filename=/boot/vmlinux
+ initrd_filename=/boot/initrd
+ else
+ kernel_filename=/vmlinux
+ initrd_filename=/initrd
+ fi
+
+ file_majorminor=$(/usr/bin/stat --format="%d" "/boot/vmlinux")
+ file_major="$[file_majorminor >> 8]"
+ file_minor="$[file_majorminor & 255]"
+
+ file_majorminor=$file_major:$file_minor
+
+
+ for i in $(find /sys/block -name dev); do
+ : looking at $i
+ if [ "$(< $i)" = "$file_majorminor" ] ; then file_sysfs_path=$i ; break ; fi
+ done
+
+ if [ -z "$file_sysfs_path" ] ; then
+ error "can not find major:minor $file_majorminor for $file"
+ fi
+ file_sysfs_path="${file_sysfs_path%/dev}"
+ file_sysfs_path="${file_sysfs_path##*/}"
+ device=/dev/$file_sysfs_path
+
+ cat > /etc/kboot.conf <