fixup! examples/xipfs-tests: fix xipfs tests

RIOT-OS · Feb 13, 2025 · 3b1d69a · 3b1d69a
1 parent 2f78141
commit 3b1d69a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/examples/xipfs-tests/Makefile b/examples/xipfs-tests/Makefile
@@ -23,4 +23,6 @@ USEMODULE += ps
 # Use the default file system
 USEMODULE += xipfs
 
+CFLAGS +=-DRIOT_OS
+
 include $(RIOTBASE)/Makefile.include
diff --git a/examples/xipfs/Makefile b/examples/xipfs/Makefile
@@ -23,4 +23,6 @@ USEMODULE += ps
 # Use the default file system
 USEMODULE += xipfs
 
+CFLAGS +=-DRIOT_OS
+
 include $(RIOTBASE)/Makefile.include
diff --git a/pkg/xipfs/Makefile b/pkg/xipfs/Makefile
@@ -1,15 +1,16 @@
 PKG_NAME=xipfs
 PKG_URL=https://github.com/2xs/xipfs.git
-PKG_VERSION=374f4cba72018f8f3d4e62327f01d8657e6705a4
+PKG_VERSION=eda8138f52a37472615297b2e46e0fab81e5b84c
 PKG_LICENSE=CeCILL-2.1
 
 include $(RIOTBASE)/pkg/pkg.mk
 
+export RIOT_OS=1
+export RIOT_INCLUDES=$(INCLUDES)
+export RIOT_CFLAGS=$(CFLAGS)
+
 all: $(BINDIR)/xipfs.a
 
-$(BINDIR)/xipfs.a: $(PKG_SOURCE_DIR)/toolchain.mk
+$(BINDIR)/xipfs.a:
 	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)
 	@cp $(PKG_SOURCE_DIR)/xipfs.a $@
-
-$(PKG_SOURCE_DIR)/toolchain.mk:
-	$(PKG_SOURCE_DIR)/configure.sh --board=$(BOARD)
diff --git a/pkg/xipfs/fs/Makefile b/pkg/xipfs/fs/Makefile
@@ -1,3 +1,5 @@
 MODULE := xipfs_fs
 
+CFLAGS+=-DRIOT_OS
+
 include $(RIOTBASE)/Makefile.base
diff --git a/pkg/xipfs/fs/xipfs_fs.c b/pkg/xipfs/fs/xipfs_fs.c
@@ -55,7 +55,9 @@
 #include "include/flash.h"
 #include "include/fs.h"
 #include "include/path.h"
+#ifndef RIOT_OS
 #include "include/xipfs.h"
+#endif
 
 /*
  * The eXecute In Place File System only makes sense if the

diff --git a/sys/include/fs/xipfs_fs.h b/sys/include/fs/xipfs_fs.h
@@ -24,7 +24,13 @@
 #define FS_XIPFS_FS_H
 
 #include "vfs.h"
+
+#ifdef RIOT_OS
+#include "include/xipfs.h"
+#else
 #include "xipfs_config.h"
+#endif /* RIOT_OS */
+
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/sys/shell/cmds/xipfs.c b/sys/shell/cmds/xipfs.c
@@ -24,7 +24,14 @@
 #include <limits.h>
 
 #include "fs/xipfs_fs.h"
+
+#ifdef RIOT_OS
+#include "include/xipfs.h"
+#else /* RIOT_OS */
 #include "xipfs_config.h"
+#endif /* RIOT_OS */
+
+
 #include "shell.h"
 
 static char *execute_file_handler_args[XIPFS_EXEC_ARGC_MAX];