module-init-tools.patch 3.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. diff -aur module-init-tools-3.1~orig/Makefile.in module-init-tools-3.1~patched/Makefile.in
  2. --- module-init-tools-3.1~orig/Makefile.in 2004-11-15 01:59:48.000000000 +0100
  3. +++ module-init-tools-3.1~patched/Makefile.in 2005-03-22 22:10:26.843808464 +0100
  4. @@ -613,7 +613,7 @@
  5. check-am: all-am
  6. $(MAKE) $(AM_MAKEFLAGS) check-TESTS
  7. check: check-am
  8. -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
  9. +all-am: Makefile $(PROGRAMS) $(SCRIPTS)
  10. installdirs:
  11. $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
  12. @@ -760,17 +760,10 @@
  13. release: check clean tarball testsuite
  14. -moveold: check-for-sbin check-for-old move-old-targets
  15. -
  16. -check-for-sbin:
  17. - if [ "`echo $(DESTDIR)$(sbindir) | tr -s / /`" = /sbin ]; then :; \
  18. - else \
  19. - echo moveold usually only makes sense when installing into /sbin; \
  20. - exit 1; \
  21. - fi
  22. +moveold: move-old-targets
  23. check-for-old:
  24. - if [ -f /sbin/lsmod.old ]; then \
  25. + if [ -f $(sbindir)/lsmod.old ]; then \
  26. echo Someone already moved old versions. >&2; exit 1; \
  27. fi
  28. @@ -778,27 +771,28 @@
  29. # RedHat 8.0 doesn't ship with readlink by default. Use ls -l.
  30. # Also, make symlink from /bin to /sbin for lsmod (FHS compliant).
  31. move-old-targets:
  32. + if [ ! -f $(sbindir)/lsmod.old ]; then \
  33. for f in lsmod modprobe rmmod depmod insmod modinfo; do \
  34. - if [ -L /sbin/$$f ]; then \
  35. - ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
  36. + if [ -L $(sbindir)/$$f ]; then \
  37. + ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f; \
  38. fi; \
  39. - mv /sbin/$$f /sbin/$$f.old; \
  40. - if [ -f /usr/share/man/man8/$$f.8.gz ]; then \
  41. - mv /usr/share/man/man8/$$f.8.gz \
  42. - /usr/share/man/man8/$$f.old.8.gz; \
  43. - elif [ -f /usr/share/man/man8/$$f.8.bz2 ]; then \
  44. - mv /usr/share/man/man8/$$f.8.bz2 \
  45. - /usr/share/man/man8/$$f.old.8.bz2; \
  46. - else \
  47. - mv /usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
  48. + mv $(sbindir)/$$f $(sbindir)/$$f.old; \
  49. + if [ -f $(prefix)/usr/share/man/man8/$$f.8.gz ]; then \
  50. + mv $(prefix)/usr/share/man/man8/$$f.8.gz \
  51. + $(prefix)/usr/share/man/man8/$$f.old.8.gz; \
  52. + elif [ -f $(prefix)/usr/share/man/man8/$$f.8.bz2 ]; then \
  53. + mv $(prefix)/usr/share/man/man8/$$f.8.bz2 \
  54. + $(prefix)/usr/share/man/man8/$$f.old.8.bz2; \
  55. + elif [ -f $(prefix)/usr/share/man/man8/$$f.8 ]; then \
  56. + mv $(prefix)/usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
  57. fi; \
  58. - done
  59. + done; \
  60. for f in kallsyms ksyms; do \
  61. - if [ -L /sbin/$$f ]; then \
  62. - ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
  63. + if [ -L $(sbindir)/$$f ]; then \
  64. + ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f; \
  65. fi; \
  66. - done
  67. - ln -s /sbin/lsmod.old /bin/lsmod.old
  68. + done; \
  69. + fi
  70. # For installs in /usr/local/sbin
  71. links: