projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2010-09-28
[openwrt.git]
/
package
/
busybox
/
Makefile
diff --git
a/package/busybox/Makefile
b/package/busybox/Makefile
index 38740fdbfde44c68dd28cabd14ef7bd0cb26cdec..4ea9a61e4eb79453a103c1008333f6b3ddb5516a 100644
(file)
--- a/
package/busybox/Makefile
+++ b/
package/busybox/Makefile
@@
-1,21
+1,22
@@
#
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006
-2010
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
-PKG_VERSION:=1.
4
.2
+PKG_VERSION:=1.
17
.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads \
http://distfiles.gentoo.org/distfiles/
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads \
http://distfiles.gentoo.org/distfiles/
-PKG_MD5SUM:=b4c61fb15642be9dde20e8493788c585
+PKG_MD5SUM:=7360b7138b899ee7fc885791c740c3c3
+
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
@@
-31,22
+32,19
@@
init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet
define Package/busybox
SECTION:=base
CATEGORY:=Base system
define Package/busybox
SECTION:=base
CATEGORY:=Base system
+ MAINTAINER:=Nicolas Thill <nico@openwrt.org>
TITLE:=Core utilities for embedded Linux
URL:=http://busybox.net/
MENU:=1
endef
define Package/busybox/description
TITLE:=Core utilities for embedded Linux
URL:=http://busybox.net/
MENU:=1
endef
define Package/busybox/description
-The Swiss Army Knife of embedded Linux.
-
It slices, it dices, it makes Julian Fries.
+
The Swiss Army Knife of embedded Linux.
+ It slices, it dices, it makes Julian Fries.
endef
define Package/busybox/config
endef
define Package/busybox/config
- source "$(SOURCE)/target-config.in"
- menu "Configuration"
- depends on PACKAGE_busybox
- source "$(SOURCE)/config/Config.in"
- endmenu
+ source "$(SOURCE)/Config.in"
endef
define Build/Configure
endef
define Build/Configure
@@
-55,31
+53,42
@@
define Build/Configure
yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
+ KBUILD_HAVE_NLS=no \
ARCH="$(ARCH)" \
oldconfig
endef
ARCH="$(ARCH)" \
oldconfig
endef
+ifdef CONFIG_GCC_VERSION_LLVM
+ TARGET_CFLAGS += -fnested-functions
+endif
+
+ifdef CONFIG_GCC_VERSION_4_5_0
+ TARGET_CFLAGS += -fno-tree-pta
+endif
+
define Build/Compile
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ $(MAKE)
$(PKG_JOBS)
-C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
+ KBUILD_HAVE_NLS=no \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
ARCH="$(ARCH)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
ARCH="$(ARCH)" \
-
IPKG_ARCH="$(ARCH)"
\
+
SKIP_STRIP=y
\
all
all
-endef
-
-define Package/busybox/install
- find $(PKG_BUILD_DIR) -lname busybox -exec rm \{\} \;
+ rm -rf $(PKG_INSTALL_DIR)
+ $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
ARCH="$(ARCH)" \
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
ARCH="$(ARCH)" \
- IPKG_ARCH="$(ARCH)" \
- CONFIG_PREFIX="$(1)" \
+ CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \
install
install
+endef
+
+define Package/busybox/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/init.d
+ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
for tmp in $(init-y); do \
$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
done
for tmp in $(init-y); do \
$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
done