X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/875000f68adc598093312913ade3e2a68210b384..63ef78f3dad08c8e44920533817e569478d9c6b8:/package/busybox/Makefile?ds=sidebyside diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 2f9779426..d41a279b1 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,26 +1,29 @@ # -# 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. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.11.3 +PKG_VERSION:=1.18.4 PKG_RELEASE:=1 +PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=4355ad8bb57ce3b39ad827566c1a6da3 +PKG_MD5SUM:=b03c5b46ced732679e525a920a1a62f5 + +PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) - STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s) + STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s) endif init-y := @@ -31,8 +34,10 @@ init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet define Package/busybox SECTION:=base CATEGORY:=Base system + MAINTAINER:=Nicolas Thill TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ + DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc MENU:=1 endef @@ -42,11 +47,7 @@ define Package/busybox/description endef define Package/busybox/config - menu "Configuration" - depends on PACKAGE_busybox - source "$(SOURCE)/target-config.in" - source "$(SOURCE)/config/Config.in" - endmenu + source "$(SOURCE)/Config.in" endef define Build/Configure @@ -60,28 +61,42 @@ define Build/Configure oldconfig endef +ifdef CONFIG_GCC_VERSION_LLVM + TARGET_CFLAGS += -fnested-functions +endif + +LDLIBS:=m crypt +ifdef CONFIG_BUSYBOX_USE_LIBRPC + TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include + export LDFLAGS=$(TARGET_LDFLAGS) + LDLIBS += rpc +endif + define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ KBUILD_HAVE_NLS=no \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ - IPKG_ARCH="$(ARCH)" \ + SKIP_STRIP=y \ + LDLIBS="$(LDLIBS)" \ all -endef - -define Package/busybox/install + 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)" \ - IPKG_ARCH="$(ARCH)" \ - CONFIG_PREFIX="$(1)" \ + CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ + LDLIBS="$(LDLIBS)" \ install +endef + +define Package/busybox/install $(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