OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differencesIgnore whitespace
Rev 2 Rev 3
1 # 1 #
2 # Copyright (C) 2006-2014 OpenWrt.org 2 # Copyright (C) 2006-2014 OpenWrt.org
3 # Copyright (C) 2016 LEDE Project 3 # Copyright (C) 2016 LEDE Project
4 # 4 #
5 # This is free software, licensed under the GNU General Public License v2. 5 # This is free software, licensed under the GNU General Public License v2.
6 # See /LICENSE for more information. 6 # See /LICENSE for more information.
7 # 7 #
8   8  
9 include $(TOPDIR)/rules.mk 9 include $(TOPDIR)/rules.mk
10 include $(INCLUDE_DIR)/kernel.mk 10 include $(INCLUDE_DIR)/kernel.mk
11 include $(INCLUDE_DIR)/version.mk 11 include $(INCLUDE_DIR)/version.mk
12 include $(INCLUDE_DIR)/download.mk 12 include $(INCLUDE_DIR)/download.mk
13   13  
14 override MAKEFLAGS= 14 override MAKEFLAGS=
15   15  
16 SDK_NAME:=$(VERSION_DIST_SANITIZED)-sdk-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH) 16 SDK_NAME:=$(VERSION_DIST_SANITIZED)-sdk-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
17 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) 17 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
18   18  
19 STAGING_SUBDIR_HOST := staging_dir/host 19 STAGING_SUBDIR_HOST := staging_dir/host
20 STAGING_SUBDIR_TARGET := staging_dir/$(TARGET_DIR_NAME) 20 STAGING_SUBDIR_TARGET := staging_dir/$(TARGET_DIR_NAME)
21 STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)$(if $(CONFIG_arm),_eabi) 21 STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)$(if $(CONFIG_arm),_eabi)
22   22  
23 EXCLUDE_DIRS:=*/ccache/* \ 23 EXCLUDE_DIRS:=*/ccache/* \
24 */stamp \ 24 */stamp \
25 */stampfiles \ 25 */stampfiles \
26 */man \ 26 */man \
27 */info \ 27 */info \
28 */root-* \ 28 */root-* \
29 initial \ 29 initial \
30 *.install.clean \ 30 *.install.clean \
31 *.install.flags \ 31 *.install.flags \
32 *.install \ 32 *.install \
33 */doc \ 33 */doc \
34 */share/locale 34 */share/locale
35   35  
36 SDK_DIRS = \ 36 SDK_DIRS = \
37 $(STAGING_SUBDIR_HOST) \ 37 $(STAGING_SUBDIR_HOST) \
38 $(STAGING_SUBDIR_TOOLCHAIN) 38 $(STAGING_SUBDIR_TOOLCHAIN)
39   39  
40 GIT_URL:=$(shell git config --get remote.origin.url 2>/dev/null) 40 GIT_URL:=$(shell git config --get remote.origin.url 2>/dev/null)
41 GIT_URL:=$(if $(CONFIG_BUILDBOT),$(filter git://% http://% https://%,$(GIT_URL)),$(GIT_URL)) 41 GIT_URL:=$(if $(CONFIG_BUILDBOT),$(filter git://% http://% https://%,$(GIT_URL)),$(GIT_URL))
42 GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null) 42 GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null)
43 GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) 43 GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
44 GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }') 44 GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }')
45   45  
46 BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) 46 BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
47 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p')) 47 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p'))
48 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p')) 48 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p'))
49 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) 49 BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
50   50  
51 KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR)) 51 KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
52 KDIR_ARCHES = $(LINUX_KARCH) 52 KDIR_ARCHES = $(LINUX_KARCH)
53   53  
54 # arch/arm64/ includes reference files in arch/arm/, so we'll need both 54 # arch/arm64/ includes reference files in arch/arm/, so we'll need both
55 ifeq ($(LINUX_KARCH),arm64) 55 ifeq ($(LINUX_KARCH),arm64)
56 KDIR_ARCHES += arm 56 KDIR_ARCHES += arm
57 endif 57 endif
58   58  
59 KERNEL_FILES_ARCH = \ 59 KERNEL_FILES_ARCH = \
60 Makefile* \ 60 Makefile* \
61 module.lds \ 61 module.lds \
62 Kbuild.platforms \ 62 Kbuild.platforms \
63 */Platform \ 63 */Platform \
64 include \ 64 include \
65 */include \ 65 */include \
66 scripts \ 66 scripts \
67 kernel/asm-offsets.s 67 kernel/asm-offsets.s
68   68  
69 KERNEL_FILES_BASE := \ 69 KERNEL_FILES_BASE := \
70 .config \ 70 .config \
71 Makefile \ 71 Makefile \
72 scripts \ 72 scripts \
73 include \ 73 include \
74 Module.symvers \ 74 Module.symvers \
75 modules.builtin \ 75 modules.builtin \
76 $(foreach arch,$(KDIR_ARCHES),$(addprefix arch/$(arch)/,$(KERNEL_FILES_ARCH))) 76 $(foreach arch,$(KDIR_ARCHES),$(addprefix arch/$(arch)/,$(KERNEL_FILES_ARCH)))
77   77  
78 KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE)))) 78 KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE))))
79   79  
80 all: compile 80 all: compile
81   81  
82 $(BIN_DIR)/$(SDK_NAME).tar.xz: clean 82 $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
83 mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package 83 mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
84 $(CP) -L $(INCLUDE_DIR) $(SCRIPT_DIR) $(SDK_BUILD_DIR)/ 84 $(CP) -L $(INCLUDE_DIR) $(SCRIPT_DIR) $(SDK_BUILD_DIR)/
85 $(TAR) -cf - -C $(TOPDIR) \ 85 $(TAR) -cf - -C $(TOPDIR) \
86 `cd $(TOPDIR); find $(KDIR_BASE)/ -name \*.ko` \ 86 `cd $(TOPDIR); find $(KDIR_BASE) -name \*.ko` \
87 `cd $(TOPDIR); find $(KDIR_BASE)/firmware/ -newer $(KDIR_BASE)/firmware/Makefile \ 87 `cd $(TOPDIR); find $(KDIR_BASE)/firmware/ -newer $(KDIR_BASE)/firmware/Makefile \
88 -type f -name '*.bin' -or -name '*.cis' -or -name '*.csp' -or -name '*.dsp' -or -name '*.fw'` \ 88 -type f -name '*.bin' -or -name '*.cis' -or -name '*.csp' -or -name '*.dsp' -or -name '*.fw'` \
89 $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \ 89 $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
90 $(SDK_DIRS) $(KERNEL_FILES) | \ 90 $(SDK_DIRS) $(KERNEL_FILES) | \
91 $(TAR) -xf - -C $(SDK_BUILD_DIR) 91 $(TAR) -xf - -C $(SDK_BUILD_DIR)
92   92  
93 # Copy usbip sources, this is required for the usbip userspace packages to be buildable by the SDK. 93 # Copy usbip sources, this is required for the usbip userspace packages to be buildable by the SDK.
94 $(TAR) -cf - -C $(TOPDIR) $(KDIR_BASE)/tools/usb/usbip/ | \ 94 $(TAR) -cf - -C $(TOPDIR) $(KDIR_BASE)/tools/usb/usbip/ | \
95 $(TAR) -xf - -C $(SDK_BUILD_DIR) 95 $(TAR) -xf - -C $(SDK_BUILD_DIR)
96   96  
97 (cd $(SDK_BUILD_DIR); find $(STAGING_SUBDIR_HOST)/bin $(STAGING_SUBDIR_HOST)/usr/bin \ 97 (cd $(SDK_BUILD_DIR); find $(STAGING_SUBDIR_HOST)/bin $(STAGING_SUBDIR_HOST)/usr/bin \
98 $(STAGING_SUBDIR_TOOLCHAIN)/bin $(STAGING_SUBDIR_TOOLCHAIN)/*/bin $(STAGING_SUBDIR_TOOLCHAIN)/libexec \ 98 $(STAGING_SUBDIR_TOOLCHAIN)/bin $(STAGING_SUBDIR_TOOLCHAIN)/*/bin $(STAGING_SUBDIR_TOOLCHAIN)/libexec \
99 -type f | $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)) 99 -type f | $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST))
100   100  
101 @-( \ 101 @-( \
102 find \ 102 find \
103 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \ 103 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \
104 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \ 104 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \
105 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \ 105 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \
106 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \ 106 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \
107 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \ 107 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \
108 -type f; \ 108 -type f; \
109 find \ 109 find \
110 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \ 110 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \
111 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \ 111 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \
112 -type f -name \*.so\*; \ 112 -type f -name \*.so\*; \
113 ) | xargs strip 2>/dev/null >/dev/null 113 ) | xargs strip 2>/dev/null >/dev/null
114   114  
115 mkdir -p $(SDK_BUILD_DIR)/target/linux 115 mkdir -p $(SDK_BUILD_DIR)/target/linux
116 $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/ 116 $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
117 rm -rf \ 117 rm -rf \
118 $(SDK_BUILD_DIR)/target/linux/*/files* \ 118 $(SDK_BUILD_DIR)/target/linux/*/files* \
119 $(SDK_BUILD_DIR)/target/linux/*/patches* 119 $(SDK_BUILD_DIR)/target/linux/*/patches*
120 ./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in 120 ./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in
121 $(CP) -L \ 121 $(CP) -L \
122 $(TOPDIR)/LICENSE \ 122 $(TOPDIR)/LICENSE \
123 $(TOPDIR)/rules.mk \ 123 $(TOPDIR)/rules.mk \
124 ./files/Config.in \ 124 ./files/Config.in \
125 ./files/Makefile \ 125 ./files/Makefile \
126 ./files/include/prepare.mk \ 126 ./files/include/prepare.mk \
127 ./files/README.SDK \ 127 ./files/README.SDK \
128 $(SDK_BUILD_DIR)/ 128 $(SDK_BUILD_DIR)/
129 $(CP) \ 129 $(CP) \
130 $(TOPDIR)/package/Makefile \ 130 $(TOPDIR)/package/Makefile \
131 $(TOPDIR)/package/libs/toolchain \ 131 $(TOPDIR)/package/libs/toolchain \
132 $(TOPDIR)/package/kernel/linux \ 132 $(TOPDIR)/package/kernel/linux \
133 $(SDK_BUILD_DIR)/package/ 133 $(SDK_BUILD_DIR)/package/
134   134  
135 -rm -rf \ 135 -rm -rf \
136 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/ccache \ 136 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/ccache \
137 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TARGET)/ccache \ 137 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TARGET)/ccache \
138 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/ccache 138 $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/ccache
139   139  
140 -rm -f $(SDK_BUILD_DIR)/feeds.conf.default 140 -rm -f $(SDK_BUILD_DIR)/feeds.conf.default
141 $(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default) 141 $(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default)
142 if [ -f $(TOPDIR)/feeds.conf ]; then \ 142 if [ -f $(TOPDIR)/feeds.conf ]; then \
143 cat $(TOPDIR)/feeds.conf >> $(SDK_BUILD_DIR)/feeds.conf.default; \ 143 cat $(TOPDIR)/feeds.conf >> $(SDK_BUILD_DIR)/feeds.conf.default; \
144 else \ 144 else \
145 cat $(TOPDIR)/feeds.conf.default >> $(SDK_BUILD_DIR)/feeds.conf.default; \ 145 cat $(TOPDIR)/feeds.conf.default >> $(SDK_BUILD_DIR)/feeds.conf.default; \
146 fi 146 fi
147 $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk 147 $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
148 $(SED) 's,^# SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g' $(SDK_BUILD_DIR)/include/version.mk 148 $(SED) 's,^# SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g' $(SDK_BUILD_DIR)/include/version.mk
149 $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk 149 $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk
150 find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf 150 find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
151 find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf 151 find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
152 find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf 152 find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
153 -make -C $(SDK_BUILD_DIR)/scripts/config clean 153 -make -C $(SDK_BUILD_DIR)/scripts/config clean
154 (cd $(BUILD_DIR); \ 154 (cd $(BUILD_DIR); \
155 tar -I 'xz -7e' -cf $@ $(SDK_NAME); \ 155 tar -I 'xz -7e' -cf $@ $(SDK_NAME); \
156 ) 156 )
157   157  
158 download: 158 download:
159 prepare: 159 prepare:
160 compile: $(BIN_DIR)/$(SDK_NAME).tar.xz 160 compile: $(BIN_DIR)/$(SDK_NAME).tar.xz
161 install: compile 161 install: compile
162   162  
163 clean: 163 clean:
164 rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.xz 164 rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.xz
165   165