From 18cf0a67a154d51357671fc0b226569d1d97a560 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Thu, 21 Jun 2012 16:24:36 +0200
Subject: add support for openslx busybox variant

---
 package/busybox/Config.in  |  6 +++++-
 package/busybox/busybox.mk | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index a07864474..2e7807c04 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -13,7 +13,7 @@ if BR2_PACKAGE_BUSYBOX
 
 choice
 	prompt "BusyBox Version"
-	default BR2_BUSYBOX_VERSION_1_20_X
+	default BR2_PACKAGE_BUSYBOX_OPENSLX
 	help
 	  Select the version of BusyBox you wish to use.
 
@@ -30,6 +30,9 @@ choice
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
 
+	config BR2_PACKAGE_BUSYBOX_OPENSLX
+		bool "openslx snapshot"
+
 endchoice
 
 config BR2_BUSYBOX_VERSION
@@ -40,6 +43,7 @@ config BR2_BUSYBOX_VERSION
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
+	default ".config" if BR2_PACKAGE_BUSYBOX_OPENSLX
 	default "package/busybox/busybox-1.20.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
 	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1d988f838..f4773b3f2 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -4,14 +4,20 @@
 #
 #############################################################
 
-ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
+
+ifeq ($(BR2_PACKAGE_BUSYBOX_OPENSLX),y)
+BUSYBOX_VERSION = HEAD
+BUSYBOX_SITE = http://git.openslx.org/openslx/tools/busybox.git/snapshot
+BUSYBOX_SOURCE = $(BUSYBOX_VERSION).tar.gz
+else ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
 BUSYBOX_VERSION = snapshot
 BUSYBOX_SITE = http://www.busybox.net/downloads/snapshots
+BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 else
 BUSYBOX_VERSION = $(call qstrip,$(BR2_BUSYBOX_VERSION))
 BUSYBOX_SITE = http://www.busybox.net/downloads
-endif
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
+endif
 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
 # Allows the build system to tweak CFLAGS
 BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include"
-- 
cgit v1.2.3-55-g7522