strip useless RPATH when verifying ipk

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "common/fw",
     "common/bin",
@@ -9,3 +10,11 @@ members = [
     "packages/fw-extract",
     "packages/gen-manifest",
 ]
+
+[workspace.dependencies]
+clap = "4.4.6"
+regex = "1.9.5"
+serde = "1.0.188"
+serde_json = "1.0.107"
+semver = "1.0.19"
+path-slash = "0.2.1"

common/bin/Cargo.toml

@@ -5,9 +5,9 @@ edition = "2021"
 
 [dependencies]
 elf = "0.7.2"
-serde = { version = "1.0.183", features = ["derive"] }
-serde_json = "1.0.105"
-semver = "1.0.18"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+semver = { workspace = true }
 
 [features]
 linux-install = []

common/fw/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-semver = "1.0.18"
-serde = { version = "1.0.183", features = ["derive"] }
-serde_json = "1.0.105"
+semver = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 
 [dependencies.bin-lib]
 path = "../bin"

common/ipk/Cargo.toml

@@ -1,16 +1,17 @@
 [package]
 name = "ipk-lib"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.183", features = ["derive"] }
-serde_json = "1.0.105"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 debpkg = "0.6.0"
 tempfile = "3.8.0"
-path-slash = "0.2.1"
+path-slash = { workspace = true }
+common-path = "1.0.0"
 
 [dependencies.bin-lib]
 path = "../bin"

common/ipk/src/component.rs

@@ -4,6 +4,7 @@ use std::fs;
 use std::fs::File;
 use std::io::{Error, ErrorKind};
 use std::path::{Path, PathBuf};
+use common_path::common_path;
 
 use path_slash::CowExt;
 
@@ -137,15 +138,19 @@ impl<T> Component<T> {
     where
         P: AsRef<Path>,
     {
+        let origin = bin_path.as_ref().parent().unwrap();
         return rpath
             .iter()
             .filter_map(|p| {
-                PathBuf::from(p.replace(
-                    "$ORIGIN",
-                    bin_path.as_ref().parent().unwrap().to_str().unwrap(),
-                ))
-                .canonicalize()
-                .ok()
+                PathBuf::from(p.replace("$ORIGIN", origin.to_string_lossy().as_ref()))
+                    .canonicalize()
+                    .ok()
+            })
+            .filter(|p| {
+                let Some(common) = common_path(&p, &origin) else {
+                    return false;
+                };
+                return common.components().count() > 1;
             })
             .collect();
     }

packages/elf-verify/Cargo.toml

@@ -7,9 +7,9 @@ authors = ["Mariotaku Lee <[email protected]>"]
 license = "Apache-2.0"
 
 [dependencies]
-serde = "1.0.183"
-serde_json = "1.0.96"
-semver = "1.0.18"
+serde = { workspace = true }
+serde_json = { workspace = true }
+semver = { workspace = true }
 
 [dependencies.clap]
 version = "4.3.23"

packages/fw-extract/Cargo.toml

@@ -7,11 +7,11 @@ license = "Apache-2.0"
 description = "Firmware symbols data and extractor utility"
 
 [dependencies]
-regex = "1"
-path-slash = "0.2.1"
-serde = "1.0.183"
-serde_json = "1.0.105"
-semver = "1.0.18"
+regex = { workspace = true }
+path-slash = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+semver = { workspace = true }
 fw-lib = { path = "../../common/fw" }
 bin-lib = { path = "../../common/bin" }
 

packages/gen-manifest/Cargo.toml

@@ -9,11 +9,11 @@ license = "Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.183", features = ["derive"] }
-serde_json = "1.0.105"
-clap = { version = "4.3.23", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
 ipk-lib = { path = "../../common/ipk" }
-sha256 = "1.3.0"
+sha256 = "1.4.0"
 
 [package.metadata.deb]
 name = "webosbrew-toolbox-gen-manifest"

packages/ipk-verify/Cargo.toml

@@ -1,22 +1,22 @@
 [package]
 name = "ipk-verify"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 description = "Command line tool for checking symbols in an exectuable and libraries in an IPK file"
 authors = ["Mariotaku Lee <[email protected]>"]
 license = "Apache-2.0"
 
 [dependencies]
-serde = "1.0.183"
-serde_json = "1.0.105"
+serde = { workspace = true }
+serde_json = { workspace = true }
 debpkg = "0.6.0"
 tempfile = "3.8.0"
-path-slash = "0.2.1"
+path-slash = { workspace = true }
 prettytable-rs = "^0.10"
-semver = "1.0.18"
+semver = { workspace = true }
 is-terminal = "0.4.9"
 term = "0.7.0"
-clap = { version = "4.3.23", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 verify-lib = { path = "../../common/verify", features = ["ipk"] }
 
 [dependencies.fw-lib]