diff options
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 10 | ||||
| -rw-r--r-- | package/base-files/files/lib/upgrade/legacy-sdcard.sh (renamed from package/base-files/files/lib/upgrade/sdcard.sh) | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f19b07cfe1..d67f551b9c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -23,7 +23,7 @@ PKG_LICENSE:=GPL-2.0 PKG_CONFIG_DEPENDS += \ CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE \ CONFIG_NAND_SUPPORT \ - CONFIG_SDCARD_SUPPORT \ + CONFIG_LEGACY_SDCARD_SUPPORT \ CONFIG_CLEAN_IPKG \ CONFIG_PER_FEED_REPO \ $(foreach feed,$(FEEDS_AVAILABLE),CONFIG_FEED_$(feed)) @@ -124,9 +124,9 @@ ifeq ($(CONFIG_NAND_SUPPORT),) endef endif -ifeq ($(CONFIG_SDCARD_SUPPORT),) - define Package/base-files/sdcard-support - rm -f $(1)/lib/upgrade/sdcard.sh +ifeq ($(CONFIG_LEGACY_SDCARD_SUPPORT),) + define Package/base-files/legacy-sdcard-support + rm -f $(1)/lib/upgrade/legacy-sdcard.sh endef endif @@ -135,7 +135,7 @@ define Package/base-files/install $(CP) ./files/* $(1)/ $(Package/base-files/install-key) $(Package/base-files/nand-support) - $(Package/base-files/sdcard-support) + $(Package/base-files/legacy-sdcard-support) if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ fi diff --git a/package/base-files/files/lib/upgrade/sdcard.sh b/package/base-files/files/lib/upgrade/legacy-sdcard.sh index 2052805acb..d2ae53b729 100644 --- a/package/base-files/files/lib/upgrade/sdcard.sh +++ b/package/base-files/files/lib/upgrade/legacy-sdcard.sh @@ -1,4 +1,4 @@ -sdcard_check_image() { +legacy_sdcard_check_image() { local file="$1" local diskdev partdev diff @@ -26,7 +26,7 @@ sdcard_check_image() { fi } -sdcard_do_upgrade() { +legacy_sdcard_do_upgrade() { local board=$(board_name) local diskdev partdev diff @@ -78,7 +78,7 @@ sdcard_do_upgrade() { sleep 1 } -sdcard_copy_config() { +legacy_sdcard_copy_config() { local partdev if export_partdevice partdev 1; then |