From 520e688b2b427b2f0418bee2357fa7b0d303e7dc Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 19 Dec 2022 19:15:40 +0000 Subject: [PATCH] lshw: bump to 42fef565 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gettext is need for documentation * riscv64 machines are supported * runtime dependencies when machines support the feature * add pciutils when machines have pci * add usbutils when machines have usbhost * Patch 0001-Fix-musl-build.patch merged in: https://github.com/lyonel/lshw/commit/d3c66a6b2a0799d6982f4dc77b291934fcba80c9 https://github.com/lyonel/lshw/commit/0140f7f28a09d33dc46531212d095da5e021b027 Changelog: - PA-RISC: handle pushd failure - make version check optional - Github PR85 Set product name for all netdevs sharing the same PCI number - Merge pull request 'Add Spanish translation' (#48) from alexhenrie/lshw:es into master - Merge branch 'master' into es - Merge pull request 'Fix mistakes in Catalan translation' (#47) from alexhenrie/lshw:ca into master - Add Spanish translation - Fix mistakes in Catalan translation - Merge pull request 'Add Catalan translation' (#46) from alexhenrie/lshw:ca into master - merge Github PR#77 - use max (9) Gzip compression - Add Catalan translation - Update POT file - Add more network speeds - Merge pull request 'Remove unnecessary space before closing parenthesis' (#45) from alexhenrie/lshw:punctuation into master - Merge pull request 'Translate all words of a phrase together' (#44) from alexhenrie/lshw:legos into master - Merge pull request 'Fix another typo' (#43) from alexhenrie/lshw:typos into master - Merge branch 'master' of https://ezix.org/src/pkg/lshw - add some includes - fix typo - cosmetic fixes - support for new ethtool capabilities - code clean-up - code clean-up - allow pkg-config override - allow pkg-config override - Remove unnecessary space before closing parenthesis - Translate all words of a phrase together - Fix another typo - Merge pull request 'Fix typos in translatable messages' (#42) from alexhenrie/lshw:typos into master - Fix typos in translatable messages - Fix getting size of memory banks <32GiB - Merge pull request 'devtree: Add UUID property' (#40) from hegdevasant/lshw:lpar-uuid into master - devtree: Add UUID property - code clean-up - improve portability (esp. musl) - fix potential crash - add static target to Makefile - Avoid crash on device-tree parsing - Add JEDEC manufacturer - Report correct memory size on SMBIOS < 2.7 - fix man page after previous update - update man page - Update 'docs/TODO' - Update 'docs/TODO' - Merge pull request 'Replace the about GtkDialog with a GtkAboutDialog' (#39) from linkmauve/lshw:better-about into master - Replace the about GtkDialog with a GtkAboutDialog - Merge pull request 'Move from GtkMenuBar to GMenu' (#38) from linkmauve/lshw:gmenu into master - Move from GtkMenuBar to GMenu - Merge pull request 'Switch to gtk3 by default for gtk-lshw' (#37) from linkmauve/lshw:gtk3 into master - Enable/Disable GSimpleAction instead of button sensitivity - Replace signals with GSimpleActions - Move to GtkApplication - Remove deprecated use_action_appearance property - Remove deprecated widgets - Replace the last GtkStock in overwrite dialog - Replace deprecated GtkIconFactory with GHashTable - Use GtkFileChooserNative instead of GtkFileChooserDialog - Remove hack which is apparently not useful anymore - Remove deprecated stock messages - Build against gtk3 instead of gtk2 - Merge pull request 'Fix few memory leaks' (#34) from shivaprasadbhat/lshw:master into master - Fix few memory leaks - report product model on Power systems - clean-up JSON output - JSON output clean-up (list/object) - code clean-up for read(3) - Merge pull request 'devtree: Add capabilites to the OPAL Firmware' (#33) from shivaprasadbhat/lshw:master into master - Merge pull request 'volumes: fix segfault in apfs volume code' (#32) from hjmallon/lshw:pr.segfault into master - fix issue with logical names being truncated (`/dev/sda` → `sda`) - devtree: Add capabilites to the OPAL Firmware - merge Github PR #53 - volumes: fix segfault in apfs volume code - Merge pull request 'devtree: Add chip-id from CPU node' (#31) from shivaprasadbhat/lshw:master into master - devtree: Add chip-id from CPU node - Merge pull request 'devtree: Add chip-id from the dimm module' (#30) from shivaprasadbhat/lshw:master into master - devtree: Add chip-id from the dimm module - try to connect input devices to the right parent - detect framebuffers - detect sound devices - cosmetic fixes - begin work on input devices - cosmetic clean-up - correctly format SMBIOS UUID - move PnP devices to the ISA/LPC bridge - report CPU family/model/stepping - get rid of RPM's debug packages - add debug flag to GUI build Signed-off-by: Jose Quaresma --- .../lshw/files/0001-Fix-musl-build.patch | 125 ------------------ .../lshw/{lshw_02.19.2.bb => lshw_git.bb} | 21 +-- 2 files changed, 13 insertions(+), 133 deletions(-) delete mode 100644 meta-oe/recipes-devtools/lshw/files/0001-Fix-musl-build.patch rename meta-oe/recipes-devtools/lshw/{lshw_02.19.2.bb => lshw_git.bb} (59%) diff --git a/meta-oe/recipes-devtools/lshw/files/0001-Fix-musl-build.patch b/meta-oe/recipes-devtools/lshw/files/0001-Fix-musl-build.patch deleted file mode 100644 index fa90aa1211a..00000000000 --- a/meta-oe/recipes-devtools/lshw/files/0001-Fix-musl-build.patch +++ /dev/null @@ -1,125 +0,0 @@ -From a5a4bb4254b2109bd3e272174946f0bb36ee99a8 Mon Sep 17 00:00:00 2001 -From: Leon Anavi -Date: Tue, 25 Aug 2020 11:45:45 +0300 -Subject: [PATCH] Fix musl build - -Apply the following fixes for musl: - -- Fix basename() is in libgen.h -- Fix wrong usage of LONG_BIT - -Same fixes have been submitted to the upstream of lshw by Sergio -Prado but they have not been merged yet. - -Upstream-Status: Submitted - -Co-Authored-By: Sergio Prado -Signed-off-by: Leon Anavi ---- - src/core/abi.cc | 4 +--- - src/core/sysfs.cc | 19 ++++++++++--------- - 2 files changed, 11 insertions(+), 12 deletions(-) - -diff --git a/src/core/abi.cc b/src/core/abi.cc -index adff7b5..76c664c 100644 ---- a/src/core/abi.cc -+++ b/src/core/abi.cc -@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); - bool scan_abi(hwNode & system) - { - // are we compiled as 32- or 64-bit process ? -- long sc = sysconf(LONG_BIT); -- if(sc==-1) sc = sysconf(_SC_LONG_BIT); -- if(sc!=-1) system.setWidth(sc); -+ system.setWidth(LONG_BIT); - - pushd(PROC_SYS); - -diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc -index 32d6564..c2fa84f 100644 ---- a/src/core/sysfs.cc -+++ b/src/core/sysfs.cc -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - - __ID("@(#) $Id$"); -@@ -100,7 +101,7 @@ static string sysfs_getbustype(const string & path) - { - devname = - string(fs.path + "/bus/") + string(namelist[i]->d_name) + -- "/devices/" + basename(path.c_str()); -+ "/devices/" + basename(const_cast(path.c_str())); - - if (samefile(devname, path)) - return string(namelist[i]->d_name); -@@ -140,7 +141,7 @@ static string sysfstobusinfo(const string & path) - - if (bustype == "usb") - { -- string name = basename(path.c_str()); -+ string name = basename(const_cast(path.c_str())); - if (matches(name, "^[0-9]+-[0-9]+(\\.[0-9]+)*:[0-9]+\\.[0-9]+$")) - { - size_t colon = name.rfind(":"); -@@ -151,7 +152,7 @@ static string sysfstobusinfo(const string & path) - - if (bustype == "virtio") - { -- string name = basename(path.c_str()); -+ string name = basename(const_cast(path.c_str())); - if (name.compare(0, 6, "virtio") == 0) - return "virtio@" + name.substr(6); - else -@@ -159,10 +160,10 @@ static string sysfstobusinfo(const string & path) - } - - if (bustype == "vio") -- return string("vio@") + basename(path.c_str()); -+ return string("vio@") + basename(const_cast(path.c_str())); - - if (bustype == "ccw") -- return string("ccw@") + basename(path.c_str()); -+ return string("ccw@") + basename(const_cast(path.c_str())); - - if (bustype == "ccwgroup") - { -@@ -240,7 +241,7 @@ string entry::driver() const - string driverlink = This->devpath + "/driver"; - if (!exists(driverlink)) - return ""; -- return basename(readlink(driverlink).c_str()); -+ return basename(const_cast(readlink(driverlink).c_str())); - } - - -@@ -328,7 +329,7 @@ string entry::name_in_class(const string & classname) const - - string entry::name() const - { -- return basename(This->devpath.c_str()); -+ return basename(const_cast(This->devpath.c_str())); - } - - -@@ -340,12 +341,12 @@ entry entry::parent() const - - string entry::classname() const - { -- return basename(dirname(This->devpath).c_str()); -+ return basename(const_cast(dirname(This->devpath).c_str())); - } - - bool entry::isvirtual() const - { -- return string(basename(dirname(dirname(This->devpath)).c_str())) == "virtual"; -+ return string(basename(const_cast(dirname(dirname(This->devpath)).c_str()))) == "virtual"; - } - - string entry::string_attr(const string & name, const string & def) const --- -2.17.1 - diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-oe/recipes-devtools/lshw/lshw_git.bb similarity index 59% rename from meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb rename to meta-oe/recipes-devtools/lshw/lshw_git.bb index 8b3608a2482..6845d0daf9f 100644 --- a/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-oe/recipes-devtools/lshw/lshw_git.bb @@ -9,16 +9,21 @@ SECTION = "console/tools" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64|riscv64).*-linux" -SRC_URI = " \ - http://ezix.org/software/files/lshw-B.${PV}.tar.gz \ - file://0001-Fix-musl-build.patch \ -" -SRC_URI[md5sum] = "8c70d46e906688309095c73ecb9396e3" -SRC_URI[sha256sum] = "9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80" +SRC_URI = "git://github.com/lyonel/lshw.git;protocol=https;branch=master" +SRCREV = "42fef565731411a784101de614a54bff79d1858e" + +S = "${WORKDIR}/git" -S = "${WORKDIR}/lshw-B.${PV}" +DEPENDS = "gettext-native" + +PACKAGECONFIG ?= " \ + ${@bb.utils.filter('MACHINE_FEATURES', 'pci', d)} \ + ${@bb.utils.filter('MACHINE_FEATURES', 'usbhost', d)} \ +" +PACKAGECONFIG[pci] = ",,,pciutils" +PACKAGECONFIG[usbhost] = ",,,usbutils" do_compile() { # build core only - don't ship gui