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.

68 lines
1.8 KiB

  1. the library libx86emu is used only for manipulating VBIOS
  2. firmware to get some information from it.
  3. Since it's not crucial for OpenWrt usecase and it's a pain
  4. to compile this package with this dependency in OpenWrt due to
  5. host builds and whatnot, we simply remove it and disable this
  6. functionality in hwinfo.
  7. This also saves some space.
  8. --- a/Makefile
  9. +++ b/Makefile
  10. @@ -25,13 +25,14 @@
  11. endif
  12. ULIBDIR = $(LIBDIR)
  13. +# this library has been removed from the code, disabling it here too
  14. # ia64
  15. -ifneq ($(filter i386 x86_64, $(ARCH)),)
  16. -SLIBS += -lx86emu
  17. -TLIBS += -lx86emu
  18. -SO_LIBS += -lx86emu
  19. -TSO_LIBS += -lx86emu
  20. -endif
  21. +#ifneq ($(filter i386 x86_64, $(ARCH)),)
  22. +#SLIBS += -lx86emu
  23. +#TLIBS += -lx86emu
  24. +#SO_LIBS += -lx86emu
  25. +#TSO_LIBS += -lx86emu
  26. +#endif
  27. SHARED_FLAGS =
  28. OBJS_NO_TINY = names.o parallel.o modem.o
  29. --- a/src/hd/bios.c
  30. +++ b/src/hd/bios.c
  31. @@ -447,9 +447,10 @@
  32. }
  33. }
  34. -#if defined(__i386__) || defined (__x86_64__)
  35. - get_vbe_info(hd_data, vbe);
  36. -#endif
  37. +//disabled as we removed the library needed for this function
  38. +//#if defined(__i386__) || defined (__x86_64__)
  39. +// get_vbe_info(hd_data, vbe);
  40. +//#endif
  41. if(vbe->ok) {
  42. bt->vbe_ver = vbe->version;
  43. --- a/src/hd/bios.h
  44. +++ b/src/hd/bios.h
  45. @@ -5,4 +5,5 @@
  46. #define BIOS_RAM_SIZE 0x100
  47. void hd_scan_bios(hd_data_t *hd_data);
  48. -void get_vbe_info(hd_data_t *hd_data, vbe_info_t *vbe);
  49. +//disabled as we removed the lib needed by this function
  50. +//void get_vbe_info(hd_data_t *hd_data, vbe_info_t *vbe);
  51. --- a/src/hd/mdt.c
  52. +++ b/src/hd/mdt.c
  53. @@ -1,4 +1,6 @@
  54. -#if defined(__i386__) || defined (__x86_64__)
  55. +//disabling this whole thing as it's using the lib we have removed
  56. +//#if defined(__i386__) || defined (__x86_64__)
  57. +#if defined(__disabled__) || defined (__disabled__)
  58. #define _GNU_SOURCE