From: <ch...@us...> - 2007-04-11 01:55:40
|
Revision: 57 http://ipcop.svn.sourceforge.net/ipcop/?rev=57&view=rev Author: chepati Date: 2007-04-10 18:55:42 -0700 (Tue, 10 Apr 2007) Log Message: ----------- Folded linux-headers in linux, as I should have from the beginning Modified Paths: -------------- ipcop/trunk/lfs/linux ipcop/trunk/make.sh Modified: ipcop/trunk/lfs/linux =================================================================== --- ipcop/trunk/lfs/linux 2007-04-11 01:55:16 UTC (rev 56) +++ ipcop/trunk/lfs/linux 2007-04-11 01:55:42 UTC (rev 57) @@ -119,6 +119,22 @@ @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar --no-same-owner --no-same-permissions -jxf $(DIR_DL)/$(DL_FILE) +ifeq "$(STAGE)" "toolchain" + cd $(DIR_APP) && make mrproper + cd $(DIR_APP) && make headers_check + cd $(DIR_APP) && make INSTALL_HDR_PATH=$(TOOLS_DIR) headers_install +endif + +ifeq "$(STAGE)" "base" + # ATM Header fix + cd $(DIR_APP) && patch -Np1 < $(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=/usr headers_install +endif + +ifeq "$(STAGE)" "ipcop" #cd $(DIR_SRC) && ln -sf linux-$(VER) linux cd $(DIR_APP) && sed -i -e 's/-Werror//' drivers/scsi/aic7xxx/Makefile cd $(DIR_APP) && sed -i -e 's/gettext//' scripts/kconfig/lkc.h @@ -243,6 +259,7 @@ rm -rf /lib/modules/$(VER)-smp/pcmcia endif +endif @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* @$(POSTBUILD) Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2007-04-11 01:55:16 UTC (rev 56) +++ ipcop/trunk/make.sh 2007-04-11 01:55:42 UTC (rev 57) @@ -1106,7 +1106,7 @@ lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 - lfsmake1 linux-headers + lfsmake1 linux lfsmake1 glibc lfsmake1 adjust-toolchain lfsmake1 tcl @@ -1143,7 +1143,7 @@ export LOGFILE lfsmake2 stage2 - lfsmake2 linux-headers + lfsmake2 linux lfsmake2 man-pages lfsmake2 glibc lfsmake2 adjust-toolchain @@ -1226,8 +1226,8 @@ ipcopmake dhcpcd ipcopmake libusb ipcopmake libpcap - ipcopmake linux-atm # DEBUG -- still problems - ipcopmake ppp # DEBUG -- needs linux-atm + ipcopmake linux-atm + ipcopmake ppp ipcopmake rp-pppoe ipcopmake unzip ipcopmake linux @@ -1351,7 +1351,7 @@ ipcopmake rsrce ipcopmake miboot - stdumount # DEBUG -- + stdumount # DEBUG -- unmount any lingering mounts exit 0 # DEBUG -- end here for now } # End of buildipcop() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |