OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=busybox 10 PKG_NAME:=busybox
11 PKG_VERSION:=1.30.1 11 PKG_VERSION:=1.28.3
Line 12... Line 12...
12 PKG_RELEASE:=1 12 PKG_RELEASE:=4
13 PKG_FLAGS:=essential 13 PKG_FLAGS:=essential
14   14  
15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
Line 16... Line 16...
16 PKG_SOURCE_URL:=https://www.busybox.net/downloads \ 16 PKG_SOURCE_URL:=https://www.busybox.net/downloads \
17 http://sources.buildroot.net 17 http://sources.buildroot.net
18 PKG_HASH:=3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc 18 PKG_HASH:=ad0d22033f23e696f9a71a4c2f9210194dda39b024a79151f4ac278995332a6e
-   19  
Line 19... Line 20...
19   20 PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam
20 PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam 21 PKG_BUILD_PARALLEL:=1
Line 21... Line 22...
21 PKG_BUILD_PARALLEL:=1 22 PKG_CHECK_FORMAT_SECURITY:=0
Line 41... Line 42...
41 SECTION:=base 42 SECTION:=base
42 CATEGORY:=Base system 43 CATEGORY:=Base system
43 MAINTAINER:=Felix Fietkau <nbd@nbd.name> 44 MAINTAINER:=Felix Fietkau <nbd@nbd.name>
44 TITLE:=Core utilities for embedded Linux 45 TITLE:=Core utilities for embedded Linux
45 URL:=http://busybox.net/ 46 URL:=http://busybox.net/
46 DEPENDS:=+BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter 47 DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter
47 MENU:=1 48 MENU:=1
48 ALTERNATIVES:=\ 49 ALTERNATIVES:=\
49 $(call BUSYBOX_IF_ENABLED,FIND, 100:/usr/bin/find:/bin/busybox) \ -  
50 $(call BUSYBOX_IF_ENABLED,FLOCK, 100:/usr/bin/flock:/bin/busybox) \ 50 $(call BUSYBOX_IF_ENABLED,FLOCK, 100:/usr/bin/flock:/bin/busybox) \
51 $(call BUSYBOX_IF_ENABLED,FREE, 100:/usr/bin/free:/bin/busybox) \ 51 $(call BUSYBOX_IF_ENABLED,FREE, 100:/usr/bin/free:/bin/busybox) \
52 $(call BUSYBOX_IF_ENABLED,IP, 100:/sbin/ip:/bin/busybox) \ 52 $(call BUSYBOX_IF_ENABLED,IP, 100:/sbin/ip:/bin/busybox) \
53 $(call BUSYBOX_IF_ENABLED,KILL, 100:/bin/kill:/bin/busybox) \ 53 $(call BUSYBOX_IF_ENABLED,KILL, 100:/bin/kill:/bin/busybox) \
54 $(call BUSYBOX_IF_ENABLED,PGREP, 100:/usr/bin/pgrep:/bin/busybox) \ 54 $(call BUSYBOX_IF_ENABLED,PGREP, 100:/usr/bin/pgrep:/bin/busybox) \
Line 57... Line 57...
57 $(call BUSYBOX_IF_ENABLED,PS, 100:/bin/ps:/bin/busybox) \ 57 $(call BUSYBOX_IF_ENABLED,PS, 100:/bin/ps:/bin/busybox) \
58 $(call BUSYBOX_IF_ENABLED,PWDX, 100:/usr/bin/pwdx:/bin/busybox) \ 58 $(call BUSYBOX_IF_ENABLED,PWDX, 100:/usr/bin/pwdx:/bin/busybox) \
59 $(call BUSYBOX_IF_ENABLED,TOP, 100:/usr/bin/top:/bin/busybox) \ 59 $(call BUSYBOX_IF_ENABLED,TOP, 100:/usr/bin/top:/bin/busybox) \
60 $(call BUSYBOX_IF_ENABLED,UPTIME, 100:/usr/bin/uptime:/bin/busybox) \ 60 $(call BUSYBOX_IF_ENABLED,UPTIME, 100:/usr/bin/uptime:/bin/busybox) \
61 $(call BUSYBOX_IF_ENABLED,WATCH, 100:/bin/watch:/bin/busybox) \ 61 $(call BUSYBOX_IF_ENABLED,WATCH, 100:/bin/watch:/bin/busybox) \
62 $(call BUSYBOX_IF_ENABLED,WGET, 100:/usr/bin/wget:/bin/busybox) \ -  
63 $(call BUSYBOX_IF_ENABLED,XARGS, 100:/usr/bin/xargs:/bin/busybox) \ -  
Line 64... Line 62...
64   62  
Line 65... Line 63...
65 endef 63 endef
66   64  
Line 71... Line 69...
71   69  
72 define Package/busybox/config 70 define Package/busybox/config
73 source "$(SOURCE)/Config.in" 71 source "$(SOURCE)/Config.in"
Line 74... Line -...
74 endef -  
75   -  
76 ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG -  
77 define Package/busybox/conffiles -  
78 /etc/syslog.conf -  
79 endef -  
80 endif 72 endef
81   73  
Line 82... Line -...
82 # don't create a version string containing the actual timestamp -  
83 export KCONFIG_NOTIMESTAMP=1 74 # don't create a version string containing the actual timestamp
84   -  
85   -  
86 ifndef CONFIG_USE_MUSL 75 export KCONFIG_NOTIMESTAMP=1
-   76  
-   77  
-   78 LDLIBS:=m crypt
87 LDLIBS:=m crypt 79 LDLIBS += $(call BUSYBOX_IF_ENABLED,PAM,pam pam_misc pthread)
88 endif 80 ifdef CONFIG_BUSYBOX_USE_LIBRPC
89   81 LDLIBS += rpc
Line 90... Line -...
90 LDLIBS += $(call BUSYBOX_IF_ENABLED,PAM,pam pam_misc pthread) -  
91 ifeq ($(CONFIG_USE_GLIBC),y) -  
92 LDLIBS += $(call BUSYBOX_IF_ENABLED,NSLOOKUP_OPENWRT,resolv) -  
93 endif 82 endif
94   83 ifeq ($(CONFIG_USE_GLIBC),y)
95 TARGET_CFLAGS += -flto 84 LDLIBS += $(call BUSYBOX_IF_ENABLED,NSLOOKUP_OPENWRT,resolv)
96 TARGET_LDFLAGS += -flto=jobserver -fuse-linker-plugin 85 endif
97   86  
98 MAKE_VARS := -  
99 MAKE_FLAGS += \ 87 MAKE_VARS :=
100 EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ 88 MAKE_FLAGS += \
101 EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ 89 EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
102 LDLIBS="$(LDLIBS)" \ 90 EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
Line -... Line 91...
-   91 LDLIBS="$(LDLIBS)" \
-   92 SKIP_STRIP=y
-   93 ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
103 LD="$(TARGET_CC)" \ 94 MAKE_FLAGS += V=1
104 SKIP_STRIP=y 95 endif
105 ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) 96  
106 MAKE_FLAGS += V=1 97 MAKE_INSTALL_FLAGS += CONFIG_PREFIX="$(PKG_INSTALL_DIR)"
Line 107... Line -...
107 endif -  
108   -  
109 define Build/Configure -  
110 grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" > $(PKG_BUILD_DIR)/.config -  
111 yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) oldconfig -  
112 endef -  
113   -  
114 define Build/Compile 98  
115 $(call Build/Compile/Default, \ 99  
116 CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ 100 define Build/Configure
117 all install \ 101 grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" > $(PKG_BUILD_DIR)/.config
118 ) 102 yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) oldconfig