From 99ea9422592798f7840dd46d28f208f75df1b456 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Feb 2025 15:21:03 +0100 Subject: [PATCH] {fs/,package/gen}romfs: remove Fixes: http://autobuild.buildroot.net/results/9b0/9b09c8681e1003580b766aa0d244889f3b0be0c8/ Romfs is very old and limited, the fs logic and package has not really changed since it was added 17 years ago with Commit 4b01dfced944 ("Add romfs target support, courtesy Josh ") and genromfs crashes in some situations, so drop it. Signed-off-by: Peter Korsgaard [Arnout: also remove from DEVELOPERS] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - Config.in.legacy | 12 +++++++++ DEVELOPERS | 1 - fs/Config.in | 1 - fs/romfs/Config.in | 4 --- fs/romfs/romfs.mk | 13 --------- package/Config.in | 1 - package/genromfs/0001-build-system.patch | 26 ------------------ package/genromfs/Config.in | 6 ----- package/genromfs/genromfs.hash | 3 --- package/genromfs/genromfs.mk | 34 ------------------------ 11 files changed, 12 insertions(+), 90 deletions(-) delete mode 100644 fs/romfs/Config.in delete mode 100644 fs/romfs/romfs.mk delete mode 100644 package/genromfs/0001-build-system.patch delete mode 100644 package/genromfs/Config.in delete mode 100644 package/genromfs/genromfs.hash delete mode 100644 package/genromfs/genromfs.mk diff --git a/.checkpackageignore b/.checkpackageignore index 8fd03b0dd6..194a2d1c72 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -518,7 +518,6 @@ package/gdb/16.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream package/gdb/16.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream package/gdb/16.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream package/genpart/0001-fix-return-code.patch lib_patch.Upstream -package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream package/gerbera/S99gerbera lib_sysv.Indent package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index a8baecad58..674299470f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2025.02" +config BR2_PACKAGE_GENROMFS + bool "genromfs" + select BR2_LEGACY + help + Romfs root filesystem support has been removed. + +config BR2_TARGET_ROOTFS_ROMFS + bool "romfs root filesystem has been removed" + select BR2_LEGACY + help + Romfs root filesystem support has been removed. + config BR2_BINUTILS_VERSION_2_41_X bool "binutils 2.41 has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index af605b388e..10b8031ad3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3188,7 +3188,6 @@ F: package/double-conversion/ F: package/flashrom/ F: package/gcc/ F: package/genext2fs/ -F: package/genromfs/ F: package/getent/ F: package/gnu-efi/ F: package/heirloom-mailx/ diff --git a/fs/Config.in b/fs/Config.in index eee5e26bb2..6b338f8ec8 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -12,7 +12,6 @@ source "fs/initramfs/Config.in" source "fs/iso9660/Config.in" source "fs/jffs2/Config.in" source "fs/oci/Config.in" -source "fs/romfs/Config.in" source "fs/squashfs/Config.in" source "fs/tar/Config.in" source "fs/ubi/Config.in" diff --git a/fs/romfs/Config.in b/fs/romfs/Config.in deleted file mode 100644 index 84944a0fc0..0000000000 --- a/fs/romfs/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_TARGET_ROOTFS_ROMFS - bool "romfs root filesystem" - help - Build a romfs image of the root filesystem. diff --git a/fs/romfs/romfs.mk b/fs/romfs/romfs.mk deleted file mode 100644 index 163751b4e2..0000000000 --- a/fs/romfs/romfs.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# Build the romfs root filesystem image -# -################################################################################ - -ROOTFS_ROMFS_DEPENDENCIES = host-genromfs - -define ROOTFS_ROMFS_CMD - $(HOST_DIR)/bin/genromfs -d $(TARGET_DIR) -f $@ -endef - -$(eval $(rootfs)) diff --git a/package/Config.in b/package/Config.in index e9c789cff2..44b285d348 100644 --- a/package/Config.in +++ b/package/Config.in @@ -238,7 +238,6 @@ menu "Filesystem and flash utilities" source "package/fwup/Config.in" source "package/genext2fs/Config.in" source "package/genpart/Config.in" - source "package/genromfs/Config.in" source "package/gocryptfs/Config.in" source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" diff --git a/package/genromfs/0001-build-system.patch b/package/genromfs/0001-build-system.patch deleted file mode 100644 index 827fe75bd2..0000000000 --- a/package/genromfs/0001-build-system.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- - Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -Index: genromfs-0.5.2/Makefile -=================================================================== ---- genromfs-0.5.2.orig/Makefile -+++ genromfs-0.5.2/Makefile -@@ -6,8 +6,6 @@ - PACKAGE = genromfs - VERSION = 0.5.2 - CC = gcc --CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g# --LDFLAGS = -s#-g - - DISTDIR = $(PACKAGE)-$(VERSION) - -@@ -24,7 +22,7 @@ - $(CC) $(LDFLAGS) genromfs.o -o genromfs - - .c.o: -- $(CC) $(CFLAGS) $< -c -o $@ -+ $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $< -c -o $@ - - clean: - rm -f genromfs *.o diff --git a/package/genromfs/Config.in b/package/genromfs/Config.in deleted file mode 100644 index e4eba9f16a..0000000000 --- a/package/genromfs/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_GENROMFS - bool "genromfs" - help - Tool to generate a ROMFS filesystem. - - http://romfs.sourceforge.net/ diff --git a/package/genromfs/genromfs.hash b/package/genromfs/genromfs.hash deleted file mode 100644 index 0be88ee1b4..0000000000 --- a/package/genromfs/genromfs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 30f37fc734572c1dbaa2504585bc23ba6b8fd7df767ae7155995b2ca0ebed960 genromfs-0.5.2.tar.gz -sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk deleted file mode 100644 index fd696b45b2..0000000000 --- a/package/genromfs/genromfs.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# genromfs -# -################################################################################ - -GENROMFS_VERSION = 0.5.2 -GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION) -GENROMFS_LICENSE = GPL-2.0+ -GENROMFS_LICENSE_FILES = COPYING - -define GENROMFS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -endef - -# "PREFIX" is the equivalent of DESTDIR in autotools, "prefix" is the -# traditional prefix. "prefix" defaults to /usr so no need to set it. -define GENROMFS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install -endef - -define HOST_GENROMFS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_GENROMFS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package))