Skip to content

Commit 599d26c

Browse files
committed
fix: installing lshw share info files and change package name
Signed-off-by: nabil salah <nabil.salah203@gmail.com>
1 parent 3e1dba4 commit 599d26c

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

packages/lshw.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,40 @@ LSHW_CHECKSUM="5805eba5f31886582fff673c5dccdb3b"
33
LSHW_LINK="https://github.com/lyonel/lshw/archive/refs/tags/${LSHW_VERSION}.tar.gz"
44

55
download_lshw() {
6-
download_file $LSHW_LINK $LSHW_CHECKSUM
6+
download_file $LSHW_LINK $LSHW_CHECKSUM lshw-${LSHW_VERSION}.tar.gz
77
}
88

99
extract_lshw() {
1010
if [ ! -d "lshw-${LSHW_VERSION}" ]; then
1111
echo "[+] extracting: lshw-${LSHW_VERSION}"
12-
tar -xf ${DISTFILES}/${LSHW_VERSION}.tar.gz -C .
12+
tar -xf ${DISTFILES}/lshw-${LSHW_VERSION}.tar.gz -C .
1313
fi
1414
}
1515

1616
prepare_lshw() {
1717
echo "[+] configuring lshw"
18-
export CC="${CC:-gcc}"
19-
export CXX="${CXX:-g++}"
20-
export CFLAGS="${CFLAGS:--Os -fomit-frame-pointer}"
21-
export CXXFLAGS="${CXXFLAGS:--Os -fomit-frame-pointer}"
2218
}
2319

2420
compile_lshw() {
2521
pushd src
26-
make
22+
make ${MAKEOPTS}
2723
popd
2824
}
2925

3026
install_lshw() {
3127
echo "[+] installing lshw to initramfs"
28+
29+
# Install the lshw binary
3230
install -D -m 755 src/lshw "${ROOTDIR}/usr/bin/lshw"
31+
32+
# Install the ID files to the proper location
33+
mkdir -p "${ROOTDIR}/usr/share/lshw"
34+
install -p -m 0644 pci.ids "${ROOTDIR}/usr/share/lshw/"
35+
install -p -m 0644 usb.ids "${ROOTDIR}/usr/share/lshw/"
36+
install -p -m 0644 oui.txt "${ROOTDIR}/usr/share/lshw/"
37+
install -p -m 0644 manuf.txt "${ROOTDIR}/usr/share/lshw/"
38+
install -p -m 0644 pnp.ids "${ROOTDIR}/usr/share/lshw/"
39+
install -p -m 0644 pnpid.txt "${ROOTDIR}/usr/share/lshw/"
3340
}
3441

3542
build_lshw() {

0 commit comments

Comments
 (0)