Merge branch 'update-zosbase-to-latest' into update-modules-to-update-with-config

Author: Eslam-Nawara

.github/workflows/bins.yaml

@@ -95,6 +95,12 @@ jobs:
   #     package: tpm
   #   secrets:
   #     token: ${{ secrets.HUB_JWT }}
+  lshw:
+    uses: ./.github/workflows/bin-package.yaml
+    with:
+      package: lshw
+    secrets:
+      token: ${{ secrets.HUB_JWT }}
   qsfs:
     uses: ./.github/workflows/bin-package-no-tag.yaml
     with:

bins/packages/lshw/lshw.sh

@@ -0,0 +1,64 @@
+LSHW_VERSION="B.02.20"
+LSHW_CHECKSUM="5805eba5f31886582fff673c5dccdb3b"
+LSHW_LINK="https://github.com/lyonel/lshw/archive/refs/tags/${LSHW_VERSION}.tar.gz"
+
+download_lshw() {
+    download_file ${LSHW_LINK} ${LSHW_CHECKSUM} lshw-${LSHW_VERSION}.tar.gz
+}
+
+dependencies_lshw() {
+    apt-get install -y build-essential gcc g++ make
+}
+
+extract_lshw() {
+    if [ ! -d "lshw-${LSHW_VERSION}" ]; then
+        echo "[+] extracting: lshw-${LSHW_VERSION}"
+        tar -xf ${DISTDIR}/lshw-${LSHW_VERSION}.tar.gz -C ${WORKDIR} 
+    fi
+}
+
+prepare_lshw() {
+    echo "[+] configuring lshw"
+    github_name "lshw-${LSHW_VERSION}"
+}
+
+compile_lshw() {
+    pushd src
+    # Build static binary
+    make static
+    popd
+}
+
+install_lshw() {
+    echo "[+] installing lshw to initramfs"
+    
+    mkdir -p "${ROOTDIR}/usr/sbin"
+    mkdir -p "${ROOTDIR}/usr/share/man/man1"
+    mkdir -p "${ROOTDIR}/usr/share/lshw"
+    
+    # Install the static binary
+    cp src/lshw-static "${ROOTDIR}/usr/sbin/lshw"
+    chmod +x "${ROOTDIR}/usr/sbin/lshw"
+    
+    cp src/lshw.1 "${ROOTDIR}/usr/share/man/man1/"
+    cp src/pci.ids src/usb.ids src/oui.txt src/manuf.txt src/pnp.ids src/pnpid.txt "${ROOTDIR}/usr/share/lshw/"
+}
+
+build_lshw() {
+    dependencies_lshw
+
+    pushd "${DISTDIR}"
+    download_lshw
+    popd
+
+    pushd "${WORKDIR}"
+    extract_lshw
+    
+    pushd "lshw-${LSHW_VERSION}"
+    prepare_lshw
+    compile_lshw
+    install_lshw
+    popd
+
+    popd
+}

bootstrap/bootstrap/src/hub.rs

@@ -11,10 +11,10 @@ use std::path::Path;
 
 #[derive(Deserialize)]
 struct ZosConfig {
-    hub_url: Vec<String>,
+    hub_urls: Vec<String>,
 }
 
-fn get_hub_url(runmode: &RunMode) -> Result<Vec<String>> {
+fn get_hub_urls(runmode: &RunMode) -> Result<Vec<String>> {
     let base_url = "https://github.com/threefoldtech/zos-config/raw/main/";
     let config_filename = match runmode {
         RunMode::Prod => "production.json",
@@ -43,10 +43,10 @@ fn get_hub_url(runmode: &RunMode) -> Result<Vec<String>> {
         Err(_) => return Ok(fallback),
     };
 
-    if config.hub_url.is_empty() {
+    if config.hub_urls.is_empty() {
         Ok(fallback)
     } else {
-        Ok(config.hub_url)
+        Ok(config.hub_urls)
     }
 }
 
@@ -86,7 +86,7 @@ impl Repo {
         T: AsRef<str>,
     {
         let config = crate::config::Config::current()?;
-        let hub = get_hub_url(&config.runmode)?;
+        let hub = get_hub_urls(&config.runmode)?;
         Ok(Repo {
             name: String::from(name.as_ref()),
             hub,

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20241127100051-77e684bcb1b2
 	github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.8
 	github.com/threefoldtech/zbus v1.0.1
-	github.com/threefoldtech/zosbase v0.1.11-0.20250722101116-fb41de052e4a
+	github.com/threefoldtech/zosbase v0.1.11-0.20250729092219-8aa23b682790
 	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -562,8 +562,8 @@ github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.8 h1:BDuus/zqEBDsmPQA0h3
 github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.8/go.mod h1:93SROfr+QjgaJ5/jIWtIpLkhaD8Pv8WbdfwvwMNG2p4=
 github.com/threefoldtech/zbus v1.0.1 h1:3KaEpyOiDYAw+lrAyoQUGIvY9BcjVRXlQ1beBRqhRNk=
 github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo=
-github.com/threefoldtech/zosbase v0.1.11-0.20250722101116-fb41de052e4a h1:6WmHqKgLlmloUpSzBQAzUNYt/pJrVmSVFG0nHW0Y3X0=
-github.com/threefoldtech/zosbase v0.1.11-0.20250722101116-fb41de052e4a/go.mod h1:v3moVR/JyNGG8LhiPhq6oPyAYdVL+AluCsmj4c0EzfA=
+github.com/threefoldtech/zosbase v0.1.11-0.20250729092219-8aa23b682790 h1:8b3sjTH1QQn1ciOm458idHEjgPXacYnU9C3xgX8LtTw=
+github.com/threefoldtech/zosbase v0.1.11-0.20250729092219-8aa23b682790/go.mod h1:v3moVR/JyNGG8LhiPhq6oPyAYdVL+AluCsmj4c0EzfA=
 github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=