r81xx: fix modulpath for 3.2.x kernel.

diff --git a/lfs/r8101 b/lfs/r8101
index e1c8206ef357a428dbb4038bba7280ed54c56f0e..85d39007b871c65b5222adaf8dea66beed1abb1c 100644 (file)
--- a/lfs/r8101
+++ b/lfs/r8101
@@ -27,6 +27,9 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 ifeq "$(KCFG)" "-xen"
        KVER = 2.6.32.60
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
 endif
 
 VER        = 1.023.00
@@ -80,6 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8101_add_missing_pciids.patch
        cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
-       cd $(DIR_APP)/src && install -m 644 r8101.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+       cd $(DIR_APP)/src && install -m 644 r8101.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/r8168 b/lfs/r8168
index 09a55f00d2ed7635e05c742fc1f212ba170f224f..940172fe9aecc28db92d6a5729589542866b97ae 100644 (file)
--- a/lfs/r8168
+++ b/lfs/r8168
@@ -27,6 +27,9 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 ifeq "$(KCFG)" "-xen"
        KVER = 2.6.32.60
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
 endif
 
 VER        = 8.032.00
@@ -79,6 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
-       cd $(DIR_APP)/src && install -m 644 r8168.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+       cd $(DIR_APP)/src && install -m 644 r8168.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/r8169 b/lfs/r8169
index 3e8341b7090274f632e58ca2bcd0b4ef4d611532..65c34e610f570061e2d57a0a3f7d9c4fe3d7aefe 100644 (file)
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -27,6 +27,9 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 ifeq "$(KCFG)" "-xen"
        KVER = 2.6.32.60
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
 endif
 
 VER        = 6.017.00
@@ -78,11 +81,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        #Save original r8169 module
-       -mv /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/r8169.ko \
-           /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/r8169.ko.org
+       -mv $(MODPATH)/r8169.ko \
+           $(MODPATH)/r8169.ko.org
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8169_add_missing_pciids.patch
        cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
-       cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+       cd $(DIR_APP)/src && install -m 644 r8169.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)