[Ipcop-svn] SF.net SVN: ipcop: [786] ipcop/trunk

[<ch...@us...>]

Revision: 786
          http://ipcop.svn.sourceforge.net/ipcop/?rev=786&view=rev
Author:   chepati
Date:     2007-11-30 01:11:18 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
The HEADERS_INSTALLED hack is no longer necessary because we don't install the headers into /usr/include as we used to, which by default deletes some headers glibc has installed already (if running stage toolchain or stage base for a second time).  Now the LFS build instructions install the headers to a temporary directory and from them they copy them manually to /usr/include, which is safe

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/arch_i486/linux-headers
    ipcop/trunk/config/rootfiles/arch_ppc/linux-headers
    ipcop/trunk/config/rootfiles/arch_sparc/linux-headers
    ipcop/trunk/lfs/linux-headers

Modified: ipcop/trunk/config/rootfiles/arch_i486/linux-headers
===================================================================
--- ipcop/trunk/config/rootfiles/arch_i486/linux-headers	2007-11-30 09:00:23 UTC (rev 785)
+++ ipcop/trunk/config/rootfiles/arch_i486/linux-headers	2007-11-30 09:11:18 UTC (rev 786)
@@ -1,6 +1,6 @@
-## linux-2.6.20.6-headers
 ##
-#HEADERS_INSTALLED
+## linux-headers
+##
 #usr/include/asm-generic
 #usr/include/asm-generic/errno-base.h
 #usr/include/asm-generic/errno.h

Modified: ipcop/trunk/config/rootfiles/arch_ppc/linux-headers
===================================================================
--- ipcop/trunk/config/rootfiles/arch_ppc/linux-headers	2007-11-30 09:00:23 UTC (rev 785)
+++ ipcop/trunk/config/rootfiles/arch_ppc/linux-headers	2007-11-30 09:11:18 UTC (rev 786)
@@ -1,4 +1,6 @@
-#HEADERS_INSTALLED
+##
+## linux-headers
+##
 #usr/include/asm
 #usr/include/asm-generic
 #usr/include/asm-generic/errno-base.h

Modified: ipcop/trunk/config/rootfiles/arch_sparc/linux-headers
===================================================================
--- ipcop/trunk/config/rootfiles/arch_sparc/linux-headers	2007-11-30 09:00:23 UTC (rev 785)
+++ ipcop/trunk/config/rootfiles/arch_sparc/linux-headers	2007-11-30 09:11:18 UTC (rev 786)
@@ -1,7 +1,6 @@
 ##
-## linux-2.6.22.1-headers
+## linux-headers
 ##
-#HEADERS_INSTALLED
 #usr/include/asm
 #usr/include/asm-generic
 #usr/include/asm-generic/errno-base.h

Modified: ipcop/trunk/lfs/linux-headers
===================================================================
--- ipcop/trunk/lfs/linux-headers	2007-11-30 09:00:23 UTC (rev 785)
+++ ipcop/trunk/lfs/linux-headers	2007-11-30 09:11:18 UTC (rev 786)
@@ -94,26 +94,20 @@
 	@mv $(DIR_SRC)/TEMP/* $(DIR_APP) && rm -fr $(DIR_SRC)/TEMP
 
 ifeq "$(STAGE)" "toolchain"
-	if [ ! -e $(TOOLS_DIR)/HEADERS_INSTALLED ]; then \
-		cd $(DIR_APP) && make mrproper && \
-		cd $(DIR_APP) && make headers_check && \
-		cd $(DIR_APP) && make INSTALL_HDR_PATH=dest headers_install && \
-		cd $(DIR_APP) && cp -rv dest/include/* $(TOOLS_DIR)/include && \
-		touch $(TOOLS_DIR)/HEADERS_INSTALLED; \
-	fi
+	cd $(DIR_APP) && make mrproper
+	cd $(DIR_APP) && make headers_check
+	cd $(DIR_APP) && make INSTALL_HDR_PATH=dest headers_install
+	cd $(DIR_APP) && cp -rv dest/include/* $(TOOLS_DIR)/include
 endif
 
 ifeq "$(STAGE)" "base"
-	if [ ! -e /HEADERS_INSTALLED ]; then \
-		cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-2.6-atm-headers.patch && \
-		cd $(DIR_APP) && sed -i '/scsi/d' include/Kbuild && \
-		cd $(DIR_APP) && make mrproper && \
-		cd $(DIR_APP) && make headers_check && \
-		cd $(DIR_APP) && make INSTALL_HDR_PATH=dest headers_install && \
-		cd $(DIR_APP) && cp -rv dest/include/* /usr/include && \
-		touch /HEADERS_INSTALLED && \
-		cd $(DIR_APP) && cp -a include/linux/ufs_fs* /usr/include/linux; \
-	fi
+		cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-2.6-atm-headers.patch
+		cd $(DIR_APP) && sed -i '/scsi/d' include/Kbuild
+		cd $(DIR_APP) && make mrproper
+		cd $(DIR_APP) && make headers_check
+		cd $(DIR_APP) && make INSTALL_HDR_PATH=dest headers_install
+		cd $(DIR_APP) && cp -rv dest/include/* /usr/include
+		cd $(DIR_APP) && cp -a include/linux/ufs_fs* /usr/include/linux
 endif
 
 	@rm -rf $(DIR_APP)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.