Skip to content

Commit 3335068

Browse files
quaresmajosekraj
authored andcommitted
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: lyonel/lshw@d3c66a6 lyonel/lshw@0140f7f 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' (openembedded#48) from alexhenrie/lshw:es into master - Merge branch 'master' into es - Merge pull request 'Fix mistakes in Catalan translation' (openembedded#47) from alexhenrie/lshw:ca into master - Add Spanish translation - Fix mistakes in Catalan translation - Merge pull request 'Add Catalan translation' (openembedded#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' (openembedded#45) from alexhenrie/lshw:punctuation into master - Merge pull request 'Translate all words of a phrase together' (openembedded#44) from alexhenrie/lshw:legos into master - Merge pull request 'Fix another typo' (openembedded#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' (openembedded#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' (openembedded#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' (openembedded#39) from linkmauve/lshw:better-about into master - Replace the about GtkDialog with a GtkAboutDialog - Merge pull request 'Move from GtkMenuBar to GMenu' (openembedded#38) from linkmauve/lshw:gmenu into master - Move from GtkMenuBar to GMenu - Merge pull request 'Switch to gtk3 by default for gtk-lshw' (openembedded#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' (openembedded#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' (openembedded#33) from shivaprasadbhat/lshw:master into master - Merge pull request 'volumes: fix segfault in apfs volume code' (openembedded#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 openembedded#53 - volumes: fix segfault in apfs volume code - Merge pull request 'devtree: Add chip-id from CPU node' (openembedded#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' (openembedded#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 <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent 2e88420 commit 3335068

File tree

3 files changed

+47
-131
lines changed

3 files changed

+47
-131
lines changed

meta-oe/recipes-devtools/lshw/files/0001-Fix-musl-build.patch

Lines changed: 0 additions & 125 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 544df0f5fd99925a3ce568c777413e0c31cb0028 Mon Sep 17 00:00:00 2001
2+
From: Jose Quaresma <[email protected]>
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 <[email protected]>
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+

meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,27 @@ SECTION = "console/tools"
99
LICENSE = "GPL-2.0-or-later"
1010
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
1111

12-
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
12+
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64|riscv64).*-linux"
1313

14+
PV .= "+git${SRCPV}"
15+
SRCREV = "42fef565731411a784101de614a54bff79d1858e"
1416
SRC_URI = " \
15-
http://ezix.org/software/files/lshw-B.${PV}.tar.gz \
16-
file://0001-Fix-musl-build.patch \
17+
git://github.com/lyonel/lshw.git;protocol=https;branch=master \
18+
file://0001-disable-docbook2man.patch \
1719
"
18-
SRC_URI[md5sum] = "8c70d46e906688309095c73ecb9396e3"
19-
SRC_URI[sha256sum] = "9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80"
2020

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}"
2233

2334
do_compile() {
2435
# build core only - don't ship gui

0 commit comments

Comments
 (0)