From b18dca0df8a3f633e156dc18c2c698814c92baf8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 1 Jul 2014 20:03:09 +0200
Subject: busybox: support only one version

This commit removes the version selection for the busybox
package. Busybox is very well maintained, and bugs are typically fixed
in a timely fashion. Moreover, regressions are fairly unlikely in this
very stable and well-tested tool.

Therefore, there isn't a very compelling reason to have a version
selection for Busybox since we don't accept such a version selection
for the vast majority of other packages, unless there is a strong
reason to do so.

Consequently, this commit:

 * Removes the 1.19.4, 1.20.2 and 1.21.1 Busybox versions, patches and
   default configuration file.

 * Moves the 1.22.1 patches from package/busybox/1.22.1 to just
   package/busybox/ like all other packages.

 * Renames the default 1.22.1 configuration file to just
   busybox.config.

 * Adapts the busybox.mk makefile to encode the current version to
   use.

 * Adds appropriate options to Config.in.legacy. However, even though
   the BR2_BUSYBOX_VERSION_1_22_X is removed, we don't add a
   Config.in.legacy option for it, since it would cause a legacy
   warning for virtually *all* users as most people are currently
   using 1.22.x.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...libiproute-use-linux-if_packet.h-instead-.patch | 36 ----------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch

(limited to 'package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch')

diff --git a/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch b/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch
deleted file mode 100644
index 7b7465653b..0000000000
--- a/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d4fec31889ad660a58dab633c511221feb66e817 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 5 Oct 2013 15:55:06 +0200
-Subject: [PATCH 3/3] networking/libiproute: use <linux/if_packet.h> instead of
- <net/if_packet.h>
-
-The musl C library doesn't provide the <net/if_packet.h> since the
-corresponding kernel headers <linux/if_packet.h> already provides the
-necessary definitions. Replacing <net/if_packet.h> by
-<linux/if_packet.h> also removes the need to include
-<netpacket/packet.h>
-
-This commit fixes the build of iplink with the musl C library.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- networking/libiproute/iplink.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
-index bad2017..32ccb1c 100644
---- a/networking/libiproute/iplink.c
-+++ b/networking/libiproute/iplink.c
-@@ -5,8 +5,7 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-  */
- #include <net/if.h>
--#include <net/if_packet.h>
--#include <netpacket/packet.h>
-+#include <linux/if_packet.h>
- #include <netinet/if_ether.h>
- 
- #include "ip_common.h"  /* #include "libbb.h" is inside */
--- 
-1.8.1.2
-
-- 
cgit v1.2.3