Commit d14a2c77 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

busybox: add 1.12.x and make it default

parent 644b251f
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ config BR2_PACKAGE_BUSYBOX
choice
	prompt "BusyBox Version"
	depends on BR2_PACKAGE_BUSYBOX
	default BR2_BUSYBOX_VERSION_1_11_X
	default BR2_BUSYBOX_VERSION_1_12_X
	help
	  Select the version of BusyBox you wish to use.

@@ -43,6 +43,9 @@ choice
	config BR2_BUSYBOX_VERSION_1_11_X
		bool "BusyBox 1.11.x"

	config BR2_BUSYBOX_VERSION_1_12_X
		bool "BusyBox 1.12.x"

	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
		bool "daily snapshot"

@@ -57,6 +60,7 @@ config BR2_BUSYBOX_VERSION
	default "1.9.2"		if BR2_BUSYBOX_VERSION_1_9_X
	default "1.10.4"	if BR2_BUSYBOX_VERSION_1_10_X
	default "1.11.1"	if BR2_BUSYBOX_VERSION_1_11_X
	default "1.12.0"	if BR2_BUSYBOX_VERSION_1_12_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL
	bool "Run BusyBox's own full installation"
@@ -82,6 +86,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
	default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_9_X
	default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X
	default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X
	default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
	help
	  Some people may wish to use their own modified BusyBox configuration
	  file, and will specify their config file location with this option.