Hello community,
here is the log from the commit of package lilo
checked in at Fri Oct 24 17:15:29 CEST 2008.
--------
--- arch/i386/lilo/lilo.changes 2008-10-23 10:19:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-10-24 17:04:21.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Oct 24 17:03:43 CEST 2008 - olh@suse.de
+
+- handle ibmvfc in show_of_path.sh (bnc#438689 - LTC49376)
+
+-------------------------------------------------------------------
+Fri Oct 24 08:16:11 CEST 2008 - olh@suse.de
+
+- remove debug output from yaboot iscsi path (bnc#417539)
+
+-------------------------------------------------------------------
+Thu Oct 23 14:21:12 CEST 2008 - olh@suse.de
+
+- fix serial-number handling on pmac in yaboot
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yaboot-22.8-r1159.tar.bz2
New:
----
yaboot-22.8-r1165.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.R30879/_old 2008-10-24 17:15:16.000000000 +0200
+++ /var/tmp/diff_new_pack.R30879/_new 2008-10-24 17:15:16.000000000 +0200
@@ -21,7 +21,7 @@
Name: lilo
ExclusiveArch: ppc ppc64 %ix86 x86_64
-%define yaboot_vers 22.8-r1159
+%define yaboot_vers 22.8-r1165
Group: System/Boot
License: BSD 3-Clause
Summary: The Linux Loader, a Boot Menu
@@ -56,7 +56,7 @@
%endif
%endif
Version: 22.8
-Release: 33
+Release: 34
Source0: lilo-ppc-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
Source86: lilo-%{version}.src.tar.bz2
@@ -222,6 +222,12 @@
%endif
%doc %{_mandir}/*/*
%changelog
+* Fri Oct 24 2008 olh@suse.de
+- handle ibmvfc in show_of_path.sh (bnc#438689 - LTC49376)
+* Fri Oct 24 2008 olh@suse.de
+- remove debug output from yaboot iscsi path (bnc#417539)
+* Thu Oct 23 2008 olh@suse.de
+- fix serial-number handling on pmac in yaboot
* Thu Oct 23 2008 olh@suse.de
- use BuildRequires gcc-32bit on x86_64 only with SuSE > 10.1
- remove unused BuildRequires libgcc42-32bit on x86_64
++++++ lilo-ppc-22.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/show_of_path.sh new/lilo-ppc-22.8/show_of_path.sh
--- old/lilo-ppc-22.8/show_of_path.sh 2008-07-01 16:15:12.000000000 +0200
+++ new/lilo-ppc-22.8/show_of_path.sh 2008-10-24 17:04:21.000000000 +0200
@@ -2,7 +2,7 @@
# vim: syntax=off ts=4
# set -ex
#
-# $Id: show_of_path.sh 1072 2008-07-01 14:15:12Z olh $
+# $Id: show_of_path.sh 1166 2008-10-24 15:04:21Z olh $
# find a OF bootpath on Apple PowerMacintosh Newworld machines
# Copyright (C) 2000, 2004 Olaf Hering ,
# 2005 Joachim Plack
@@ -42,7 +42,7 @@
}' EXIT
shopt -s extglob
-read d myversion d <<< "$Date: 2008-07-01 14:15:12 +0000 (Tue, 01 Jul 2008) $"
+read d myversion d <<< "$Date: 2008-10-24 15:04:21 +0000 (Fri, 24 Oct 2008) $"
function error() {
@@ -129,6 +129,23 @@
fi
}
+#
+# int_to_scsilun
+# Conversion routine for SCSI HBTL LUN => SCSI LUN name
+#
+function int_to_scsilun() {
+ local lunint=$1
+ local A B C D
+
+ A=$(( ($lunint >> 8) & 0xff ))
+ B=$(($lunint & 0xff))
+ C=$(( ($lunint >> 24) & 0xff ))
+ D=$(( ($lunint >> 16) & 0xff ))
+
+ local lunstr=$(printf "%02x%02x%02x%02x00000000" $A $B $C $D)
+ echo "$lunstr"
+}
+
# if no file path is given on cmd line check for root file system
file=/
#
@@ -542,6 +559,7 @@
device_id=$(read_int ${file_of_hw_devtype}/device-id)
vendor_id=$(read_int ${file_of_hw_devtype}/vendor-id)
+ read compatible < ${file_of_hw_devtype}/compatible
dbg_show device_id vendor_id
@@ -560,6 +578,9 @@
elif (( vendor_id == 0x1077 )); then
# PCI_VENDOR_ID_QLOGIC==0x1077
lun_format="%04x000000000000"
+ elif [[ "$compatible" == "IBM,vfc-client" ]]; then
+ of_disk_fc_lun=`int_to_scsilun $of_disk_scsi_lun`
+ lun_format="%s"
fi
file_of_hw_path=$(
++++++ yaboot-22.8-r1159.tar.bz2 -> yaboot-22.8-r1165.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1159/Changelog.SuSE new/yaboot-22.8-r1165/Changelog.SuSE
--- old/yaboot-22.8-r1159/Changelog.SuSE 2008-10-21 09:38:43.000000000 +0200
+++ new/yaboot-22.8-r1165/Changelog.SuSE 2008-10-24 08:16:59.000000000 +0200
@@ -1,4 +1,20 @@
------------------------------------------------------------------------
+r1165 | olh | 2008-10-24 06:16:59 +0000 (Fri, 24 Oct 2008) | 2 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/parse_device_path.c
+
++- remove debug output from yaboot iscsi path (bnc#417539)
+
+------------------------------------------------------------------------
+r1164 | olh | 2008-10-23 12:21:47 +0000 (Thu, 23 Oct 2008) | 2 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/yaboot.c
+
++- fix serial-number handling on pmac in yaboot
+
+------------------------------------------------------------------------
r1159 | olh | 2008-10-21 07:38:43 +0000 (Tue, 21 Oct 2008) | 2 lines
Changed paths:
M /trunk/lilo.changes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1159/Makefile new/yaboot-22.8-r1165/Makefile
--- old/yaboot-22.8-r1159/Makefile 2008-10-15 09:39:14.000000000 +0200
+++ new/yaboot-22.8-r1165/Makefile 2008-10-15 09:39:14.000000000 +0200
@@ -6,7 +6,7 @@
include Config
-VERSION = 22.8-r1159
+VERSION = 22.8-r1165
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1159/second/parse_device_path.c new/yaboot-22.8-r1165/second/parse_device_path.c
--- old/yaboot-22.8-r1159/second/parse_device_path.c 2008-10-21 09:38:43.000000000 +0200
+++ new/yaboot-22.8-r1165/second/parse_device_path.c 2008-10-24 08:16:59.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: parse_device_path.c 1159 2008-10-21 07:38:43Z olh $ */
+/* $Id: parse_device_path.c 1165 2008-10-24 06:16:59Z olh $ */
#ifndef DEVPATH_TEST
#include
#include
@@ -237,11 +237,7 @@
{
char *p;
int size;
- prom_printf(" \n"
- " *** This is the yaboot iSCSI codepath. *** \n"
- " \n"
- " *** How exactly did you get that far?! *** \n"
- " \n");
+
path_part(path) = -1; /* Scan all partitions */
path_type(path) = TYPE_ISCSI;
size = prom_getproplen_chosen(nas);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1159/second/yaboot.c new/yaboot-22.8-r1165/second/yaboot.c
--- old/yaboot-22.8-r1159/second/yaboot.c 2008-10-20 11:31:47.000000000 +0200
+++ new/yaboot-22.8-r1165/second/yaboot.c 2008-10-23 14:21:47.000000000 +0200
@@ -1205,14 +1205,8 @@
strncat(s, " '", size - off);
off = strlen(s);
p = buf;
- if (mac_serial) {
- num = 10;
- while (num) {
- p = p + strlen(p);
- num--;
- p++; /* skip null byte */
- }
- }
+ if (mac_serial)
+ p += 0xd; /* serial is at a fixed (?) offset on pmac */
strncat(s, p, size - off);
off = strlen(s);
strncat(s, "'", size - off);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org