diff options
| author | adisbladis <adis@blad.is> | 2018-01-08 05:50:23 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-01-11 21:42:32 +0800 |
| commit | 65774cb22e0b40a3ac7bc97adde3767f1d7df20b (patch) | |
| tree | 0787e37486187d95d7bc12c238658c5f42b0c857 /pkgs/os-specific/linux/busybox/busybox-in-store.patch | |
| parent | 8c1e47a320260ab5ddb563bf6fce56bbce2e6ab9 (diff) | |
| download | nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.tar nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.tar.gz nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.tar.bz2 nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.tar.lz nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.tar.xz nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.tar.zst nixlib-65774cb22e0b40a3ac7bc97adde3767f1d7df20b.zip | |
busybox: 1.27.2 -> 1.28.0
Diffstat (limited to 'pkgs/os-specific/linux/busybox/busybox-in-store.patch')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/busybox-in-store.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch index 0de7348c44fe..2d356b66b3ae 100644 --- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch +++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch @@ -1,19 +1,19 @@ Allow BusyBox to be invoked as "<something>-busybox". This is necessary when it's run from the Nix store as <hash>-busybox during stdenv bootstrap. ---- busybox-1.26.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400 -+++ busybox-1.26.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400 -@@ -887,7 +887,7 @@ +--- a/libbb/appletlib.c ++++ b/libbb/appletlib.c +@@ -947,7 +947,7 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar static NORETURN void run_applet_and_exit(const char *name, char **argv) { # if ENABLE_BUSYBOX - if (is_prefixed_with(name, "busybox")) + if (strstr(name, "busybox") != 0) - exit(busybox_main(argv)); + exit(busybox_main(/*unused:*/ 0, argv)); # endif # if NUM_APPLETS > 0 -@@ -981,7 +981,7 @@ int main(int argc UNUSED_PARAM, char **argv) - +@@ -1045,7 +1045,7 @@ int main(int argc UNUSED_PARAM, char **argv) + lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); # if !ENABLE_BUSYBOX - if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox")) |