Le 28/01/2012 12:34, Matt Burgess a écrit :
> On Thu, 2012-01-26 at 19:15 -0500, Thomas Pegg wrote:
>
>> I noticed the patch too but haven't had time to thoroughly review it
>> yet. But I would say before it does get applied a new stable release of
>> jhalfs as there have been a few fixes since the last stable so we have
>> known good working version out there for the most recent versions of LFS.
> Well, I've reviewed and tested the patch + fix from yesterday now, and
> am happy that it causes no regressions. I'm not particularly fussed
> whether or not a release is made before or after the patch is applied as
> I personally only use jhalfs-trunk anyway. However, it looks like
> Pierre has put a lot of effort into the package management work, so it
> would be good to get the patch in reasonably quickly so that it can get
> wider testing.
Thanks to you for your interest. I have discovered another couple of bugs.
Here is a patch. It has to be applied above the other two
I have already sent.
---------------------------------------------
diff -Nur --exclude .svn pmalfs2/common/libs/func_blfs_deps
pmalfs/common/libs/func_blfs_deps
--- pmalfs2/common/libs/func_blfs_deps 2012-01-29 22:18:36.000000000 +0100
+++ pmalfs/common/libs/func_blfs_deps 2012-01-26 22:00:27.000000000 +0100
@@ -196,7 +196,7 @@
# Touch the tracking file.
case $name in
docbook-xml ) pkg_ver=DocBook-4.5 ;;
- lynx ) pkg_ver=lynx-2.8.7 ;;
+ lynx ) pkg_ver=lynx-2.8.7rel.2 ;;
tidy ) pkg_ver=html-tidy-cvs_20101110 ;;
unzip ) pkg_ver=unzip-6.0 ;;
* ) pkg_ver=$(echo $pkg_tarball | sed -e
's/.tar.*//;s/.tgz//;s/.zip//') ;;
diff -Nur --exclude .svn pmalfs2/LFS/master.sh pmalfs/LFS/master.sh
--- pmalfs2/LFS/master.sh 2012-01-29 22:47:25.000000000 +0100
+++ pmalfs/LFS/master.sh 2012-01-26 22:00:27.000000000 +0100
@@ -172,9 +172,9 @@
cp chapter06/* chapter06$N
for script in chapter06$N/* ; do
# Overwrite existing symlinks, files, and dirs
- sed -e 's/ln -sv/&f/g' \
- -e 's/mv -v/&f/g' \
- -e 's/mkdir -v/&p/g' -i ${script}
+ sed -e 's/ln *-s/&f/g' \
+ -e 's/mv *-v/&f/g' \
+ -e 's/mkdir *-v/&p/g' -i ${script}
# Suppress the mod of "test-installation.pl" because now
# the library path points to /usr/lib
if [[ ${script} =~ glibc ]]; then
------------------------------
For now, I am busy testing ICA. Looks like it works and some
useful information may be extracted.
Regards
Pierre
--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
