From 6af7fbbf016332acb7c0f3475e77724d3ffb5eae Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 20 Apr 2021 16:06:21 -0700
Subject: [PATCH] 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 <rosenp@gmail.com>
---
 utils/hwinfo/Makefile                               |  4 ++--
 ...dcoding-version => 010-hardcoding-version.patch} |  0
 ...endency => 020-remove_libx8emu_dependency.patch} |  0
 ...disable-generation-of-tiny-hwinfo-headers.patch} |  0
 ...utchery => 040-assorted-Makefile-butchery.patch} |  0
 utils/hwinfo/patches/050-arc.patch                  | 13 +++++++++++++
 6 files changed, 15 insertions(+), 2 deletions(-)
 rename utils/hwinfo/patches/{0-hardcoding-version => 010-hardcoding-version.patch} (100%)
 rename utils/hwinfo/patches/{1-remove_libx8emu_dependency => 020-remove_libx8emu_dependency.patch} (100%)
 rename utils/hwinfo/patches/{2-enable-hw-ids-and-disable-generation-of-tiny-hwinfo-headers => 030-enable-hw-ids-and-disable-generation-of-tiny-hwinfo-headers.patch} (100%)
 rename utils/hwinfo/patches/{3-assorted-Makefile-butchery => 040-assorted-Makefile-butchery.patch} (100%)
 create mode 100644 utils/hwinfo/patches/050-arc.patch

diff --git a/utils/hwinfo/Makefile b/utils/hwinfo/Makefile
index 4443ad586c..03871f90ce 100644
--- 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
index 0000000000..07010c8261
--- /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;