Two fixes of the previous two commits.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1170 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/linux b/lfs/linux
index 345ab2a8d8acf7451ff6d108451949ae86904f1e..2f8be8180edc57920118411566fb57d4d16bdbff 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -46,7 +46,7 @@ L7VER      = 2.15
 ###############################################################################
 
 objects = $(DL_FILE) $(IPP2P).tar.bz2 layer7-kernel-$(L7VER).patch \
-       reiser4-2.6.23-2.patch
+       reiser4-for-$(VER).patch
 
 install : $(TARGET)
 
@@ -81,7 +81,7 @@ ifeq "$(STAGE)" "ipfire"
 
        ### Reiser4
        #
-       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/reiser4-for-2.6.24.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/reiser4-for-$(VER).patch
        
        # ip_conntrack permissions from 440 to 444
        #cd $(DIR_APP) && patch -Np0 < $(DIR_PATCHES)/ip_conntrack_standalone-patch-for-ipfire.patch

diff --git a/tools/make-include b/tools/make-include
index 2a899ecea9d12bccecb641d718fa5f6100eda70f..dda7d65b7f9243d620becc73523e0f5e65bc3cf0 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -615,7 +615,7 @@ prepareenv() {
        mkdir -p $LFS/{$TOOLS_DIR,usr/src} 2>/dev/null
        mkdir -p $LFS/dev/pts
        mkdir -p $LFS/proc
-       mkdir -p $LFS/usr/src/{cache,config,doc,html,lfs,log_${MACHINE},src,ccache,distcc}
+       mkdir -p $LFS/usr/src/{cache,config,doc,lfs,log_${MACHINE},src,ccache,distcc}
        mkdir -p $LFS/{$INSTALLER_DIR,cdrom,images,usr/local/{ccache,distcc}}
        mkdir -p $LFS/etc
 
@@ -630,7 +630,6 @@ prepareenv() {
        mount --bind $BASEDIR/distcc                                                                                                                    $LFS/usr/src/distcc
        mount --bind $BASEDIR/config                                                                                                                    $LFS/usr/src/config
        mount --bind $BASEDIR/doc                                                                                                                                       $LFS/usr/src/doc
-       mount --bind $BASEDIR/html                                                                                                                              $LFS/usr/src/html
        mount --bind $BASEDIR/lfs                                                                                                                                       $LFS/usr/src/lfs
        mount --bind $BASEDIR/log_${MACHINE}                                                                                    $LFS/usr/src/log_${MACHINE}
        mount --bind $BASEDIR/src                                                                                                                                       $LFS/usr/src/src