mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

75 lines
2.8 KiB

  1. diff -ruN hostap-driver-0.2.1/Makefile hostap-driver-0.2.1-new/Makefile
  2. --- hostap-driver-0.2.1/Makefile 2004-04-29 06:39:27.000000000 +0200
  3. +++ hostap-driver-0.2.1-new/Makefile 2004-06-18 16:02:07.449699816 +0200
  4. @@ -47,7 +47,7 @@
  5. VERFILE := $(KERNEL_PATH)/include/linux/version.h
  6. KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
  7. - then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \
  8. + then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
  9. else uname -r; fi)
  10. KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
  11. sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
  12. @@ -62,6 +62,7 @@
  13. MSRC=driver/modules
  14. +
  15. # if Rules.make exists in the kernel tree, we assume 2.4 style modules
  16. # if it doesn't assume 2.6 style
  17. OLDMAKE = $(wildcard $(KERNEL_PATH)/Rules.make)
  18. @@ -90,6 +91,7 @@
  19. endif
  20. 2.4:
  21. + echo "Kernelver: $(KERNELVER) Kernelrelease: $(KERNELRELEASE) Modpath: $(MODPATH)"
  22. @if ! echo "$(KERNELRELEASE)" | grep -q "^2\.4"; then \
  23. echo "*** Can't build for 2.4 with a non-2.4 source!"; \
  24. exit 1; \
  25. @@ -98,6 +100,7 @@
  26. $(MAKE) install_all_info
  27. 2.6:
  28. + echo "Kernelver: $(KERNELVER) Kernelrelease: $(KERNELRELEASE) Modpath: $(MODPATH)"
  29. @if ! echo "$(KERNELRELEASE)" | grep -q "^2\.6" && \
  30. ! echo "$(KERNELRELEASE)" | grep -q "^2\.5"; then \
  31. echo "*** Can't build for 2.6 with a non-2.6 source!"; \
  32. @@ -142,12 +145,7 @@
  33. @if [ -r $(MODPATH)/kernel/drivers/net/wireless/hostap_crypt.ko ]; then \
  34. echo "You may need to remove old $(MODPATH)/kernel/drivers/net/wireless/hostap_crypt.ko"; \
  35. fi
  36. - @if [ -f "/boot/System.map-$(KERNELRELEASE)" ] || [ "$(CURRENTKV)" = "$(KERNELRELEASE)" ]; then \
  37. - echo "*** Running depmod..."; \
  38. - /sbin/depmod -ae; \
  39. - else \
  40. - echo "*** I won't run depmod because I can't find an appropriate System.map file or you are not running the same kernel as the one you are building against. Please run it manually when the conditions are correct..."; \
  41. - fi
  42. + echo "ROCKLinux: not running depmod in build."
  43. install_hostap: $(MSRC)/hostap.o
  44. @echo "Installing hostap.o to $(MODPATH_PCI)"
  45. @@ -167,7 +165,7 @@
  46. mkdir -p $(MODPATH_CS)
  47. cp -f $(MSRC)/$(MODULE_CS) $(MODPATH_CS)
  48. ifndef DESTDIR
  49. - /sbin/depmod -ae
  50. + echo "ROCKLinux: not running depmod in build."
  51. endif
  52. install_conf:
  53. @@ -183,13 +181,13 @@
  54. @echo "Installing $(MODULE_PLX) to $(MODPATH_PLX)"
  55. mkdir -p $(MODPATH_PLX)
  56. cp -f $(MSRC)/$(MODULE_PLX) $(MODPATH_PLX)
  57. - /sbin/depmod -ae
  58. + echo "ROCKLinux: not running depmod in build."
  59. install_pci: install_check install_crypt install_hostap
  60. @echo "Installing $(MODULE_PCI) to $(MODPATH_PCI)"
  61. mkdir -p $(MODPATH_PCI)
  62. cp -f $(MSRC)/$(MODULE_PCI) $(MODPATH_PCI)
  63. - /sbin/depmod -ae
  64. + echo "ROCKLinux: not running depmod in build."
  65. uninstall:
  66. find $(MODPATH) -name "hostap*" | xargs rm -f