hwinfo: fix compilation with ARC

Added a small patch to fix compilation.

Renamed patch files to have a .patch suffix. Makes them easier to read
with vim and probably IDEs.

Remove UCLIBC depend since it's no longer present.

Signed-off-by: Rosen Penev <redacted>

diff --git a/utils/hwinfo/Makefile b/utils/hwinfo/Makefile
index 4443ad586c19a832d4522c5e0c26d57c21b6caab..03871f90ce0b1be5c13d8bdaa4cdd6be47f3cd5b 100644 (file)
--- a/utils/hwinfo/Makefile
+++ b/utils/hwinfo/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hwinfo
 PKG_VERSION:=21.71
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/openSUSE/hwinfo/tar.gz/$(PKG_VERSION)?
@@ -66,7 +66,7 @@ define Package/hwinfo
   CATEGORY:=Utilities
   TITLE:=probe the hardware present in the system
   URL:=https://github.com/openSUSE/hwinfo
-  DEPENDS:= +libuuid @!USE_UCLIBC
+  DEPENDS:= +libuuid
 endef
 
 define Package/hwinfo/description

diff --git a/utils/hwinfo/patches/0-hardcoding-version b/utils/hwinfo/patches/010-hardcoding-version.patch
similarity index 100%
rename from utils/hwinfo/patches/0-hardcoding-version
rename to utils/hwinfo/patches/010-hardcoding-version.patch

diff --git a/utils/hwinfo/patches/1-remove_libx8emu_dependency b/utils/hwinfo/patches/020-remove_libx8emu_dependency.patch
similarity index 100%
rename from utils/hwinfo/patches/1-remove_libx8emu_dependency
rename to utils/hwinfo/patches/020-remove_libx8emu_dependency.patch

diff --git a/utils/hwinfo/patches/2-enable-hw-ids-and-disable-generation-of-tiny-hwinfo-headers b/utils/hwinfo/patches/030-enable-hw-ids-and-disable-generation-of-tiny-hwinfo-headers.patch
similarity index 100%
rename from utils/hwinfo/patches/2-enable-hw-ids-and-disable-generation-of-tiny-hwinfo-headers
rename to utils/hwinfo/patches/030-enable-hw-ids-and-disable-generation-of-tiny-hwinfo-headers.patch

diff --git a/utils/hwinfo/patches/3-assorted-Makefile-butchery b/utils/hwinfo/patches/040-assorted-Makefile-butchery.patch
similarity index 100%
rename from utils/hwinfo/patches/3-assorted-Makefile-butchery
rename to utils/hwinfo/patches/040-assorted-Makefile-butchery.patch

diff --git a/utils/hwinfo/patches/050-arc.patch b/utils/hwinfo/patches/050-arc.patch
new file mode 100644 (file)
index 0000000..07010c8
--- /dev/null
+++ b/utils/hwinfo/patches/050-arc.patch
@@ -0,0 +1,13 @@
+--- a/src/hd/hd.c
++++ b/src/hd/hd.c
+@@ -156,6 +156,10 @@
+ #define HD_ARCH "riscv"
+ #endif
+ 
++#ifdef __arc__
++#define HD_ARCH "arc"
++#endif
++
+ typedef struct disk_s {
+   struct disk_s *next;
+   unsigned crc;