From 62279cc82d9796cd11fbc7af020f652cfa1d2482 Mon Sep 17 00:00:00 2001
From: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: Thu, 17 Dec 2020 07:11:19 +0100
Subject: [PATCH] Revert "brcm: Add a file to get some space on /."
This reverts commit 73c8ec883556f486294cb7659809a2116ae2fb1f.
This was a development-only feature that is no longer needed now that we
have a working overlay.
---
.../base-files/lib/preinit/01_delete_me | 27 -------------------
iopsys-brcm63xx-arm/config/config | 5 ----
iopsys-brcm63xx-arm/image/Config.in | 8 ------
iopsys-brcm63xx-arm/image/Makefile | 6 -----
4 files changed, 46 deletions(-)
delete mode 100644 iopsys-brcm63xx-arm/base-files/lib/preinit/01_delete_me
diff --git a/iopsys-brcm63xx-arm/base-files/lib/preinit/01_delete_me b/iopsys-brcm63xx-arm/base-files/lib/preinit/01_delete_me
deleted file mode 100644
index df74bfe1f..000000000
--- a/iopsys-brcm63xx-arm/base-files/lib/preinit/01_delete_me
+++ /dev/null
@@ -1,27 +0,0 @@
-# delete file to get som RW space
-
-do_get_some_space()
-{
- if [ -f /delete_me_for_some_space ]
- then
- echo "Removing /delete_me_for_some_space and remounting / RW. Development feature only!!!!!!"
-
- if ! rm -f /delete_me_for_some_space 2>/dev/null
- then
- mount -o remount,rw /
-
- # If the root is on a ext4 filesystem and if so do a resize (rootfs needs to be RW)
- # to use the full partition.
- if cat /proc/mounts | grep root | grep ext4
- then
- echo "/ is a EXT4 filesystem. will do a resize to get some space"
- root_dev=$(cat /proc/cmdline | sed -e "s/root=\([^ ]*\).*/\1/")
- resize2fs $root_dev
- fi
-
- rm -f /delete_me_for_some_space
- fi
- fi
-}
-
-boot_hook_add preinit_essential do_get_some_space
diff --git a/iopsys-brcm63xx-arm/config/config b/iopsys-brcm63xx-arm/config/config
index 86c1fd8db..09b227dc9 100644
--- a/iopsys-brcm63xx-arm/config/config
+++ b/iopsys-brcm63xx-arm/config/config
@@ -29,8 +29,3 @@ CONFIG_BUSYBOX_CONFIG_CHRT=y
# for debug purposes only.
CONFIG_PACKAGE_bash=y
-
-###############################################################################
-#
-# add some space to play with in MB
-CONFIG_TARGET_PREINITSPACE=2
diff --git a/iopsys-brcm63xx-arm/image/Config.in b/iopsys-brcm63xx-arm/image/Config.in
index 9ed9d6ac8..7ff9d06b5 100644
--- a/iopsys-brcm63xx-arm/image/Config.in
+++ b/iopsys-brcm63xx-arm/image/Config.in
@@ -15,14 +15,6 @@ config TARGET_CUSTOMER
A Customer id that is added to software file name
-config TARGET_PREINITSPACE
- int
- prompt "Reserve space on root filesystem"
- default 0
- help
- Set this to the number of megabytes to reserve on / for writing
-
-
config TARGET_NO_1STBOOT_MARK
bool "Don't add 'first boot' marker to root FS"
default n
diff --git a/iopsys-brcm63xx-arm/image/Makefile b/iopsys-brcm63xx-arm/image/Makefile
index 29c6648ee..537e268ac 100644
--- a/iopsys-brcm63xx-arm/image/Makefile
+++ b/iopsys-brcm63xx-arm/image/Makefile
@@ -586,12 +586,6 @@ define Iopsys/Image/FIT
# use iopsys rootfs instead of broadcom
cp -a $(BUILD_DIR_ROOT)/. $(PROFILE_DIR)/fs
-# cp -a $(PROFILE_DIR)/fs_bcm $(PROFILE_DIR)/fs
-
- ifneq ($(CONFIG_TARGET_PREINITSPACE),0)
- # create some rw space on target
- dd if=/dev/urandom bs=1M count=$(CONFIG_TARGET_PREINITSPACE) of=$(PROFILE_DIR)/fs/delete_me_for_some_space
- endif
# cd $(TOPDIR) ;$(MAKE) -f build/Makefile iopsys_firmware_image
cd $(TOPDIR); make -C package/feeds/broadcom/bcmkernel iopsys_firmware_image
# restore original fs directory
--
GitLab