gnirehtet: 2.2.1 -> 2.3 #46735
Merged
gnirehtet: 2.2.1 -> 2.3 #46735
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: gnirehtet Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gnirehtet Partial log (click to expand)
|
|
While testing this, I noticed one occurence of adb is missing from our patch. diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch
index 72a8445d83b..600802cb57f 100644
--- a/pkgs/tools/networking/gnirehtet/paths.patch
+++ b/pkgs/tools/networking/gnirehtet/paths.patch
@@ -1,7 +1,7 @@
-diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs
-index 4f1be53..96d2e78 100644
---- a/relay-rust/src/main.rs
-+++ b/relay-rust/src/main.rs
+Index: gnirehtet/relay-rust/src/main.rs
+===================================================================
+--- gnirehtet.orig/relay-rust/src/main.rs
++++ gnirehtet/relay-rust/src/main.rs
@@ -299,7 +299,7 @@ impl Command for RelayCommand {
fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
@@ -11,7 +11,7 @@ index 4f1be53..96d2e78 100644
}
fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
-@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>(
+@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>(
args: Vec<S>,
) -> Result<(), CommandExecutionError> {
let adb_args = create_adb_args(serial, args);
@@ -22,7 +22,7 @@ index 4f1be53..96d2e78 100644
Ok(exit_status) => {
if exit_status.success() {
Ok(())
-@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution
+@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S
serial,
vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
);
@@ -33,3 +33,16 @@ index 4f1be53..96d2e78 100644
Ok(output) => {
if output.status.success() {
// the "regex" crate makes the binary far bigger, so just parse the versionCode
+Index: gnirehtet/relay-rust/src/adb_monitor.rs
+===================================================================
+--- gnirehtet.orig/relay-rust/src/adb_monitor.rs
++++ gnirehtet/relay-rust/src/adb_monitor.rs
+@@ -206,7 +206,7 @@ impl AdbMonitor {
+
+ fn start_adb_daemon() -> bool {
+ info!(target: TAG, "Restarting adb daemon");
+- match process::Command::new("adb")
++ match process::Command::new("@adb@")
+ .args(&["start-server"])
+ .status() {
+ Ok(exit_status) => {Except this, looks good to me. Thanks :) |
|
Thank you! |
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: gnirehtet Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gnirehtet Partial log (click to expand)
|
Mic92
reviewed
Sep 16, 2018
| fn start_adb_daemon() -> bool { | ||
| info!(target: TAG, "Restarting adb daemon"); | ||
| - match process::Command::new("adb") | ||
| + match process::Command::new("@adb@") |
There was a problem hiding this comment.
Is it not easier and less likely to break to use makeWrapper instead and extend the PATH?
There was a problem hiding this comment.
Initially, the reason I went for a patch was that we need the patch anyway to fix the path to the apk.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/Genymobile/gnirehtet/releases/tag/v2.3
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)cc @symphorien