diff options
| -rwxr-xr-x | build | 3 | ||||
| -rw-r--r-- | changelog | 4 | ||||
| -rw-r--r-- | patches/run-scripts-with-saved-busybox.patch | 15 |
3 files changed, 1 insertions, 21 deletions
@@ -29,8 +29,7 @@ install: build install -m 0755 -d dest/usr/sbin/ ln -sf /usr/bin/opkg-cert dest/usr/sbin/opkg-key @# opkg-lede's CMake build system doesn't install this... - sed '1s|^.*$$|#!/var/lib/opkg/bin/sh|; s|@opkglibdir@|/var/lib|g' \ - src/utils/update-alternatives.in \ + sed 's|@opkglibdir@|/var/lib|g' src/utils/update-alternatives.in \ >dest/usr/bin/update-alternatives oh-fixperms oh-strip -k @@ -7,10 +7,6 @@ opkg-lede (0+git20190131.d4ba162-7) trunk attempts to execute gzip after removing busybox, whereas opkg didn't) and - Accepts an -a/--host-architecture option for multiarch support. - * opkg-lede: Make opkg-cl and update-alternatives run the copy of - busybox saved by /usr/bin/opkg instead of using /bin/sh (which will - be a link managed by update-alternatives in a future version of - busybox). -- Patrick McDermott <patrick.mcdermott@libiquity.com> Thu, 18 Jun 2020 12:50:01 -0400 diff --git a/patches/run-scripts-with-saved-busybox.patch b/patches/run-scripts-with-saved-busybox.patch deleted file mode 100644 index ee9c960..0000000 --- a/patches/run-scripts-with-saved-busybox.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Patrick McDermott <patrick.mcdermott@libiquity.com> -Subject: Run scripts with saved busybox - -diff -Naurp src.orig/libopkg/pkg.c src/libopkg/pkg.c ---- src.orig/libopkg/pkg.c 2019-01-31 04:17:16.000000000 -0500 -+++ src/libopkg/pkg.c 2020-11-22 17:58:50.557357196 -0500 -@@ -1404,7 +1404,7 @@ int pkg_run_script(pkg_t * pkg, const ch - sprintf_alloc(&cmd, "%s %s", path, args); - free(path); - { -- const char *argv[] = { "/bin/sh", "-c", cmd, NULL }; -+ const char *argv[] = { "/var/lib/opkg/bin/sh", cmd, NULL }; - err = xsystem(argv); - } - free(cmd); |