X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c69b535a6bad7467f52d025dae1b5c77f0f77830..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/busybox/Makefile?ds=inline diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 530b02767..3ac289873 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,19 +9,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.4.1 -PKG_RELEASE:=1 +PKG_VERSION:=1.11.3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=5728403bce309cdabcffa414e2e64052 -PKG_CAT:=bzcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_MD5SUM:=4355ad8bb57ce3b39ad827566c1a6da3 include $(INCLUDE_DIR)/package.mk +ifeq ($(DUMP),) + STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s) +endif + init-y := init-$(CONFIG_BUSYBOX_CONFIG_HTTPD) += httpd init-$(CONFIG_BUSYBOX_CONFIG_CROND) += cron @@ -36,22 +37,25 @@ define Package/busybox 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 menu "Configuration" depends on PACKAGE_busybox + source "$(SOURCE)/target-config.in" source "$(SOURCE)/config/Config.in" endmenu endef define Build/Configure - $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config + rm -f $(PKG_BUILD_DIR)/.configured* + grep 'CONFIG_BUSYBOX_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/.config yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ + KBUILD_HAVE_NLS=no \ ARCH="$(ARCH)" \ oldconfig endef @@ -60,6 +64,7 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ + KBUILD_HAVE_NLS=no \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ IPKG_ARCH="$(ARCH)" \ @@ -67,6 +72,7 @@ define Build/Compile endef define Package/busybox/install + $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \; $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \