[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-430-g396b325
git
git at cross-lfs.org
Sun Oct 20 12:56:36 PDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 396b325fb5fff6aa4ed615ba5a67f28af28b488a (commit)
via 94626ce1e1eb412fff2b42c10a7507830da90eaa (commit)
via 28b862c7a211f174003a2f52d675d5ac952148f4 (commit)
via f57c4f13f256fe23f40b985b088b58826f98406d (commit)
via 42084fbdcdaa145a248ec0fbf48347fa0da8ebc4 (commit)
from 4c110a57ae0f72098c5f0288579f8ae6c75371be (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 396b325fb5fff6aa4ed615ba5a67f28af28b488a
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Oct 20 14:56:30 2013 -0500
Add yaboot parted patch description and commands to boot yaboot-build and final-system yaboot installation commands.
diff --git a/BOOK/boot/ppc/yaboot-build.xml b/BOOK/boot/ppc/yaboot-build.xml
index 41e201b..aee34b3 100644
--- a/BOOK/boot/ppc/yaboot-build.xml
+++ b/BOOK/boot/ppc/yaboot-build.xml
@@ -30,6 +30,14 @@
href="../../final-system/ppc/yaboot.xml"
xpointer="xpointer(//*[@os='p4'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p5'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p6'])"/>
+
<para os="p1">The following patch allows <command>ofpath</command> to use
<literal>PATH_PREFIX</literal> like the other
<filename class="directory">ybin</filename> scripts:</para>
diff --git a/BOOK/boot/ppc64-64/yaboot-build.xml b/BOOK/boot/ppc64-64/yaboot-build.xml
index 3be0ed2..5292077 100644
--- a/BOOK/boot/ppc64-64/yaboot-build.xml
+++ b/BOOK/boot/ppc64-64/yaboot-build.xml
@@ -31,6 +31,14 @@
xpointer="xpointer(//*[@os='p4'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p5'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p6'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../ppc/yaboot-build.xml"
xpointer="xpointer(//*[@os='p1'])"/>
diff --git a/BOOK/boot/ppc64/yaboot-build.xml b/BOOK/boot/ppc64/yaboot-build.xml
index 4f5d939..9cbc0dc 100644
--- a/BOOK/boot/ppc64/yaboot-build.xml
+++ b/BOOK/boot/ppc64/yaboot-build.xml
@@ -31,6 +31,14 @@
xpointer="xpointer(//*[@os='p4'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p5'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p6'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../ppc/yaboot-build.xml"
xpointer="xpointer(//*[@os='p1'])"/>
diff --git a/BOOK/final-system/ppc/yaboot.xml b/BOOK/final-system/ppc/yaboot.xml
index 826e135..9b92fbb 100644
--- a/BOOK/final-system/ppc/yaboot.xml
+++ b/BOOK/final-system/ppc/yaboot.xml
@@ -25,10 +25,14 @@
<sect2 role="installation">
<title>Installation of Yaboot</title>
- <para os="p3">The following patch adds stub functions for newer e2fsprogs releases.</para>
+ <para os="p3">The following patch adds stub functions for newer e2fsprogs releases:</para>
<screen os="p4"><userinput>patch -Np1 -i ../&yaboot-stubfuncs-patch;</userinput></screen>
+ <para os="p5">The following patch adds Parted support to yabootconfig:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&yaboot-parted-patch;</userinput></screen>
+
<para os="a">The supplied man pages have <filename
class="directory">/usr/local</filename> in the text. This sed will correct
that:</para>
diff --git a/BOOK/final-system/ppc64-64/yaboot.xml b/BOOK/final-system/ppc64-64/yaboot.xml
index 9162c9d..bd8bb45 100644
--- a/BOOK/final-system/ppc64-64/yaboot.xml
+++ b/BOOK/final-system/ppc64-64/yaboot.xml
@@ -70,6 +70,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p5'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p6'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
xpointer="xpointer(//*[@os='a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/yaboot.xml b/BOOK/final-system/ppc64/yaboot.xml
index 7d28dd1..f2884c3 100644
--- a/BOOK/final-system/ppc64/yaboot.xml
+++ b/BOOK/final-system/ppc64/yaboot.xml
@@ -73,6 +73,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p5'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p6'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
xpointer="xpointer(//*[@os='a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 94626ce1e1eb412fff2b42c10a7507830da90eaa
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Oct 20 14:55:47 2013 -0500
Add yaboot parted patch entry to all ppc target book changelogs.
diff --git a/BOOK/introduction/ppc/changelog.xml b/BOOK/introduction/ppc/changelog.xml
index 6060b60..7e1aaf5 100644
--- a/BOOK/introduction/ppc/changelog.xml
+++ b/BOOK/introduction/ppc/changelog.xml
@@ -33,6 +33,15 @@
-->
<listitem>
+ <para>20 October 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Add yaboot patch for parted support with yabootconfig.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>24 April 2013</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/ppc64-64/changelog.xml b/BOOK/introduction/ppc64-64/changelog.xml
index 1b920d4..83fe115 100644
--- a/BOOK/introduction/ppc64-64/changelog.xml
+++ b/BOOK/introduction/ppc64-64/changelog.xml
@@ -33,6 +33,15 @@
-->
<listitem>
+ <para>20 October 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Add yaboot patch for parted support with yabootconfig.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>15 August 2013</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/ppc64/changelog.xml b/BOOK/introduction/ppc64/changelog.xml
index 3d81ed7..e014ac5 100644
--- a/BOOK/introduction/ppc64/changelog.xml
+++ b/BOOK/introduction/ppc64/changelog.xml
@@ -33,6 +33,15 @@
-->
<listitem>
+ <para>20 October 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Add yaboot patch for parted support with yabootconfig.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>24 April 2013</para>
<itemizedlist>
<listitem>
commit 28b862c7a211f174003a2f52d675d5ac952148f4
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Oct 20 14:55:17 2013 -0500
Add yaboot parted patch entry into materials for all ppc targets.
diff --git a/BOOK/materials/ppc/patches.xml b/BOOK/materials/ppc/patches.xml
index 4bea697..80bf2ff 100644
--- a/BOOK/materials/ppc/patches.xml
+++ b/BOOK/materials/ppc/patches.xml
@@ -43,6 +43,15 @@
</listitem>
</varlistentry>
+ <varlistentry os="yaboot-parted-patch">
+ <term>Yaboot Parted Patch - <token>&yaboot-parted-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&yaboot-parted-patch;"/></para>
+ <para>MD5 sum: <literal>&yaboot-parted-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
<varlistentry os="yaboot-stubfuncs-patch">
<term>Yaboot Stubfuncs Patch - <token>&yaboot-stubfuncs-patch-size;</token>:</term>
<listitem>
commit f57c4f13f256fe23f40b985b088b58826f98406d
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Oct 20 14:54:50 2013 -0500
Add yaboot parted patch entry into patches.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 0cb3684..868756b 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -156,6 +156,10 @@
<!ENTITY yaboot-ofpath_path-patch-md5 "3faf70e0cb4e4f62a1e8815c3452ab38">
<!ENTITY yaboot-ofpath_path-patch-size ".830 KB">
+<!ENTITY yaboot-parted-patch "yaboot-&yaboot-version;-parted-1.patch">
+<!ENTITY yaboot-parted-patch-md5 "af05081b2056f0070b8b057acc32fea5">
+<!ENTITY yaboot-parted-patch-size "1.245 KB">
+
<!ENTITY yaboot-stubfuncs-patch "yaboot-&yaboot-version;-stubfuncs-1.patch">
<!ENTITY yaboot-stubfuncs-patch-md5 "b5cc91f9904383c24848040bfe6f11ae">
<!ENTITY yaboot-stubfuncs-patch-size "4.2 KB">
commit 42084fbdcdaa145a248ec0fbf48347fa0da8ebc4
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Oct 20 14:54:30 2013 -0500
Add yaboot 1.3.17 parted patch.
diff --git a/patches/yaboot-1.3.17-parted-1.patch b/patches/yaboot-1.3.17-parted-1.patch
new file mode 100644
index 0000000..f1f6f63
--- /dev/null
+++ b/patches/yaboot-1.3.17-parted-1.patch
@@ -0,0 +1,36 @@
+Submitted By: William Harrington kb0iic at cross-lfs dot org
+Date: 2013-10-20
+Initial Package Version: 1.3.10
+Upstream Status: Unknown
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=121361
+Description: Add parted support to yabootconfig.
+
+--- yaboot-1.3.10/ybin/yabootconfig~ 2004-04-20 16:20:13.619375616 -0400
++++ yaboot-1.3.10/ybin/yabootconfig 2004-04-20 16:32:40.519829488 -0400
+@@ -160,6 +160,8 @@
+ FDISK=mac-fdisk
+ elif (command -v pdisk > /dev/null 2>&1) ; then
+ FDISK=pdisk
++ elif (command -v parted > /dev/null 2>&1) ; then
++ FDISK=parted
+ else
+ echo 1>&2 "$PRG: Unable to locate mac-fdisk"
+ return 1
+@@ -209,9 +211,16 @@
+ BOOT="${DISK}${BOOT}"
+ fi
+ debug "BOOT after fixup: $BOOT\n"
+- else
++ elif [ "$FDISK" = mac-fdisk ] ; then
+ BOOT="$(v=`$FDISK -l "$DISK" 2>/dev/null | grep '\<Apple_Bootstrap\>'` ; echo ${v%%[ ]*})"
+ debug "BOOT=$BOOT\n"
++ else
++ BOOT="$(v=`$FDISK "$DISK" print 2>/dev/null | grep 'bootstrap'` ; echo ${v%%[ ]*})"
++ debug "BOOT before fixup: $BOOT\n"
++ if [ -n "$BOOT" ] ; then
++ BOOT="${DISK}${BOOT}"
++ fi
++ debug "BOOT after fixup: $BOOT\n"
+ fi
+ if [ -z "$BOOT" ] ; then
+ echo 1>&2 "$PRG: Unable to locate bootstrap partition on $DISK..."
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/ppc/yaboot-build.xml | 8 ++++++
BOOK/boot/ppc64-64/yaboot-build.xml | 8 ++++++
BOOK/boot/ppc64/yaboot-build.xml | 8 ++++++
BOOK/final-system/ppc/yaboot.xml | 6 ++++-
BOOK/final-system/ppc64-64/yaboot.xml | 8 ++++++
BOOK/final-system/ppc64/yaboot.xml | 8 ++++++
BOOK/introduction/ppc/changelog.xml | 9 +++++++
BOOK/introduction/ppc64-64/changelog.xml | 9 +++++++
BOOK/introduction/ppc64/changelog.xml | 9 +++++++
BOOK/materials/ppc/patches.xml | 9 +++++++
BOOK/patches.ent | 4 +++
patches/yaboot-1.3.17-parted-1.patch | 36 ++++++++++++++++++++++++++++++
12 files changed, 121 insertions(+), 1 deletions(-)
create mode 100644 patches/yaboot-1.3.17-parted-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list