From 6b86324b7bb860d7cac78ae2402a272667b161a9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 4 Nov 2018 01:58:25 +0100 Subject: [PATCH] - move flash_eraseall wrapper script to archive-imagefiles/scripts --- .../hd1/sbin => archive-imagefiles/scripts}/flash_eraseall | 0 make/plugins.mk | 5 ++++- skel-root/coolstream/hd2/sbin/flash_eraseall | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) rename {skel-root/coolstream/hd1/sbin => archive-imagefiles/scripts}/flash_eraseall (100%) delete mode 100755 skel-root/coolstream/hd2/sbin/flash_eraseall diff --git a/skel-root/coolstream/hd1/sbin/flash_eraseall b/archive-imagefiles/scripts/flash_eraseall similarity index 100% rename from skel-root/coolstream/hd1/sbin/flash_eraseall rename to archive-imagefiles/scripts/flash_eraseall diff --git a/make/plugins.mk b/make/plugins.mk index cf153f5c..b8f94e5b 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -86,8 +86,11 @@ plugins-hd51: \ ### scripts ### ################ -scripts: +scripts: $(SBIN) install -m755 $(IMAGEFILES)/scripts/service $(SBIN) +ifeq ($(BOXTYPE), coolstream) + install -m755 $(IMAGEFILES)/scripts/flash_eraseall $(SBIN) +endif ##################### ### init-scripts ### diff --git a/skel-root/coolstream/hd2/sbin/flash_eraseall b/skel-root/coolstream/hd2/sbin/flash_eraseall deleted file mode 100755 index c5539b3a..00000000 --- a/skel-root/coolstream/hd2/sbin/flash_eraseall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -echo "${0##*/} has been replaced by \`flash_erase 0 0\`; please use it" 1>&2 -[ $# -ne 0 ] && set -- "$@" 0 0 -exec flash_erase "$@"