Fix the sdk generation with the new staging_dir layout
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8503 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
406909c637
commit
1e35e6e87d
|
@ -15,15 +15,16 @@ PKG_CPU:=$(shell uname -m)
|
||||||
|
|
||||||
SDK_NAME:=OpenWrt-SDK-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
|
SDK_NAME:=OpenWrt-SDK-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
|
||||||
SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
|
SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
|
||||||
|
EXCLUDE_DIRS:=ccache stamp
|
||||||
|
|
||||||
all: compile
|
all: compile
|
||||||
|
|
||||||
$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
|
$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
|
||||||
mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
|
mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
|
||||||
$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
|
$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
|
||||||
$(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
|
$(TAR) -cf - -C $(TOPDIR) --exclude="$(EXCLUDE_DIRS)" staging_dir/$(ARCH) | \
|
||||||
$(TAR) -xf - -C $(SDK_BUILD_DIR)
|
$(TAR) -xf - -C $(SDK_BUILD_DIR)
|
||||||
(cd $(SDK_BUILD_DIR)/staging_dir_$(ARCH); \
|
(cd $(SDK_BUILD_DIR)/staging_dir/$(ARCH); \
|
||||||
rm -rf info man share stampfiles; \
|
rm -rf info man share stampfiles; \
|
||||||
cd usr; \
|
cd usr; \
|
||||||
rm -rf doc info man share; \
|
rm -rf doc info man share; \
|
||||||
|
@ -34,7 +35,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
|
||||||
$(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
|
$(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
|
||||||
$(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
|
$(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
|
||||||
echo OPENWRTVERSION:="$(OPENWRTVERSION)" > $(SDK_BUILD_DIR)/.version.mk
|
echo OPENWRTVERSION:="$(OPENWRTVERSION)" > $(SDK_BUILD_DIR)/.version.mk
|
||||||
rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache
|
rm -rf $(SDK_BUILD_DIR)/staging_dir/$(ARCH)/{ccache,stamp}
|
||||||
find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
|
find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
|
||||||
find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
|
find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
|
||||||
(cd $(BUILD_DIR); \
|
(cd $(BUILD_DIR); \
|
||||||
|
|
Loading…
Reference in New Issue