diff options
| author | Jose Quaresma <quaresma.jose@gmail.com> | 2023-01-05 12:00:49 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-01-06 11:38:16 -0800 |
| commit | e2919120c4401d88f69ca71bc00365acc3640869 (patch) | |
| tree | 989ac9c1885f1903ccc0ff54b45750178a230db3 | |
| parent | 82417adc3cf0c8de39bfb3ed75ce17f590d1a60f (diff) | |
| download | meta-openembedded-e2919120c4401d88f69ca71bc00365acc3640869.tar.gz | |
lshw: bump to 42fef565
* gettext is need for translation
* riscv64 machines are supported
* add packageconfig support for sqlite and zlib
- add native pkgconfig
- enable zlib as it will reduce considerable the data files sizes
* patches
- add 0001-disable-docbook2man.patch to not build .sgml file
- drop 0001-Fix-musl-build.patch as it is 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 <jose.quaresma@foundries.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 47 insertions, 131 deletions
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 fa90aa1211..0000000000 --- a/meta-oe/recipes-devtools/lshw/files/0001-Fix-musl-build.patch +++ /dev/null | |||
| @@ -1,125 +0,0 @@ | |||
| 1 | From a5a4bb4254b2109bd3e272174946f0bb36ee99a8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leon Anavi <leon.anavi@konsulko.com> | ||
| 3 | Date: Tue, 25 Aug 2020 11:45:45 +0300 | ||
| 4 | Subject: [PATCH] Fix musl build | ||
| 5 | |||
| 6 | Apply the following fixes for musl: | ||
| 7 | |||
| 8 | - Fix basename() is in libgen.h | ||
| 9 | - Fix wrong usage of LONG_BIT | ||
| 10 | |||
| 11 | Same fixes have been submitted to the upstream of lshw by Sergio | ||
| 12 | Prado but they have not been merged yet. | ||
| 13 | |||
| 14 | Upstream-Status: Submitted | ||
| 15 | |||
| 16 | Co-Authored-By: Sergio Prado <sergio.prado@e-labworks.com> | ||
| 17 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
| 18 | --- | ||
| 19 | src/core/abi.cc | 4 +--- | ||
| 20 | src/core/sysfs.cc | 19 ++++++++++--------- | ||
| 21 | 2 files changed, 11 insertions(+), 12 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/src/core/abi.cc b/src/core/abi.cc | ||
| 24 | index adff7b5..76c664c 100644 | ||
| 25 | --- a/src/core/abi.cc | ||
| 26 | +++ b/src/core/abi.cc | ||
| 27 | @@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); | ||
| 28 | bool scan_abi(hwNode & system) | ||
| 29 | { | ||
| 30 | // are we compiled as 32- or 64-bit process ? | ||
| 31 | - long sc = sysconf(LONG_BIT); | ||
| 32 | - if(sc==-1) sc = sysconf(_SC_LONG_BIT); | ||
| 33 | - if(sc!=-1) system.setWidth(sc); | ||
| 34 | + system.setWidth(LONG_BIT); | ||
| 35 | |||
| 36 | pushd(PROC_SYS); | ||
| 37 | |||
| 38 | diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc | ||
| 39 | index 32d6564..c2fa84f 100644 | ||
| 40 | --- a/src/core/sysfs.cc | ||
| 41 | +++ b/src/core/sysfs.cc | ||
| 42 | @@ -16,6 +16,7 @@ | ||
| 43 | #include <sys/stat.h> | ||
| 44 | #include <sys/types.h> | ||
| 45 | #include <sys/mount.h> | ||
| 46 | +#include <libgen.h> | ||
| 47 | |||
| 48 | |||
| 49 | __ID("@(#) $Id$"); | ||
| 50 | @@ -100,7 +101,7 @@ static string sysfs_getbustype(const string & path) | ||
| 51 | { | ||
| 52 | devname = | ||
| 53 | string(fs.path + "/bus/") + string(namelist[i]->d_name) + | ||
| 54 | - "/devices/" + basename(path.c_str()); | ||
| 55 | + "/devices/" + basename(const_cast<char*>(path.c_str())); | ||
| 56 | |||
| 57 | if (samefile(devname, path)) | ||
| 58 | return string(namelist[i]->d_name); | ||
| 59 | @@ -140,7 +141,7 @@ static string sysfstobusinfo(const string & path) | ||
| 60 | |||
| 61 | if (bustype == "usb") | ||
| 62 | { | ||
| 63 | - string name = basename(path.c_str()); | ||
| 64 | + string name = basename(const_cast<char*>(path.c_str())); | ||
| 65 | if (matches(name, "^[0-9]+-[0-9]+(\\.[0-9]+)*:[0-9]+\\.[0-9]+$")) | ||
| 66 | { | ||
| 67 | size_t colon = name.rfind(":"); | ||
| 68 | @@ -151,7 +152,7 @@ static string sysfstobusinfo(const string & path) | ||
| 69 | |||
| 70 | if (bustype == "virtio") | ||
| 71 | { | ||
| 72 | - string name = basename(path.c_str()); | ||
| 73 | + string name = basename(const_cast<char*>(path.c_str())); | ||
| 74 | if (name.compare(0, 6, "virtio") == 0) | ||
| 75 | return "virtio@" + name.substr(6); | ||
| 76 | else | ||
| 77 | @@ -159,10 +160,10 @@ static string sysfstobusinfo(const string & path) | ||
| 78 | } | ||
| 79 | |||
| 80 | if (bustype == "vio") | ||
| 81 | - return string("vio@") + basename(path.c_str()); | ||
| 82 | + return string("vio@") + basename(const_cast<char*>(path.c_str())); | ||
| 83 | |||
| 84 | if (bustype == "ccw") | ||
| 85 | - return string("ccw@") + basename(path.c_str()); | ||
| 86 | + return string("ccw@") + basename(const_cast<char*>(path.c_str())); | ||
| 87 | |||
| 88 | if (bustype == "ccwgroup") | ||
| 89 | { | ||
| 90 | @@ -240,7 +241,7 @@ string entry::driver() const | ||
| 91 | string driverlink = This->devpath + "/driver"; | ||
| 92 | if (!exists(driverlink)) | ||
| 93 | return ""; | ||
| 94 | - return basename(readlink(driverlink).c_str()); | ||
| 95 | + return basename(const_cast<char*>(readlink(driverlink).c_str())); | ||
| 96 | } | ||
| 97 | |||
| 98 | |||
| 99 | @@ -328,7 +329,7 @@ string entry::name_in_class(const string & classname) const | ||
| 100 | |||
| 101 | string entry::name() const | ||
| 102 | { | ||
| 103 | - return basename(This->devpath.c_str()); | ||
| 104 | + return basename(const_cast<char*>(This->devpath.c_str())); | ||
| 105 | } | ||
| 106 | |||
| 107 | |||
| 108 | @@ -340,12 +341,12 @@ entry entry::parent() const | ||
| 109 | |||
| 110 | string entry::classname() const | ||
| 111 | { | ||
| 112 | - return basename(dirname(This->devpath).c_str()); | ||
| 113 | + return basename(const_cast<char*>(dirname(This->devpath).c_str())); | ||
| 114 | } | ||
| 115 | |||
| 116 | bool entry::isvirtual() const | ||
| 117 | { | ||
| 118 | - return string(basename(dirname(dirname(This->devpath)).c_str())) == "virtual"; | ||
| 119 | + return string(basename(const_cast<char*>(dirname(dirname(This->devpath)).c_str()))) == "virtual"; | ||
| 120 | } | ||
| 121 | |||
| 122 | string entry::string_attr(const string & name, const string & def) const | ||
| 123 | -- | ||
| 124 | 2.17.1 | ||
| 125 | |||
diff --git a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch new file mode 100644 index 0000000000..00f7b8674e --- /dev/null +++ b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 544df0f5fd99925a3ce568c777413e0c31cb0028 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jose Quaresma <jose.quaresma@foundries.io> | ||
| 3 | Date: Mon, 2 Jan 2023 15:32:39 +0000 | ||
| 4 | Subject: [PATCH] build: Do not build .sgml file | ||
| 5 | |||
| 6 | It needs docbook2man tool which we do not have recipe for | ||
| 7 | |||
| 8 | Upstream-Status: OE-Specific [needs native docbook2man tool] | ||
| 9 | |||
| 10 | Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> | ||
| 11 | --- | ||
| 12 | src/Makefile | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/src/Makefile b/src/Makefile | ||
| 16 | index ac726d0..af6281d 100644 | ||
| 17 | --- a/src/Makefile | ||
| 18 | +++ b/src/Makefile | ||
| 19 | @@ -102,7 +102,7 @@ $(PACKAGENAME)-compressed: $(PACKAGENAME)-static | ||
| 20 | upx -9 -o $@ $< | ||
| 21 | |||
| 22 | $(PACKAGENAME).1: $(PACKAGENAME).sgml | ||
| 23 | - docbook2man $< | ||
| 24 | + @echo "Needs docbook2man" | ||
| 25 | |||
| 26 | pci.ids: | ||
| 27 | wget http://pciids.sourceforge.net/pci.ids | ||
| 28 | -- | ||
| 29 | 2.25.1 | ||
| 30 | |||
diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb index 8b3608a248..f2de593cf1 100644 --- a/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb | |||
| @@ -9,16 +9,27 @@ SECTION = "console/tools" | |||
| 9 | LICENSE = "GPL-2.0-or-later" | 9 | LICENSE = "GPL-2.0-or-later" |
| 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 11 | 11 | ||
| 12 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | 12 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64|riscv64).*-linux" |
| 13 | 13 | ||
| 14 | PV .= "+git${SRCPV}" | ||
| 15 | SRCREV = "42fef565731411a784101de614a54bff79d1858e" | ||
| 14 | SRC_URI = " \ | 16 | SRC_URI = " \ |
| 15 | http://ezix.org/software/files/lshw-B.${PV}.tar.gz \ | 17 | git://github.com/lyonel/lshw.git;protocol=https;branch=master \ |
| 16 | file://0001-Fix-musl-build.patch \ | 18 | file://0001-disable-docbook2man.patch \ |
| 17 | " | 19 | " |
| 18 | SRC_URI[md5sum] = "8c70d46e906688309095c73ecb9396e3" | ||
| 19 | SRC_URI[sha256sum] = "9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80" | ||
| 20 | 20 | ||
| 21 | S = "${WORKDIR}/lshw-B.${PV}" | 21 | S = "${WORKDIR}/git" |
| 22 | |||
| 23 | inherit pkgconfig | ||
| 24 | |||
| 25 | DEPENDS = "gettext-native" | ||
| 26 | |||
| 27 | PACKAGECONFIG ??= "zlib" | ||
| 28 | PACKAGECONFIG[sqlite] = "SQLITE=1,SQLITE=0,sqlite3" | ||
| 29 | PACKAGECONFIG[zlib] = "ZLIB=1,ZLIB=0,zlib gzip-native" | ||
| 30 | |||
| 31 | # use the PACKAGECONFIG configurations arguments | ||
| 32 | EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" | ||
| 22 | 33 | ||
| 23 | do_compile() { | 34 | do_compile() { |
| 24 | # build core only - don't ship gui | 35 | # build core only - don't ship gui |
