X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fr8169;h=5e2f4c76a1a7baa46f853728cc475359c1da9c10;hp=65c34e610f570061e2d57a0a3f7d9c4fe3d7aefe;hb=22358c067272bf5cb1b951fa19fe3b2d0c9edf45;hpb=9515a14ef4f7f7ade9b3c9d5b6324abfbb57e252

diff --git a/lfs/r8169 b/lfs/r8169
index 65c34e610..5e2f4c76a 100644
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2013  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -28,8 +28,10 @@ VERSUFIX = ipfire$(KCFG)
 ifeq "$(KCFG)" "-xen"
 	KVER = 2.6.32.60
 	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+	MODNAME = r8169.ko
 else
 	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+	MODNAME = r8169.ko.vendor
 endif
 
 VER        = 6.017.00
@@ -81,11 +83,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	#Save original r8169 module
+ifeq "$(KCFG)" "-xen"
 	-mv $(MODPATH)/r8169.ko \
 	    $(MODPATH)/r8169.ko.org
+endif
 	@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 $(MODPATH)
+	cd $(DIR_APP)/src && install -m 644 r8169.ko $(MODPATH)/$(MODNAME)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)