Hello community,
here is the log from the commit of package lilo
checked in at Thu Nov 20 16:45:03 CET 2008.
--------
--- arch/i386/lilo/lilo.changes 2008-11-17 19:33:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-11-20 15:21:24.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Nov 19 16:20:42 CET 2008 - olh@suse.de
+
+- remove addnote again, it will be chrp-addnote in util-linux
+
+-------------------------------------------------------------------
+Wed Nov 19 15:01:12 CET 2008 - olh@suse.de
+
+- show &device; as device-path if no devspec file is found
+ by show_of_path.sh (bnc#439619 - LTC49387)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.Z16322/_old 2008-11-20 16:44:19.000000000 +0100
+++ /var/tmp/diff_new_pack.Z16322/_new 2008-11-20 16:44:19.000000000 +0100
@@ -56,7 +56,7 @@
%endif
%endif
Version: 22.8
-Release: 37
+Release: 38
Source0: lilo-ppc-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
Source86: lilo-%{version}.src.tar.bz2
@@ -64,7 +64,7 @@
Patch8602: lilo.x86.array-bounds.patch
Patch8603: lilo.x86.division-by-zero.patch
Patch8604: lilo.x86.checkit.patch
-# $Id: lilo.spec 1178 2008-11-17 18:33:24Z olh $
+# $Id: lilo.spec 1180 2008-11-20 14:21:24Z olh $
%description
LILO boots Linux from your hard drive. It can also boot other operating
@@ -107,7 +107,6 @@
%endif
make CC="gcc $cflags" MAN_DIR=/usr/share/man all activate
popd
-make -C lilo.ppc/bootheader/utils addnote
# powerpc
%else
pushd yaboot
@@ -139,8 +138,6 @@
install -m 0755 activate $RPM_BUILD_ROOT/sbin
rm -rfv $RPM_BUILD_ROOT/boot
popd
-mkdir $RPM_BUILD_ROOT/bin
-install -m 0755 lilo.ppc/bootheader/utils/addnote $RPM_BUILD_ROOT/bin
%else
# powerpc
# get rid of /usr/lib/rpm/brp-strip-debug
@@ -198,7 +195,6 @@
%files
%defattr (-,root,root)
%ifarch %ix86 x86_64
-/bin/*
/sbin/*
/usr/sbin/*
%else
@@ -230,8 +226,12 @@
%doc %{_docdir}/lilo
%endif
%doc %{_mandir}/*/*
-
%changelog
+* Wed Nov 19 2008 olh@suse.de
+- remove addnote again, it will be chrp-addnote in util-linux
+* Wed Nov 19 2008 olh@suse.de
+- show &device; as device-path if no devspec file is found
+ by show_of_path.sh (bnc#439619 - LTC49387)
* Mon Nov 17 2008 olh@suse.de
- build addnote binary to the x86 lilo package, required for
mkzimage usage in yast2-product-creator (bnc#443859)
++++++ lilo-ppc-22.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/bootheader/scripts/make_zimage_chrp.sh new/lilo-ppc-22.8/bootheader/scripts/make_zimage_chrp.sh
--- old/lilo-ppc-22.8/bootheader/scripts/make_zimage_chrp.sh 2008-07-03 10:05:24.000000000 +0200
+++ new/lilo-ppc-22.8/bootheader/scripts/make_zimage_chrp.sh 2008-11-20 15:21:24.000000000 +0100
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Id: make_zimage_chrp.sh 1081 2008-07-03 08:05:24Z olh $
+# $Id: make_zimage_chrp.sh 1180 2008-11-20 14:21:24Z olh $
set -e
# set -x
@@ -10,6 +10,7 @@
tmp=
outputfile=
no_addnote=false
+addnote_bin=
until [ "$#" = "0" ] ; do
case "$1" in
--help|-h|--version)
@@ -140,8 +141,23 @@
$obj_dir/common/zlib.a
#
if [ "$no_addnote" = "false" ] ; then
-echo add note section for RS6K
-$obj_dir/utils/addnote $tmp/output
+ case "$HOSTTYPE" in
+ rowerpc*)
+ addnote_bin=$obj_dir/utils/addnote
+ ;;
+ *)
+ addnote_bin="`type -p chrp-addnote || :`"
+ if test -z "$addnote_bin" ; then
+ addnote_bin="`type -p addnote || :`"
+ fi
+ ;;
+ esac
+ if test -z "$addnote_bin" ; then
+ echo "Could not find addnote or chrp-addnote binary"
+ else
+ echo add note section for RS6K
+ $addnote_bin $tmp/output
+ fi
fi
#
rm -f "$output"
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-10-24 17:04:21.000000000 +0200
+++ new/lilo-ppc-22.8/show_of_path.sh 2008-11-19 15:02:29.000000000 +0100
@@ -2,7 +2,7 @@
# vim: syntax=off ts=4
# set -ex
#
-# $Id: show_of_path.sh 1166 2008-10-24 15:04:21Z olh $
+# $Id: show_of_path.sh 1179 2008-11-19 14:02:29Z olh $
# find a OF bootpath on Apple PowerMacintosh Newworld machines
# Copyright (C) 2000, 2004 Olaf Hering