aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-08-07 14:30:53 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-08-16 12:22:17 +0100
commit98bccdafd7244238d9dfbbc1a342a4bb557e4b7c (patch)
tree729ed25e871db6e2648f546f81d4ee4b36902e2c /package/base-files
parent5c13177c55d068dec3e58f8f37c1c78502f73d3d (diff)
downloadupstream-98bccdafd7244238d9dfbbc1a342a4bb557e4b7c.tar.gz
upstream-98bccdafd7244238d9dfbbc1a342a4bb557e4b7c.tar.bz2
upstream-98bccdafd7244238d9dfbbc1a342a4bb557e4b7c.zip
base-files: rename 'sdcard' to 'legacy-sdcard'
While an image layout based on MBR and 'bootfs' partition may be easy to understand for users who are very used to the IBM PC and always have the option to access the SD card outside of the device (and hence don't really depend on other recovery methods or dual-boot), in my opinion it's a dead end for many desirable features on embedded systems, especially when managed remotely (and hence without an easy option to access the SD card using another device in case things go wrong, for example). Let me explain: * using a MSDOS/VFAT filesystem to store kernel(s) is problematic, as a single corruption of the bootfs can render the system into a state that it no longer boots at all. This makes dual-boot useless, or at least very tedious to setup with then 2 independent boot partitions to avoid the single point of failure on a "hot" block (the FAT index of the boot partition, written every time a file is changed in bootfs). And well: most targets even store the bootloader environment in a file in that very same FAT filesystem, hence it cannot be used to script a reliable dual-boot method (as loading the environment itself will already fail if the filesystem is corrupted). * loading the kernel uImage from bootfs and using rootfs inside an additional partition means the bootloader can only validate the kernel -- if rootfs is broken or corrupted, this can lead to a reboot loop, which is often a quite costly thing to happen in terms of hardware lifetime. * imitating MBR-boot behavior with a FAT-formatted bootfs partition (like IBM PC in the 80s and 90s) is just one of many choices on embedded targets. There are much better options with modern U-Boot (which is what we use and build from source for all targets booting off SD cards), see examples in mediatek/mt7622 and mediatek/mt7623. Hence rename the 'sdcard' feature to 'legacy-sdcard', and prefix functions with 'legacy_sdcard_' instead of 'sdcard_'. Tested-by: Stijn Tintel <stijn@linux-ipv6.be> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile10
-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