projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
toolchain: remove leftovers from old llvm-gcc experiments
[openwrt/openwrt.git]
/
package
/
utils
/
busybox
/
Makefile
diff --git
a/package/utils/busybox/Makefile
b/package/utils/busybox/Makefile
index 0b2778ffd94f61df5fbf149725222ae06122db9c..7c9bca530ea4ab2f7430a7c9a93954b0d22b8b7d 100644
(file)
--- a/
package/utils/busybox/Makefile
+++ b/
package/utils/busybox/Makefile
@@
-1,5
+1,5
@@
-#
-# Copyright (C) 2006-201
3
OpenWrt.org
+#
+# Copyright (C) 2006-201
5
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.
@@
-8,19
+8,20
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
-PKG_VERSION:=1.
19.4
-PKG_RELEASE:=
7
+PKG_VERSION:=1.
22.1
+PKG_RELEASE:=
6
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_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:=
9c0cae5a0379228e7b55e5b29528df8
e
+PKG_MD5SUM:=
337d1a15ab1cb1d4ed423168b1eb7d7
e
-PKG_BUILD_DEPENDS:=BUSYBOX_
CONFIG_FEATURE_HAVE_RPC:librpc
+PKG_BUILD_DEPENDS:=BUSYBOX_
USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam
PKG_BUILD_PARALLEL:=1
PKG_BUILD_PARALLEL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
-PKG_LICENSE:=GPL
v2 BSD-4c
+PKG_LICENSE:=GPL
-2.0
PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE
include $(INCLUDE_DIR)/package.mk
PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE
include $(INCLUDE_DIR)/package.mk
@@
-35,18
+36,13
@@
else
BB_MAKE_VERBOSE :=
endif
BB_MAKE_VERBOSE :=
endif
-init-y :=
-init-$(CONFIG_BUSYBOX_CONFIG_CROND) += cron
-init-$(CONFIG_BUSYBOX_CONFIG_NTPD) += ntp
-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>
+ MAINTAINER:=
Felix Fietkau <nbd
@openwrt.org>
TITLE:=Core utilities for embedded Linux
URL:=http://busybox.net/
TITLE:=Core utilities for embedded Linux
URL:=http://busybox.net/
- DEPENDS:=+BUSYBOX_
CONFIG_FEATURE_HAVE_RPC:librpc
+ DEPENDS:=+BUSYBOX_
USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam
MENU:=1
endef
MENU:=1
endef
@@
-59,9
+55,11
@@
define Package/busybox/config
source "$(SOURCE)/Config.in"
endef
source "$(SOURCE)/Config.in"
endef
+BUSYBOX_SYM=$(if $(CONFIG_BUSYBOX_CUSTOM),CONFIG,DEFAULT)
+
define Build/Configure
rm -f $(PKG_BUILD_DIR)/.configured*
define Build/Configure
rm -f $(PKG_BUILD_DIR)/.configured*
- grep 'CONFIG_BUSYBOX_
' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1
\\2,g" > $(PKG_BUILD_DIR)/.config
+ grep 'CONFIG_BUSYBOX_
$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_
\\2,g" > $(PKG_BUILD_DIR)/.config
yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
@@
-71,17
+69,19
@@
define Build/Configure
oldconfig
endef
oldconfig
endef
-ifdef CONFIG_GCC_VERSION_LLVM
- TARGET_CFLAGS += -fnested-functions
-endif
-
LDLIBS:=m crypt
LDLIBS:=m crypt
-ifdef CONFIG_BUSYBOX_
CONFIG_FEATURE_HAVE_
RPC
+ifdef CONFIG_BUSYBOX_
USE_LIB
RPC
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
export LDFLAGS=$(TARGET_LDFLAGS)
LDLIBS += rpc
endif
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
export LDFLAGS=$(TARGET_LDFLAGS)
LDLIBS += rpc
endif
+ifdef CONFIG_BUSYBOX_CONFIG_PAM
+ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+ export LDFLAGS=$(TARGET_LDFLAGS)
+ LDLIBS += pam pam_misc pthread
+endif
+
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
@@
-109,9
+109,10
@@
endef
define Package/busybox/install
$(INSTALL_DIR) $(1)/etc/init.d
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
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
+ $(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
+ $(INSTALL_BIN) ./files/telnet $(1)/etc/init.d/telnet
+ $(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
+ $(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
-rm -rf $(1)/lib64
endef
-rm -rf $(1)/lib64
endef