Re: [PATCH] Add package info in sect1info elements
El Sábado, 21 de Julio de 2007 01:10, Dan Nicholson escribió: I've been playing around with jhalfs and I realized that there was no easy way to access the package name and version on a given page. Manuel and I had a discussion on alfs-discuss and he suggested using the productname and productnumber children of the sect1info elements. This one has been applied in r8366 with two changes: - In productname the actual package name is used, instead off adding tools- to chapter05 pages and -headers to the linux headers installation. At this moment jhalfs is finding the package name via several hacks that could be avoided now. That name extensions can be re-generated from inside the jhalfs code and placed on a separate variable, if required to help creating customizations for PM. - An address tag has been added containing the package URL entity. From it we will can extract more easily the tarball name, removing more hacks, and could allow to extract the tarballs from inside the scripts instead than from the Makefile like now. -- Manuel Canales Esparcia Usuario de LFS nº2886: http://www.linuxfromscratch.org LFS en castellano: http://www.escomposlinux.org/lfs-es http://www.lfs-es.info TLDP-ES: http://es.tldp.org -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
Re: Merging the jh branch to trunk
On Wed, 5 Sep 2007 11:12:55 -0600, Matthew Burgess [EMAIL PROTECTED] wrote: On Wed, 5 Sep 2007 17:02:40 + (UTC), Jeremy Huntwork [EMAIL PROTECTED] wrote: Matthew Burgess matthew at linuxfromscratch.org writes: Does this sound sane to everyone? If so, I'll endeavour to complete the patch series as soon as possible and post it here for review. How's this coming? Need any help? Stalled at the minute, thanks to two late nights at work this week! Should be able to get it out for review tomorrow evening. Full patch series is now at http://www.linuxfromscratch.org/~matthew/patches/ (see the series file there for the order they need to be applied in). Unfortunately, this breaks the adjusting phase in chapter 5. If I back out the GCC upgrade it all works fine again, but I don't have time to investigate at the minute. The 032-adjusting jhalfs log is in the same location as the book patches, but I couldn't see anything immediately obvious going wrong! Jeremy, did you have to make any changes to the toolchain adjustment phase to cater for GCC-4.2.1? Regards, Matt. -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
Re: Merging the jh branch to trunk
Matthew Burgess wrote: Jeremy, did you have to make any changes to the toolchain adjustment phase to cater for GCC-4.2.1? I made changes to adjusting.xml for the sake of adding compatibility for x86_64 _before_ I upgraded to gcc 4.2.1. So I'm guessing I avoided what you're hitting now. Here's what is in trunk: gcc -dumpspecs | sed '[EMAIL PROTECTED]/lib/ld-linux.so.2@/tools@g' \ `dirname $(gcc -print-libgcc-file-name)`/specs And here's what's in the jh branch: gcc -dumpspecs | sed 's@/lib\(64\)\?/ld@/tools@g' \ `dirname $(gcc -print-libgcc-file-name)`/specs Apart from the use of a possible /lib64, the biggest difference is that I don't specify to find the name of the linker at the beginning of a line, because that's not where it appears for x86_64 (and I'm guessing for gcc-4.2.1 on x86 it doesn't appear there either). Can you confirm if the following works? gcc -dumpspecs | sed 's@/lib/ld@/tools@g' \ `dirname $(gcc -print-libgcc-file-name)`/specs I would diff the above with the original output of -dumpspecs to make sure it only hits what you want. -- JH -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
