From 57b87e5f0a8d7cae067e6dc60a670a4830099600 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 21 Nov 2015 21:44:55 +0100 Subject: [PATCH] bootstrap:mk introduce my-skel-root-{Nevis, Apollo, Kronos} define it in config (optional) --- .gitignore | 1 + doc/config.example | 5 +++-- make/bootstrap.mk | 25 +++++++++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9ff3244..aee8de3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ local Makefile.local .ignore config +my-skel-* *~ /*.patch /*.diff diff --git a/doc/config.example b/doc/config.example index 8cfcc95..2856d6f 100755 --- a/doc/config.example +++ b/doc/config.example @@ -106,10 +106,11 @@ XUPNPD=no MULTIMEDIA=no ########################################################################################### +### Customize ########################################################################################### - - +#Choose your own SKEL_ROOT_DIR (optional), define SKEL_ROOT_DIR=path_to_my_skel-root-dir +# SKEL_ROOT_DIR= ########################################################################################### diff --git a/make/bootstrap.mk b/make/bootstrap.mk index fd7ffee..641ab10 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -35,15 +35,28 @@ $(HOSTPREFIX)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONFIG_VER).tar.gz | $( skeleton: | $(TARGETPREFIX) if [ $(PLATFORM) = "apollo" ]; then \ - cp --remove-destination -a skel-root-apollo/* $(TARGETPREFIX)/; \ - touch $(TARGETPREFIX)/.$(PLATFORM); \ + if [ -n $(SKEL_ROOT_DIR) ]; then \ + [ ! -e $(SKEL_ROOT_DIR) ] && ln -sf $(SKEL_ROOT_DIR) $(HOSTPREFIX)/my-skel-root-apollo; \ + cp --remove-destination -a my-skel-root-apollo/* $(TARGETPREFIX)/; \ + else \ + cp --remove-destination -a skel-root-apollo/* $(TARGETPREFIX)/; \ + fi \ elif [ $(PLATFORM) = "kronos" ]; then \ - cp --remove-destination -a skel-root-kronos/* $(TARGETPREFIX)/; \ - touch $(TARGETPREFIX)/.$(PLATFORM); \ + if [ -n $(SKEL_ROOT_DIR) ]; then \ + [ ! -e $(SKEL_ROOT_DIR) ] && ln -sf $(SKEL_ROOT_DIR) $(HOSTPREFIX)/my-skel-root-kronos; \ + cp --remove-destination -a my-skel-root-kronos/* $(TARGETPREFIX)/; \ + else \ + cp --remove-destination -a skel-root-kronos/* $(TARGETPREFIX)/; \ + fi \ else \ - cp --remove-destination -a skel-root-nevis/* $(TARGETPREFIX)/; \ - touch $(TARGETPREFIX)/.$(PLATFORM); \ + if [ -n $(SKEL_ROOT_DIR) ]; then \ + [ ! -e $(SKEL_ROOT_DIR) ] && ln -sf $(SKEL_ROOT_DIR) $(HOSTPREFIX)/my-skel-root-nevis; \ + cp --remove-destination -a my-skel-root-nevis/* $(TARGETPREFIX)/; \ + else \ + cp --remove-destination -a skel-root-nevis/* $(TARGETPREFIX)/; \ + fi \ fi + touch $(TARGETPREFIX)/.$(PLATFORM) $(BUILD_TMP): mkdir -p $(BUILD_TMP) -- 2.39.5