Hello community,
here is the log from the commit of package lilo
checked in at Wed Jun 14 13:23:59 CEST 2006.
--------
--- arch/ppc/lilo/lilo.changes 2006-05-24 17:13:08.000000000 +0200
+++ lilo/lilo.changes 2006-06-12 14:47:04.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 12 14:30:03 CEST 2006 - jplack@suse.de
+
+- added sas support on Power6, patch by Brian King (#183466)
+- bump version to 10.1.14
+
+-------------------------------------------------------------------
Old:
----
lilo-10.1.13.tar.bz2
yaboot-10.1.13-r716.tar.bz2
New:
----
lilo-10.1.14.tar.bz2
yaboot-10.1.14-r716.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.ZnFfBD/_old 2006-06-14 13:23:24.000000000 +0200
+++ /var/tmp/diff_new_pack.ZnFfBD/_new 2006-06-14 13:23:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lilo (Version 10.1.13)
+# spec file for package lilo (Version 10.1.14)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: lilo
-%define yaboot_vers 10.1.13-r716
+%define yaboot_vers 10.1.14-r716
Group: System/Boot
License: BSD, Other License(s), see package
Summary: The Linux Loader, a Boot Menu
@@ -22,7 +22,7 @@
Requires: gawk sed coreutils
Requires: powerpc-utils
Requires: binutils
-Version: 10.1.13
+Version: 10.1.14
Release: 1
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
@@ -160,6 +160,9 @@
%doc %{_mandir}/*/*
%changelog -n lilo
+* Mon Jun 12 2006 - jplack@suse.de
+- added sas support on Power6, patch by Brian King (#183466)
+- bump version to 10.1.14
* Wed May 24 2006 - jplack@suse.de
- do enhance detection for sub-architecture (#177314)
- handle global initrd option correctly with full OF path (#177481)
++++++ lilo-10.1.13.tar.bz2 -> lilo-10.1.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.13/lilo.new new/lilo-10.1.14/lilo.new
--- old/lilo-10.1.13/lilo.new 2006-05-24 13:47:01.000000000 +0200
+++ new/lilo-10.1.14/lilo.new 2006-05-24 13:47:01.000000000 +0200
@@ -63,7 +63,7 @@
function Usage() {
cat <,
# 2005 Joachim Plack
@@ -62,7 +62,7 @@
shopt -s extglob
-read d myversion d <<< "$Date: 2006-05-12 12:37:04 +0000 (Fri, 12 May 2006) $"
+read d myversion d <<< "$Date: 2006-06-12 12:27:01 +0000 (Mon, 12 Jun 2006) $"
function error() {
@@ -273,9 +273,15 @@
file_of_hw_devtype=/proc/device-tree${file_of_hw_devtype}
dbg_show file_of_hw_devtype
if ! [ -f ${file_of_hw_devtype}/device_type ]; then
- # check for scsi@$of_disk_scsi_chan/device_type else bail out ..
- file_of_hw_devtype=$(printf "%s/scsi@%x" $file_of_hw_devtype $of_disk_scsi_chan)
- dbg_show file_of_hw_devtype
+ if ! [ -d ${file_of_hw_devtype}/sas ]; then
+ # check for scsi@$of_disk_scsi_chan/device_type else bail out ..
+ file_of_hw_devtype=$(printf "%s/scsi@%x" $file_of_hw_devtype $of_disk_scsi_chan)
+ dbg_show file_of_hw_devtype
+ else
+ # check for sas/device_type else bail out ..
+ file_of_hw_devtype=$(printf "%s/sas" $file_of_hw_devtype)
+ dbg_show file_of_hw_devtype
+ fi
fi
if ! [ -f ${file_of_hw_devtype}/device_type ] ; then
error "no device_type found in ${file_of_hw_devtype}"
@@ -305,6 +311,9 @@
scsi*)
file_storage_type=scsi
;;
+ sas*)
+ file_storage_type=sas
+ ;;
ide|ata)
# TODO
# check for right file-storage_type == ide ??
@@ -386,6 +395,19 @@
$of_disk_scsi_dir $of_disk_scsi_id $of_disk_scsi_lun
)
;;
+ sas)
+ if [ -d ${file_of_hw_devtype}/disk ]; then
+ of_disk_scsi_dir=disk
+ else
+ error "Could not find a known hard disk directory under '${file_of_hw_devtype}'"
+ fi
+ (( of_disk_addr = ( (of_disk_scsi_chan<<16) | (of_disk_scsi_id<<8) | of_disk_scsi_lun ) )); #
+
+ file_of_hw_path=$(
+ printf "%s/%s@%x,%x" "${file_of_hw_devtype##/proc/device-tree}" \
+ $of_disk_scsi_dir $of_disk_addr $of_disk_scsi_lun
+ )
+ ;;
fcp)
declare of_disk_fc_dir
declare of_disk_fc_lun=$of_disk_scsi_lun
@@ -540,6 +562,10 @@
scsi)
file_of_hw_path=$(printf "%s/sd@%x,%x" "${of_device_path##/proc/device-tree}" $of_disk_scsi_id $of_disk_scsi_lun)
;;
+ sas)
+ (( of_disk_addr = ( (of_disk_scsi_chan<<16) | (of_disk_scsi_id<<8) | of_disk_scsi_lun ) )); #
+ file_of_hw_path=$(printf "%s/disk@%x,%x" "${of_device_path##/proc/device-tree}" $of_disk_addr $of_disk_scsi_lun)
+ ;;
sata)
file_of_hw_path="${of_device_path##/proc/device-tree}"
;;
++++++ yaboot-10.1.13-r716.tar.bz2 -> yaboot-10.1.14-r716.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.13-r716/Makefile new/yaboot-10.1.14-r716/Makefile
--- old/yaboot-10.1.13-r716/Makefile 2006-05-24 16:32:14.000000000 +0200
+++ new/yaboot-10.1.14-r716/Makefile 2006-06-12 14:34:58.000000000 +0200
@@ -6,7 +6,7 @@
include Config
-VERSION = 10.1.13-r716
+VERSION = 10.1.14-r716
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org