Initial commit
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
This commit is contained in:
54
tools/e2fsprogs/Makefile
Normal file
54
tools/e2fsprogs/Makefile
Normal file
@@ -0,0 +1,54 @@
|
||||
#
|
||||
# Copyright (C) 2010-2015 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=e2fsprogs
|
||||
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
|
||||
PKG_VERSION:=1.47.0
|
||||
PKG_HASH:=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
|
||||
|
||||
HOST_BUILD_PARALLEL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
ifneq ($(shell $(HOSTCC) --version | grep clang),)
|
||||
HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t
|
||||
endif
|
||||
HOST_CFLAGS += $(HOST_FPIC)
|
||||
|
||||
HOST_CONFIGURE_ARGS += \
|
||||
--disable-elf-shlibs \
|
||||
--enable-libuuid \
|
||||
--disable-tls \
|
||||
--disable-nls \
|
||||
--enable-threads=pth
|
||||
|
||||
define Host/Prepare
|
||||
$(call Host/Prepare/Default)
|
||||
rm -rf $(HOST_BUILD_DIR)/doc
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(Host/Install/Default)
|
||||
$(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
|
||||
mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
$(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
|
||||
rm -rf $(STAGING_DIR_HOST)/include/uuid
|
||||
$(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
|
||||
endef
|
||||
|
||||
define Host/Clean
|
||||
rm -f $(STAGING_DIR_HOST)/bin/e2fsck
|
||||
rm -f $(STAGING_DIR_HOST)/bin/tune2fs
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
11
tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
Normal file
11
tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/e2fsck/e2fsck.h
|
||||
+++ b/e2fsck/e2fsck.h
|
||||
@@ -81,7 +81,7 @@
|
||||
* Exit codes used by fsck-type programs
|
||||
*/
|
||||
#define FSCK_OK 0 /* No errors */
|
||||
-#define FSCK_NONDESTRUCT 1 /* File system errors corrected */
|
||||
+#define FSCK_NONDESTRUCT 0 /* File system errors corrected */
|
||||
#define FSCK_REBOOT 2 /* System should be rebooted */
|
||||
#define FSCK_UNCORRECTED 4 /* File system errors left uncorrected */
|
||||
#define FSCK_ERROR 8 /* Operational error */
|
||||
11
tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
Normal file
11
tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/misc/Makefile.in
|
||||
+++ b/misc/Makefile.in
|
||||
@@ -12,7 +12,7 @@ MKDIR_P = @MKDIR_P@
|
||||
|
||||
@MCONFIG@
|
||||
|
||||
-@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= e4defrag
|
||||
+@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG=
|
||||
@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8
|
||||
|
||||
@LINUX_CMT@E4CRYPT_PROG = e4crypt
|
||||
11
tools/e2fsprogs/patches/003-no-crond.patch
Normal file
11
tools/e2fsprogs/patches/003-no-crond.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -15259,7 +15259,7 @@ then :
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5
|
||||
printf "%s\n" "${crond_dir}" >&6; }
|
||||
- have_crond="yes"
|
||||
+ have_crond="no"; with_crond_dir=""
|
||||
|
||||
else $as_nop
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 49fd04d77b3244c6c6990be41142168eef373aef Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 22 Nov 2024 12:36:32 +0000
|
||||
Subject: [PATCH] libext2fs: fix -std=c23 build failure
|
||||
|
||||
gcc-15 switched to -std=c23 by default:
|
||||
|
||||
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
|
||||
|
||||
As a result `e2fsprogs` fails the build so only typedef int bool
|
||||
for __STDC_VERSION__ <= 201710L (C17)
|
||||
|
||||
../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers
|
||||
../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration
|
||||
113 | typedef int bool;
|
||||
| ^~~~~~~
|
||||
|
||||
https://github.com/tytso/e2fsprogs/issues/202
|
||||
|
||||
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da
|
||||
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||
---
|
||||
lib/ext2fs/tdb.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/lib/ext2fs/tdb.c
|
||||
+++ b/lib/ext2fs/tdb.c
|
||||
@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
|
||||
typedef int bool;
|
||||
+#endif
|
||||
|
||||
#include "tdb.h"
|
||||
|
||||
Reference in New Issue
Block a user