X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1d11e1683d85e56f4245485f1f93c483dfe4d56e..3d9b27b735b76d16c6bad5dc202a731883e7b888:/package/busybox/Makefile?ds=inline diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1616122c0..43da0a48d 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,28 +1,27 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 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.4.1 +PKG_VERSION:=1.15.3 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:=5728403bce309cdabcffa414e2e64052 -PKG_CAT:=bzcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_BUILDDEP:=libcgi +PKG_MD5SUM:=6059ac9456de6fb18dc8ee4cd0ec9240 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 @@ -37,49 +36,56 @@ 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 - source "$(SOURCE)/target-config.in" 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 +ifdef CONFIG_GCC_VERSION_LLVM + TARGET_CFLAGS += -fnested-functions +endif + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + KBUILD_HAVE_NLS=no \ + EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ - IPKG_ARCH="$(ARCH)" \ - EXTRA_LIBS="$(STAGING_DIR)/usr/lib/libcgi.a" \ 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) -I$(STAGING_DIR)/usr/include" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ IPKG_ARCH="$(ARCH)" \ - CONFIG_PREFIX="$(1)" \ - EXTRA_LIBS="$(STAGING_DIR)/usr/lib/libcgi.a" \ + CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ 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