X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7b4daec3618b8e7736c6fa4d96b43709b28dd7be..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/busybox/Makefile?ds=inline diff --git a/package/busybox/Makefile b/package/busybox/Makefile index c53806119..84d70990a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 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. @@ -8,18 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.15.3 -PKG_RELEASE:=1 +PKG_VERSION:=1.17.3 +PKG_RELEASE:=2 +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:=6059ac9456de6fb18dc8ee4cd0ec9240 +PKG_MD5SUM:=a2ce1a951571da8c6e0eaf75b1acef60 + +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 := @@ -30,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 @@ -41,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 @@ -63,14 +65,22 @@ 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)" \ - SKIP_STIP=y \ + SKIP_STRIP=y \ + LDLIBS="$(LDLIBS)" \ all rm -rf $(PKG_INSTALL_DIR) $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \; @@ -80,6 +90,7 @@ define Build/Compile EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ + LDLIBS="$(LDLIBS)" \ install endef