KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sdk: use prepare target to initialize git snapshot

Browse source 
The new approach is less prone to race conditions and will properly
snapshot the symlinks prepared by the prereq-build target.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44330
This commit is contained in:
Jo-Philipp Wich 2015-02-08 22:54:27 +00:00
parent 1a27d74827
commit 49fda5e4d9
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
target/sdk/Makefile
View file

@ -98,6 +98,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
$(TOPDIR)/.config \ $(TOPDIR)/.config \
./files/Config.in \ ./files/Config.in \
./files/Makefile \ ./files/Makefile \
./files/include/prepare.mk \
./files/README.SDK \ ./files/README.SDK \
$(SDK_BUILD_DIR)/ $(SDK_BUILD_DIR)/
$(CP) \ $(CP) \

12
target/sdk/files/Makefile
View file

@ -1,6 +1,6 @@
# Makefile for OpenWrt # Makefile for OpenWrt
# #
# Copyright (C) 2007 OpenWrt.org # Copyright (C) 2007-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -14,16 +14,6 @@ export TOPDIR LC_ALL LANG SDK
world: world:
# Initialize SDK snapshot
.git/config:
@( \
echo -n "Initializing SDK ... "; \
git init -q .; \
find . -mindepth 1 -maxdepth 1 -not -name feeds | xargs git add; \
git commit -q -m "Initial state"; \
echo "ok."; \
)
include $(TOPDIR)/include/host.mk include $(TOPDIR)/include/host.mk
ifneq ($(OPENWRT_BUILD),1) ifneq ($(OPENWRT_BUILD),1)

17
target/sdk/files/include/prepare.mk Normal file
View file

@ -0,0 +1,17 @@
#
# Copyright (C) 2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
prepare: .git/config
.git/config:
@( \
printf "Initializing SDK ... "; \
git init -q .; \
find . -mindepth 1 -maxdepth 1 -not -name feeds | xargs git add; \
git commit -q -m "Initial state"; \
echo "ok."; \
)