X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fr8169;h=5a8be3c31e3ffe17c141996bbbd2f4d6a8b9344b;hp=65c34e610f570061e2d57a0a3f7d9c4fe3d7aefe;hb=71ce1f7a0e85cd00097acb3d68ff57ac1e5f60ee;hpb=5114bcb3cdee18bdb30b71e9e0df2b559b561273 diff --git a/lfs/r8169 b/lfs/r8169 index 65c34e610..5a8be3c31 100644 --- a/lfs/r8169 +++ b/lfs/r8169 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -26,10 +26,12 @@ include Config VERSUFIX = ipfire$(KCFG) ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.60 + KVER = 2.6.32.61 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)