[EMAIL PROTECTED] wrote:
Merged last few differences/updates between trunk and dm. Merged firefox and
profile LFS-BOOK directories, synced doc/README, merged LFS-BOOK gen difference
and install devmapper library.
After the last 3 commits, all non-dm changes made to trunk have been
applied to dm, and vice versa, so merging should go easier. The only
package still different is the udev version, but we can deal with that
later.
A quick diff shows differences:
[EMAIL PROTECTED] ~/tmp]$ diff -Naur --brief trunk dm
Files trunk/Makefile and dm/Makefile differ
Files trunk/etc/fstab and dm/etc/fstab differ
Files trunk/initramfs/Makefile and dm/initramfs/Makefile differ
Files trunk/initramfs/init.c and dm/initramfs/init.c differ
Files trunk/initramfs/init.h and dm/initramfs/init.h differ
Files trunk/packages/cdrtools/Makefile and dm/packages/cdrtools/Makefile
differ
Files trunk/packages/initramfs/Makefile and
dm/packages/initramfs/Makefile differ
Files trunk/packages/initramfs/init.c and dm/packages/initramfs/init.c
differ
Files trunk/packages/initramfs/init.h and dm/packages/initramfs/init.h
differ
Files trunk/packages/lfs-bootscripts/Makefile and
dm/packages/lfs-bootscripts/Makefile differ
Files trunk/packages/lfs-bootscripts/customize and
dm/packages/lfs-bootscripts/customize differ
Files trunk/packages/lfs-bootscripts/udev and
dm/packages/lfs-bootscripts/udev differ
Files trunk/packages/linux/Makefile and dm/packages/linux/Makefile differ
Files trunk/packages/linux/config.ppc and dm/packages/linux/config.ppc
differ
Files trunk/packages/linux/config.sparc and
dm/packages/linux/config.sparc differ
Files trunk/packages/linux/config.x86 and dm/packages/linux/config.x86
differ
Files trunk/packages/linux/config.x86_64 and
dm/packages/linux/config.x86_64 differ
Files trunk/packages/udev/Makefile and dm/packages/udev/Makefile differ
Files trunk/packages/zisofs-tools/Makefile and
dm/packages/zisofs-tools/Makefile differ
Files trunk/scripts/shutdown-helper and dm/scripts/shutdown-helper differ
So looks like only dm related changes are left. :)
Justin
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
