Commit 4e8dadfe authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

busybox: add 1.22.x series, deprecate 1.19.x 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 8bc28f5b

package/busybox/1.22.0/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch

0 → 100644
+29 −0
Original line number Diff line number Diff line 
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] 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>

[Gustavo: update for busybox 1.22.0]



diff -Nura busybox-1.22.0.orig/networking/libiproute/iplink.c busybox-1.22.0/networking/libiproute/iplink.c

--- busybox-1.22.0.orig/networking/libiproute/iplink.c	2014-01-01 09:42:40.301137882 -0300

+++ busybox-1.22.0/networking/libiproute/iplink.c	2014-01-01 09:43:01.282827700 -0300

@@ -7,7 +7,7 @@

  */

 #include <net/if.h>

 /*#include <net/if_packet.h> - not needed? */

-#include <netpacket/packet.h>

+#include <linux/if_packet.h>

 #include <netinet/if_ether.h>

 

 #include <linux/if_vlan.h>

package/busybox/Config.in

+7 −1
Original line number Diff line number Diff line
@@ -13,12 +13,13 @@ if BR2_PACKAGE_BUSYBOX 


choice

	prompt "BusyBox Version"

	default BR2_BUSYBOX_VERSION_1_21_X

	default BR2_BUSYBOX_VERSION_1_22_X

	help

	  Select the version of BusyBox you wish to use.



	config BR2_BUSYBOX_VERSION_1_19_X

		bool "BusyBox 1.19.x"

		depends on BR2_DEPRECATED



	config BR2_BUSYBOX_VERSION_1_20_X

		bool "BusyBox 1.20.x"
@@ -26,6 +27,9 @@ choice 
	config BR2_BUSYBOX_VERSION_1_21_X

		bool "BusyBox 1.21.x"



	config BR2_BUSYBOX_VERSION_1_22_X

		bool "BusyBox 1.22.x"



	config BR2_PACKAGE_BUSYBOX_SNAPSHOT

		bool "daily snapshot"
@@ -36,6 +40,7 @@ config BR2_BUSYBOX_VERSION 
	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X

	default "1.20.2"	if BR2_BUSYBOX_VERSION_1_20_X

	default "1.21.1"	if BR2_BUSYBOX_VERSION_1_21_X

	default "1.22.0"	if BR2_BUSYBOX_VERSION_1_22_X



config BR2_PACKAGE_BUSYBOX_CONFIG

	string "BusyBox configuration file to use?"
@@ -43,6 +48,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG 
	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X

	default "package/busybox/busybox-1.20.x.config" if BR2_BUSYBOX_VERSION_1_20_X

	default "package/busybox/busybox-1.21.x.config" if BR2_BUSYBOX_VERSION_1_21_X

	default "package/busybox/busybox-1.22.x.config" if BR2_BUSYBOX_VERSION_1_22_X

	help

	  Some people may wish to use their own modified BusyBox configuration

	  file, and will specify their config file location with this option.

package/busybox/busybox-1.22.x.config

0 → 100644
+1034 −0

File added.

Preview size limit exceeded, changes collapsed.