From: Markham Date: Tue, 29 Oct 2019 17:02:26 +0000 (+0100) Subject: rework build target skeleton X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=63d90f2478bd10a0a72840362c5061e4d5a598e5;p=bs-cst-neutrino-hd.git rework build target skeleton --- diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 75c1568..a944901 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -227,29 +227,22 @@ $(D)/cortex-strings: $(ARCHIVE)/cortex-strings-git-$(CORTEX_STRINGS_VER).tar.gz skeleton: | $(TARGETPREFIX) $(START_BUILD) - if [ $(PLATFORM) = "apollo" -o $(PLATFORM) = "kronos" ]; then \ - if [ -n $(SKEL_ROOT_DIR) ]; then \ - [ ! -e $(BASE_DIR)/my-skel-root-hd2 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-hd2; \ - cp --remove-destination -a my-skel-root-hd2/* $(TARGETPREFIX)/; \ - else \ - cp --remove-destination -a skel-root-hd2/* $(TARGETPREFIX)/; \ - fi \ - elif [ $(PLATFORM) = "nevis" ]; then \ + if [ $(BOXSERIES) = "hd1" ]; then \ if [ -n $(SKEL_ROOT_DIR) ]; then \ [ ! -e $(BASE_DIR)/my-skel-root-hd1 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-hd1; \ cp --remove-destination -a my-skel-root-hd1/* $(TARGETPREFIX)/; \ else \ cp --remove-destination -a skel-root-hd1/* $(TARGETPREFIX)/; \ fi \ - elif [ $(BOXMODEL) = "h7" ]; then \ + elif [ $(BOXSERIES) = "hd2" ]; then \ if [ -n $(SKEL_ROOT_DIR) ]; then \ - [ ! -e $(BASE_DIR)/my-skel-root-h7 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-h7; \ - cp --remove-destination -a my-skel-root-h7/* $(TARGETPREFIX)/; \ + [ ! -e $(BASE_DIR)/my-skel-root-hd2 ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-hd2; \ + cp --remove-destination -a my-skel-root-hd2/* $(TARGETPREFIX)/; \ else \ - cp --remove-destination -a skel-root-h7/* $(TARGETPREFIX)/; \ + cp --remove-destination -a skel-root-hd2/* $(TARGETPREFIX)/; \ fi \ else \ - if [ $(BOXMODEL) = "hd51" -o $(BOXMODEL) = "bre2ze4k"]; then \ + if [ $(BOXTYPE) = "armbox" ]; then \ [ ! -e $(BASE_DIR)/my-skel-root-arm ] && ln -s $(SKEL_ROOT_DIR) $(BASE_DIR)/my-skel-root-arm; \ cp --remove-destination -a my-skel-root-arm/* $(TARGETPREFIX)/; \ else \