summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--busybox.pkg/control1
-rw-r--r--changelog1
2 files changed, 2 insertions, 0 deletions
diff --git a/busybox.pkg/control b/busybox.pkg/control
index 46ff9ec..163fd2d 100644
--- a/busybox.pkg/control
+++ b/busybox.pkg/control
@@ -3,6 +3,7 @@ Platform: any
Essential: yes
Section: util
Depends: ${Shlib-Depends}, ${Extra-Depends}
+Conflicts: opkg-lede (<< 0+git20190131.d4ba162-7)
Description: Multi-call binary that combines many common UNIX utilities
BusyBox combines tiny versions of many common UNIX utilities into a single
small executable. It provides replacements for most of the utilities you
diff --git a/changelog b/changelog
index 49bdd38..c63eca8 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ busybox (1.32.0-1) trunk
- Drop patches that came from upstream or are similar to ones
applied upstream.
* Manage all applet links with update-alternatives.
+ - Requires opkg-lede >= 0+git20190131.d4ba162-7.
* /etc/init.d/networking: Write directly to </var/run/net-ifaces>
instead of </etc/network/interfaces>. Users should now edit
</etc/network/interfaces> instead of