From 310bb966527e72b1cd884f1efcb0e62481c01e15 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 08 Dec 2020 05:43:50 -0500
Subject: busybox: Conflict with old opkg-lede

---
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
--
cgit v0.9.1