From c4b878d110666e3e74b0a2aa70da507c1bd1b2ed Mon Sep 17 00:00:00 2001 From: heppen Date: Tue, 27 Jun 2023 22:19:07 +0800 Subject: [PATCH 1/2] add content in readme --- README.en.md | 5 +---- README.md | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.en.md b/README.en.md index 98d04f6..4661a38 100644 --- a/README.en.md +++ b/README.en.md @@ -1,16 +1,13 @@ # hmdfs #### Description -HMDFS is an overlay file system. Relying on the underlying file system, under the premise of networking, file exchanges across devices can be realized. +HMDFS is an overlay file system. Relying on the underlying file system, under the premise of networking, file exchanges across devices can be realized. Device view and merge view are provided. In the device view, the shared directories of the corresponding devices are provided under different device directories; in the merge view, acollection of shared files of all devices is provided. #### Software Architecture Software architecture description #### Installation -1. xxxx -2. xxxx -3. xxxx #### Instructions diff --git a/README.md b/README.md index 1c95e3a..7ea3c7a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # hmdfs #### 介绍 -HMDFS is an overlay file system. Relying on the underlying file system, under the premise of networking, file exchanges across devices can be realized. +HMDFS(HarmonyOs Distributed File System, HarmonyOs分布式文件系统)是一种堆叠式文件系统。在联网条件下，其依托底层的文件系统，可以实现设备之间的文件交换。hmdfs提供了两种视图：设备视图和合并视图。在设备视图下，可以看到不同设备共享目录下的文件；在合并视图下，可以看到所有设备的共享目录下的所有文件。 #### 软件架构 软件架构说明 @@ -9,9 +9,11 @@ HMDFS is an overlay file system. Relying on the underlying file system, under th #### 安装教程 -1. xxxx -2. xxxx -3. xxxx +1. 通过yum或者dnf安装hmdfs +```shell +dnf install hmdfs -y +``` +*说明: 安装hmdfs之后，会将hmdfs的ko文件存放到`/usr/lib/modules/$(uname -r)/hmdfs/目录下`* #### 使用说明 -- Gitee From 3697811a2360a7a22cdaaf2ca07357b6aeb68c76 Mon Sep 17 00:00:00 2001 From: heppen Date: Tue, 27 Jun 2023 22:37:02 +0800 Subject: [PATCH 2/2] close tls by default --- 0003-close-tls-by-default.patch | 32 ++++++++++++++++++++++++++++++++ hmdfs.spec | 12 ++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 0003-close-tls-by-default.patch diff --git a/0003-close-tls-by-default.patch b/0003-close-tls-by-default.patch new file mode 100644 index 0000000..10cc884 --- /dev/null +++ b/0003-close-tls-by-default.patch @@ -0,0 +1,32 @@ +From 5869cb3c65b1cd39ce3dff6f0978088e9e35a261 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Tue, 27 Jun 2023 22:31:33 +0800 +Subject: [PATCH] close tls by default + +--- + Makefile | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 689db2b..90f0154 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,12 +2,11 @@ ifneq ($(KERNELRELEASE),) + include Kbuild + + else +-KERNELDIR := /lib/modules/$(shell rpm -aq kernel-devel | cut -d "-" -f 3,4)/build +-$(info KERNELDIR=$(KERNELDIR)) ++KERNELDIR := /lib/modules/$(shell uname -r)/build + + export CONFIG_HMDFS_FS := m +-export CONFIG_HMDFS_FS_ENCRYPTION := y +-export CONFIG_HMDFS_FS_PERMISSION := y ++export CONFIG_HMDFS_FS_ENCRYPTION := n ++export CONFIG_HMDFS_FS_PERMISSION := n + + all: + $(MAKE) -C $(KERNELDIR) M=$$PWD modules +-- +2.33.0 + diff --git a/hmdfs.spec b/hmdfs.spec index ddde46f..f228142 100644 --- a/hmdfs.spec +++ b/hmdfs.spec @@ -1,8 +1,8 @@ -%define hmdfs_dest_path /usr/lib/modules/%(rpm -aq kernel-devel | cut -d "-" -f 3,4)/hmdfs +%define hmdfs_dest_path /usr/lib/modules/%(uname -r)/hmdfs Name: hmdfs Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HMDFS is an overlay file system. License: Apache License 2.0 @@ -10,8 +10,9 @@ URL: https://gitee.com/openharmony/kernel_linux_5.10/tree/OpenHarmony Source0: https://gitee.com/src-openeuler/hmdfs/%{name}-%{version}.tar.gz Patch0: 0001-add-makefile-used-on-openeuler.patch Patch1: 0002-bugfix-null-pointer-in-memcpy.patch +Patch2: 0003-close-tls-by-default.patch -BuildRequires: gcc, make, kernel-devel +BuildRequires: gcc, make, kernel-devel, uname-build-checks %description HMDFS is an overlay file system. Relying on the underlying file system, under the premise of networking, file exchanges across devices can be realized. @@ -21,6 +22,7 @@ HMDFS is an overlay file system. Relying on the underlying file system, under th %setup -c %patch0 -p1 %patch1 -p1 +%patch2 -p1 # make. %build @@ -37,5 +39,7 @@ install -v %{name}.ko $RPM_BUILD_ROOT/%{hmdfs_dest_path}/ %changelog -* Thu Apr 27 2023 hepeng - 1.0.0-1 +* Tue Jun 27 2023 Peng He - 1.0.0-2 +- close tls by default. +* Thu Apr 27 2023 Peng He - 1.0.0-1 - Package init -- Gitee