X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Fsdk%2FMakefile;h=54a14d352bee3cbf26f8c3aab05a7b4d0aea9669;hp=376aef8eb0f5430e968dfbe763cf04d82e9440ba;hb=56b9f0ffc0cbceabe3636c19baaf6c27f34ebe1e;hpb=cedfe135ab102ac2f8390dd82b496de3c383d3cc diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 376aef8eb0..54a14d352b 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2016 LEDE Project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,26 +9,43 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= -PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) -PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) - -SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV) +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) SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) -EXCLUDE_DIRS:=*/ccache \ + +STAGING_SUBDIR_HOST := staging_dir/host +STAGING_SUBDIR_TARGET := staging_dir/$(TARGET_DIR_NAME) +STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) + +EXCLUDE_DIRS:=*/ccache/* \ */stamp \ */stampfiles \ */man \ */info \ + */root-* \ + initial \ + *.install.clean \ + *.install.flags \ + *.install \ + */doc \ + */share/locale SDK_DIRS = \ - staging_dir/host \ - staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \ - staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \ + $(STAGING_SUBDIR_HOST) \ + $(STAGING_SUBDIR_TOOLCHAIN) -SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }') +GIT_URL:=$(filter git://% http://% https://%,$(shell git config --get remote.origin.url 2>/dev/null)) +GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null) +GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) +GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }') + +BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) +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')) +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')) +BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base https://git.lede-project.org/source.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR)) @@ -37,6 +55,7 @@ KERNEL_FILES_ARCH = \ Kbuild.platforms \ */Platform \ include \ + */include \ scripts \ kernel/asm-offsets.s @@ -46,19 +65,42 @@ KERNEL_FILES_BASE := \ scripts \ include \ Module.symvers \ + modules.builtin \ $(addprefix arch/$(LINUX_KARCH)/,$(KERNEL_FILES_ARCH)) KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE)))) all: compile -$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean +$(BIN_DIR)/$(SDK_NAME).tar.xz: clean mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package - $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ + $(CP) -L $(INCLUDE_DIR) $(SCRIPT_DIR) $(SDK_BUILD_DIR)/ $(TAR) -cf - -C $(TOPDIR) \ + `cd $(TOPDIR); find $(KDIR_BASE) -name \*.ko` \ + `cd $(TOPDIR); find $(KDIR_BASE)/firmware/ -newer $(KDIR_BASE)/firmware/Makefile \ + -type f -name '*.bin' -or -name '*.cis' -or -name '*.csp' -or -name '*.dsp' -or -name '*.fw'` \ $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \ $(SDK_DIRS) $(KERNEL_FILES) | \ $(TAR) -xf - -C $(SDK_BUILD_DIR) + + (cd $(SDK_BUILD_DIR); find $(STAGING_SUBDIR_HOST)/bin $(STAGING_SUBDIR_HOST)/usr/bin \ + $(STAGING_SUBDIR_TOOLCHAIN)/bin $(STAGING_SUBDIR_TOOLCHAIN)/*/bin $(STAGING_SUBDIR_TOOLCHAIN)/libexec \ + -type f | $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)) + + @-( \ + find \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \ + -type f; \ + find \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \ + -type f -name \*.so\*; \ + ) | xargs strip 2>/dev/null >/dev/null + mkdir -p $(SDK_BUILD_DIR)/target/linux $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/ rm -rf \ @@ -68,31 +110,44 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean $(CP) -L \ $(TOPDIR)/LICENSE \ $(TOPDIR)/rules.mk \ - $(TOPDIR)/.config \ ./files/Config.in \ ./files/Makefile \ + ./files/include/prepare.mk \ ./files/README.SDK \ $(SDK_BUILD_DIR)/ $(CP) \ $(TOPDIR)/package/Makefile \ + $(TOPDIR)/package/libs/toolchain \ + $(TOPDIR)/package/kernel/linux \ $(SDK_BUILD_DIR)/package/ - $(if $(SVN_PACKAGE_URL),echo "src-svn trunk $(SVN_PACKAGE_URL)" \ - > $(SDK_BUILD_DIR)/feeds.conf.default,\ - -rm -f $(SDK_BUILD_DIR)/feeds.conf.default) - cat $(TOPDIR)/feeds.conf.default \ - >> $(SDK_BUILD_DIR)/feeds.conf.default + + -rm -rf \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/ccache \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TARGET)/ccache \ + $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/ccache + + -rm -f $(SDK_BUILD_DIR)/feeds.conf.default + $(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default) + if [ -f $(TOPDIR)/feeds.conf ]; then \ + cat $(TOPDIR)/feeds.conf >> $(SDK_BUILD_DIR)/feeds.conf.default; \ + else \ + cat $(TOPDIR)/feeds.conf.default >> $(SDK_BUILD_DIR)/feeds.conf.default; \ + fi $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk + $(SED) 's,^# SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g' $(SDK_BUILD_DIR)/include/version.mk + $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf + -make -C $(SDK_BUILD_DIR)/scripts/config clean (cd $(BUILD_DIR); \ - tar cfj $@ $(SDK_NAME); \ + tar -I 'xz -7e' -cf $@ $(SDK_NAME); \ ) download: prepare: -compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2 +compile: $(BIN_DIR)/$(SDK_NAME).tar.xz install: compile clean: - rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2 + rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.xz