From cd87a866ad514f6760247f6b58539813c9ab1e7e Mon Sep 17 00:00:00 2001 From: Jean-Pierre André <jpandre@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:48:02 +0200 Subject: [PATCH] Upgraded fuse to version 1.5 --- components/openindiana/fuse/Makefile | 13 ++++++------- components/openindiana/fuse/manifests/sample-manifest.p5m | 1 - components/openindiana/fuse/fuse.p5m | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/components/openindiana/fuse/Makefile b/components/openindiana/fuse/Makefile index adffaa8..f5b4a3c 100644 --- a/components/openindiana/fuse/Makefile +++ b/components/openindiana/fuse/Makefile @@ -14,17 +14,16 @@ # BUILD_STYLE = justmake -BUILD_BITS = NO_ARCH +BUILD_BITS = 64 include ../../../make-rules/shared-macros.mk COMPONENT_NAME= illumos-fusefs -COMPONENT_VERSION= ef9a33d4a18131a8c0e50002b138b0431e5db616 -IPS_COMPONENT_VERSION= 1.4 -COMPONENT_REVISION= 4 +COMPONENT_VERSION= f7c3e8c785091774d75d4f11ac12f2309a3f2dbd +IPS_COMPONENT_VERSION= 1.5 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).zip -COMPONENT_ARCHIVE_HASH= sha256:c050307b9364266a06b83b19c288763b1e9173ac8121431d026ccf5cdb1203b4 +COMPONENT_ARCHIVE_HASH= sha256:06551185d2709b4ce043d98e97fccb0a375f5c4161550e594449ce09f09e8aab COMPONENT_ARCHIVE_URL= https://github.com/jurikm/illumos-fusefs/archive/$(COMPONENT_VERSION).zip TEST_TARGET = $(NO_TESTS) @@ -33,7 +32,8 @@ # Force gcc 7 for a case we would switch our default gcc to something else. # This should match the compiler used to build illumos-gate. -GCC_VERSION = 7 +# Now switched to gcc 10 +GCC_VERSION = 10 PATH=/opt/onbld/bin/i386:$(PATH.illumos) @@ -50,7 +50,6 @@ $(MKDIR) $(PROTOUSRKERNELDRVDIR) $(PROTOUSRKERNELDRVDIR64) - $(INSTALL) $(@D)/kernel/proto/$(USRKERNELDRVDIR)/fuse $(PROTOUSRKERNELDRVDIR) $(INSTALL) $(@D)/kernel/proto/$(USRKERNELDRVDIR64)/fuse $(PROTOUSRKERNELDRVDIR64) $(INSTALL) $(@D)/kernel/proto/$(USRKERNELDRVDIR)/fuse.conf $(PROTOUSRKERNELDRVDIR) diff --git a/components/openindiana/fuse/fuse.p5m b/components/openindiana/fuse/fuse.p5m index 7fefe21..54401cb 100644 --- a/components/openindiana/fuse/fuse.p5m +++ b/components/openindiana/fuse/fuse.p5m @@ -35,5 +35,4 @@ driver devlink=type=ddi_pseudo;name=fuse\t\D name=fuse file path=usr/kernel/drv/$(MACH64)/fuse -file path=usr/kernel/drv/fuse file path=usr/kernel/drv/fuse.conf preserve=true diff --git a/components/openindiana/fuse/manifests/sample-manifest.p5m b/components/openindiana/fuse/manifests/sample-manifest.p5m index 2b521d0..f5c2855 100644 --- a/components/openindiana/fuse/manifests/sample-manifest.p5m +++ b/components/openindiana/fuse/manifests/sample-manifest.p5m @@ -24,5 +24,4 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/kernel/drv/$(MACH64)/fuse -file path=usr/kernel/drv/fuse file path=usr/kernel/drv/fuse.conf -- Gitblit v1.9.3