From 4aa69af45a2264cded3335cd50b1a783560e9df7 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 3 Nov 2024 11:01:10 +0100 Subject: [PATCH] fix cst e2fsprog patch; fix neutrino.mk --- make/applications.mk | 4 +++- make/neutrino.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 5782511..cc63edd 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -101,15 +101,17 @@ $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGETPREFIX) $(TOUCH) ifeq ($(BOXTYPE), armbox) +PATCH_PATH = "e2fsprogs/" OPT_RESIZE2FS = else +PATCH_PATH = "e2fsprogs/cst/" OPT_RESIZE2FS = --disable-resizer endif $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz set -e; cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER); \ - for i in $(PATCHES)/e2fsprogs/*.patch; do \ + for i in $(PATCHES)/$(PATCH_PATH)/*.patch; do \ echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ diff --git a/make/neutrino.mk b/make/neutrino.mk index f420727..6afe64a 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -9,10 +9,12 @@ N_CFLAGS += -Wno-int-in-bool-context -Wno-cast-function-type endif N_CFLAGS += -fmax-errors=10 -#N_CFLAGS += -D__KERNEL_STRICT_NAMES +N_CFLAGS += -D__KERNEL_STRICT_NAMES N_CFLAGS += -DNEW_LIBCURL #N_CFLAGS += -fno-strict-aliasing +N_CLAGSS += -D_FILE_OFFSET_BITS=64 #N_CFLAGS += -D__STDC_FORMAT_MACROS +N_CFLAGS += -DDYNAMIC_LUAPOSIX N_CFLAGS += -D__STDC_CONSTANT_MACROS N_CFLAGS += -Wno-psabi -- 2.39.5