r1964 - in profiles/LFS/branches/cross-lfs: . bootable config cross-tools prep scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 25 11:12:48 PDT 2005


Author: thomasp
Date: 2005-07-25 12:12:43 -0600 (Mon, 25 Jul 2005)
New Revision: 1964

Added:
   profiles/LFS/branches/cross-lfs/LFS-x86_64.xml
Modified:
   profiles/LFS/branches/cross-lfs/LFS-x86.xml
   profiles/LFS/branches/cross-lfs/bootable/grub.xml
   profiles/LFS/branches/cross-lfs/checkit.sh
   profiles/LFS/branches/cross-lfs/config/package.ent
   profiles/LFS/branches/cross-lfs/config/x86-package.ent
   profiles/LFS/branches/cross-lfs/cross-tools/glibc.xml
   profiles/LFS/branches/cross-lfs/prep/creatingtoolsdir.xml
   profiles/LFS/branches/cross-lfs/scripts/common.packages.urls
Log:
removed glibc-startfiles and shared gcc from cross-tools, and added patch to disable linking of libgcc_eh in glibc

Modified: profiles/LFS/branches/cross-lfs/LFS-x86.xml
===================================================================
--- profiles/LFS/branches/cross-lfs/LFS-x86.xml	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/LFS-x86.xml	2005-07-25 18:12:43 UTC (rev 1964)
@@ -36,8 +36,6 @@
       <xi:include href="cross-tools/cross-binutils.xml" />
       <xi:include href="cross-tools/glibc-headers.xml" />
       <xi:include href="cross-tools/cross-gcc-static-libgcc.xml" />
-      <xi:include href="cross-tools/glibc-startfiles.xml" />
-      <xi:include href="cross-tools/cross-gcc-shared-libgcc.xml" />
       <xi:include href="cross-tools/glibc.xml" />
       <xi:include href="cross-tools/gcc.xml" />
     </stage>

Copied: profiles/LFS/branches/cross-lfs/LFS-x86_64.xml (from rev 1949, profiles/LFS/branches/cross-lfs/LFS-x86.xml)
===================================================================
--- profiles/LFS/branches/cross-lfs/LFS-x86.xml	2005-07-18 01:03:06 UTC (rev 1949)
+++ profiles/LFS/branches/cross-lfs/LFS-x86_64.xml	2005-07-25 18:12:43 UTC (rev 1964)
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "DTD/ALFS.dtd"
+[
+
+  <!ENTITY % general_entities SYSTEM "config/general.ent">
+  <!ENTITY % config_entities SYSTEM "config/config.ent">
+
+  %general_entities;
+  %config_entities;
+]>
+<alfs version="3.1" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <stage name="Cross-LFS x86_64">
+    <stage name="Preparations">
+      <xi:include href="prep/creatingtoolsdir.xml" />
+      <xi:include href="prep/addinguser.xml" />
+      <xi:include href="prep/settingenvironment.xml" />
+      <xi:include href="prep/creatingcrosstoolsdir.xml" />
+    </stage>
+    <stage name="Creating Cross-Compile Tools">
+      <stageinfo>
+	<root>/</root>
+	<user>&lfs-user;</user>
+	<environment>
+	  <variable name="LFS">&LFS;</variable>
+	  <variable name="LC_ALL">POSIX</variable>
+	  <variable name="PATH">/cross-tools/bin:/bin:/usr/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="HOME">&lfs-user-dir;</variable>
+	  <variable name="BUILD32">-m32</variable>
+	  <variable name="BUILD64">-m64</variable>
+	  <variable name="LFS_HOST">&lfs-host;</variable>
+	  <variable name="LFS_TARGET">&lfs-target;</variable>
+	  <variable name="LFS_TARGET32">&lfs-target32;</variable>
+	</environment>
+      </stageinfo>
+      <xi:include href="cross-tools/libc-headers.xml" />
+      <xi:include href="cross-tools/cross-binutils.xml" />
+      <xi:include href="cross-tools/glibc-headers.xml" />
+      <xi:include href="cross-tools/cross-gcc-static-libgcc.xml" />
+      <xi:include href="cross-tools/glibc-startfiles.xml" />
+      <xi:include href="cross-tools/cross-gcc-shared-libgcc.xml" />
+      <xi:include href="cross-tools/glibc.xml" />
+      <xi:include href="cross-tools/gcc.xml" />
+    </stage>
+    <stage name="Constructing a Temporary System">
+      <stageinfo>
+	<root>/</root>
+	<user>&lfs-user;</user>
+	<environment>
+	  <variable name="LFS">&LFS;</variable>
+	  <variable name="LC_ALL">POSIX</variable>
+	  <variable name="PATH">/cross-tools/bin:/bin:/usr/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="HOME">&lfs-user-dir;</variable>
+	  <variable name="BUILD32">-m32</variable>
+	  <variable name="BUILD64">-m64</variable>
+	  <variable name="LFS_HOST">&lfs-host;</variable>
+	  <variable name="LFS_TARGET">&lfs-target;</variable>
+	  <variable name="LFS_TARGET32">&lfs-target32;</variable>
+	  <variable name="CC">&lfs-target;-gcc</variable>
+	  <variable name="CXX">&lfs-target;-g++</variable>
+	  <variable name="AR">&lfs-target;-ar</variable>
+	  <variable name="AS">&lfs-target;-as</variable>
+	  <variable name="RANLIB">&lfs-target;-ranlib</variable>
+	  <variable name="LD">&lfs-target;-ld</variable>
+	  <variable name="STRIP">&lfs-target;-strip</variable>
+      	</environment>
+      </stageinfo>
+      <xi:include href="temp-system/binutils.xml" />
+      <xi:include href="temp-system/gcc.xml" />
+      <xi:include href="temp-system/zlib.xml" />
+      <xi:include href="temp-system/gawk.xml" />
+      <xi:include href="temp-system/coreutils.xml" />
+      <xi:include href="temp-system/bzip2.xml" />
+      <xi:include href="temp-system/gzip.xml" />
+      <xi:include href="temp-system/diffutils.xml" />
+      <xi:include href="temp-system/findutils.xml" />
+      <xi:include href="temp-system/make.xml" />
+      <xi:include href="temp-system/grep.xml" />
+      <xi:include href="temp-system/sed.xml" />
+      <xi:include href="temp-system/gettext.xml" />
+      <xi:include href="temp-system/ncurses.xml" />
+      <xi:include href="temp-system/patch.xml" />
+      <xi:include href="temp-system/tar.xml" />
+      <xi:include href="temp-system/bash.xml" />
+    </stage>
+    <stage name="Chroot Prep">
+      <stageinfo>
+	<root>/</root>
+	<environment>
+	  <variable name="LFS">&LFS;</variable>
+	  <variable name="LC_ALL">POSIX</variable>
+	  <variable name="PATH">/cross-tools/bin:/bin:/usr/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="HOME">&lfs-user-dir;</variable>
+	  <variable name="BUILD32">-m32</variable>
+	  <variable name="BUILD64">-m64</variable>
+	  <variable name="LFS_HOST">&lfs-host;</variable>
+	  <variable name="LFS_TARGET">&lfs-target;</variable>
+	  <variable name="LFS_TARGET32">&lfs-target32;</variable>
+	  <variable name="CC">&lfs-target;-gcc</variable>
+	  <variable name="CXX">&lfs-target;-g++</variable>
+	  <variable name="AR">&lfs-target;-ar</variable>
+	  <variable name="AS">&lfs-target;-as</variable>
+	  <variable name="RANLIB">&lfs-target;-ranlib</variable>
+	  <variable name="LD">&lfs-target;-ld</variable>
+	  <variable name="STRIP">&lfs-target;-strip</variable>
+	</environment>
+      </stageinfo>
+      <xi:include href="chroot/util-linux.xml" />
+      <xi:include href="chroot/kernfs.xml" />
+    </stage>
+    <stage name="Setting up the Chroot Environment">
+      <stageinfo>
+	<root>&LFS;</root>
+	<environment>
+	  <variable name="HOME">/root</variable>
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	</environment>
+      </stageinfo>
+      <xi:include href="chroot/changingownership.xml" />
+      <xi:include href="chroot/creatingdirs.xml" />
+      <xi:include href="chroot/creatingsymlinks.xml" />
+      <xi:include href="chroot/pwdgroup.xml" />
+      <xi:include href="chroot/populate-dev.xml" />
+    </stage>
+    <stage name="Constructing Temporary Tools">
+      <stageinfo>
+	<root>&LFS;</root>
+	<environment>
+	  <variable name="HOME">/root</variable>
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	  <variable name="BUILD32">-m32</variable>
+	  <variable name="BUILD64">-m64</variable>
+	  <variable name="LFS_TARGET32">&lfs-target32;</variable>
+	</environment>
+      </stageinfo>
+      <xi:include href="temp-tools/tcl.xml" />
+      <xi:include href="temp-tools/expect.xml" />
+      <xi:include href="temp-tools/dejagnu.xml" />
+      <xi:include href="temp-tools/perl.xml" />
+      <xi:include href="temp-tools/texinfo.xml" />
+    </stage>
+    <stage name="Installing Basic System Software">
+      <stageinfo>
+	<root>&LFS;</root>
+	<environment>
+	  <variable name="HOME">/root</variable>
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	  <variable name="BUILD32">-m32</variable>
+	  <variable name="BUILD64">-m64</variable>
+	  <variable name="LFS_TARGET32">&lfs-target32;</variable>
+	</environment>
+      </stageinfo>
+      <xi:include href="final-system/libc-headers.xml" />
+      <xi:include href="final-system/glibc.xml" />
+      <xi:include href="final-system/adjustingtoolchain.xml" />
+      <xi:include href="final-system/binutils.xml" />
+      <xi:include href="final-system/gcc.xml" />
+      <xi:include href="final-system/zlib.xml" />
+      <xi:include href="final-system/findutils.xml" />
+      <xi:include href="final-system/gawk.xml" />
+      <xi:include href="final-system/ncurses.xml" />
+      <xi:include href="final-system/readline.xml" />
+      <xi:include href="final-system/vim.xml" />
+      <xi:include href="final-system/m4.xml" />
+      <xi:include href="final-system/bison.xml" />
+      <xi:include href="final-system/less.xml" />
+      <xi:include href="final-system/groff.xml" />
+      <xi:include href="final-system/coreutils.xml" />
+      <xi:include href="final-system/sed.xml" />
+      <xi:include href="final-system/flex.xml" />
+      <xi:include href="final-system/gettext.xml" />
+      <xi:include href="final-system/inetutils.xml" />
+      <xi:include href="final-system/perl.xml" />
+      <xi:include href="final-system/iproute2.xml" />
+      <xi:include href="final-system/texinfo.xml" />
+      <xi:include href="final-system/autoconf.xml" />
+      <xi:include href="final-system/automake.xml" />
+      <xi:include href="final-system/bash.xml" />
+      <xi:include href="final-system/file.xml" />
+      <xi:include href="final-system/libtool.xml" />
+      <xi:include href="final-system/bzip2.xml" />
+      <xi:include href="final-system/diffutils.xml" />
+      <xi:include href="final-system/kbd.xml" />
+      <xi:include href="final-system/e2fsprogs.xml" />
+      <xi:include href="final-system/grep.xml" />
+      <xi:include href="final-system/gzip.xml" />
+      <xi:include href="final-system/man.xml" />
+      <xi:include href="final-system/man-pages.xml" />
+      <xi:include href="final-system/make.xml" />
+      <xi:include href="final-system/module-init-tools.xml" />
+      <xi:include href="final-system/patch.xml" />
+      <xi:include href="final-system/procps.xml" />
+      <xi:include href="final-system/psmisc.xml" />
+      <xi:include href="final-system/shadow.xml" />
+      <xi:include href="final-system/sysklogd.xml" />
+      <xi:include href="final-system/sysvinit.xml" />
+      <xi:include href="final-system/tar.xml" />
+      <xi:include href="final-system/util-linux.xml" />
+      <xi:include href="final-system/udev.xml" />
+      <xi:include href="final-system/mktemp.xml" />
+      <xi:include href="final-system/hotplug.xml" />
+      <xi:include href="final-system/iana-etc.xml" />
+      <xi:include href="final-system/grub.xml" />
+    </stage>
+    <stage name="Setting Up System Bootscripts">
+      <stageinfo>
+	<root>&LFS;</root>
+	<environment>
+	  <variable name="HOME">/root</variable>
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	</environment>
+      </stageinfo>
+      <xi:include href="bootscripts/bootscripts.xml" />
+      <xi:include href="bootscripts/setclock.xml" />
+      <xi:include href="config/console.xml" />
+      <xi:include href="bootscripts/inputrc.xml" />
+      <xi:include href="bootscripts/profile.xml" />
+      <xi:include href="bootscripts/hostname.xml" />
+      <xi:include href="bootscripts/hosts.xml" />
+      <xi:include href="bootscripts/network.xml" />
+    </stage>
+    <stage name="Making the LFS System Bootable">
+      <stageinfo>
+	<root>&LFS;</root>
+	<environment>
+	  <variable name="HOME">/root</variable>
+	  <variable name="TERM">&TERM;</variable>
+	  <variable name="PATH">/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin</variable>
+	  <variable name="CFLAGS" />
+	  <variable name="CXXFLAGS" />
+	</environment>
+      </stageinfo>
+      <xi:include href="bootable/fstab.xml" />
+      <xi:include href="bootable/kernel.xml" />
+      <xi:include href="bootable/grub.xml" />
+    </stage>
+    <stage name="Finishing up (inside chroot)">
+      <stageinfo>
+	<root>&LFS;</root>
+      </stageinfo>
+      <remove>/tools</remove>
+      <textdump>
+	<file>/etc/lfs-release</file>
+	<content>=&version;</content>
+      </textdump>
+    </stage>
+    <stage name="Finishing Up (outside chroot)">
+      <remove>/tools</remove>
+      <execute command="umount">
+	<param>&LFS;/dev/pts</param>
+	<param>&LFS;/dev/shm</param>
+	<param>&LFS;/dev</param>
+	<param>&LFS;/proc</param>
+	<param>&LFS;/sys</param>
+	<!-- If you used a bind mount for your package dir, unmount it here. -->
+	<!-- <param>&LFS;&packages_dir;</param> -->
+      </execute>
+    </stage>
+  </stage>
+</alfs>
+

Modified: profiles/LFS/branches/cross-lfs/bootable/grub.xml
===================================================================
--- profiles/LFS/branches/cross-lfs/bootable/grub.xml	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/bootable/grub.xml	2005-07-25 18:12:43 UTC (rev 1964)
@@ -2,7 +2,7 @@
 <!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
 [
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
+<!ENTITY % package_entities SYSTEM "../config/x86-package.ent">
 <!ENTITY % config_entities SYSTEM "../config/config.ent">
 
 %general_entities;

Modified: profiles/LFS/branches/cross-lfs/checkit.sh
===================================================================
--- profiles/LFS/branches/cross-lfs/checkit.sh	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/checkit.sh	2005-07-25 18:12:43 UTC (rev 1964)
@@ -1 +1 @@
-xmllint --noent --nonet --noout --xinclude --postvalid LFS.xml
+xmllint --noent --nonet --noout --xinclude --postvalid $1

Modified: profiles/LFS/branches/cross-lfs/config/package.ent
===================================================================
--- profiles/LFS/branches/cross-lfs/config/package.ent	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/config/package.ent	2005-07-25 18:12:43 UTC (rev 1964)
@@ -126,6 +126,7 @@
 <!ENTITY glibc-linuxthreads-package "glibc-linuxthreads-&glibc-version;&glibc-cvs-tag;.tar.bz2">
 
 <!ENTITY glibc-fix-testsuite-patch "glibc-&glibc-version;&glibc-cvs-tag;-fix_test-1.patch">
+<!ENTITY glibc-libgcc-patch "glibc-&glibc-version;&glibc-cvs-tag;-libgcc_eh-1.patch">
 
 <!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
 <!ENTITY grep-version "2.5.1a">

Modified: profiles/LFS/branches/cross-lfs/config/x86-package.ent
===================================================================
--- profiles/LFS/branches/cross-lfs/config/x86-package.ent	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/config/x86-package.ent	2005-07-25 18:12:43 UTC (rev 1964)
@@ -13,4 +13,3 @@
 <!ENTITY linux-libc-headers-version "2.6.12.0">
 <!ENTITY linux-libc-headers-package "linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
 <!ENTITY linux-libc-headers-directory "linux-libc-headers-&linux-libc-headers-version;">
-

Modified: profiles/LFS/branches/cross-lfs/cross-tools/glibc.xml
===================================================================
--- profiles/LFS/branches/cross-lfs/cross-tools/glibc.xml	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/cross-tools/glibc.xml	2005-07-25 18:12:43 UTC (rev 1964)
@@ -22,6 +22,16 @@
         <name>glibc-build</name>
       </mkdir>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&glibc-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&glibc-libgcc-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/glibc-build</base>

Modified: profiles/LFS/branches/cross-lfs/prep/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/cross-lfs/prep/creatingtoolsdir.xml	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/prep/creatingtoolsdir.xml	2005-07-25 18:12:43 UTC (rev 1964)
@@ -4,12 +4,13 @@
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % config_entities SYSTEM "../config/config.ent">
 <!ENTITY % package_entities SYSTEM "../config/package.ent">
+<!ENTITY % x86_package_entities SYSTEM "../config/x86-package.ent">
+<!ENTITY % profile_entities SYSTEM "../config/profile.ent">
 
 %general_entities;
 %config_entities;
 %package_entities;
-
-<!ENTITY % profile_entities SYSTEM "../config/profile.ent">
+%x86_package_entities;
 %profile_entities;
 ]>
 
@@ -90,6 +91,7 @@
 	<source>&glibc-libidn-package;</source>
         <source>&glibc-linuxthreads-package;</source>
         <source>&glibc-fix-testsuite-patch;</source>
+	<source>&glibc-libgcc-patch;</source>
         <source>&grep-package;</source>
         <source>&groff-package;</source>
         <source>&grub-package;</source>
@@ -139,7 +141,6 @@
         <source>&vim-lang-package;</source>
         <source>&vim-security-patch;</source>
         <source>&zlib-package;</source>
-	<source>&zlib-security-fix-patch;</source>
         <destination>&LFS;&packages_dir;</destination>
       </copy>
     </stage>

Modified: profiles/LFS/branches/cross-lfs/scripts/common.packages.urls
===================================================================
--- profiles/LFS/branches/cross-lfs/scripts/common.packages.urls	2005-07-25 17:44:20 UTC (rev 1963)
+++ profiles/LFS/branches/cross-lfs/scripts/common.packages.urls	2005-07-25 18:12:43 UTC (rev 1964)
@@ -70,6 +70,7 @@
 http://www.linuxfromscratch.org/patches/downloads/gcc/gcc-3.4.4-posix-1.patch
 http://www.linuxfromscratch.org/patches/downloads/gcc/gcc-3.4.4-specs-2.patch
 http://www.linuxfromscratch.org/patches/downloads/glibc/glibc-2.3.5-fix_test-1.patch
+http://www.linuxfromscratch.org/patches/downloads/glibc/glibc-2.3.5-libgcc_eh-1.patch
 http://www.linuxfromscratch.org/patches/downloads/gzip/gzip-1.3.5-security_fixes-1.patch
 http://www.linuxfromscratch.org/patches/downloads/inetutils/inetutils-1.4.2-no_server_man_pages-1.patch
 http://www.linuxfromscratch.org/patches/downloads/mktemp/mktemp-1.5-add_tempfile-2.patch




More information about the alfs-log mailing list