!3 Add dpuos-imageTailor-config subpackage in spec file
From: @fary86 Reviewed-by: @minknov Signed-off-by: @minknov
This commit is contained in:
commit
ca3476f1ef
@ -1,36 +0,0 @@
|
|||||||
From 61bf2162d88247a6595a17a00c66e31c3b8e19c0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Yangxin <yangxin102@huawei.com>
|
|
||||||
Date: Fri, 12 Aug 2022 16:31:02 +0800
|
|
||||||
Subject: [PATCH] Enable qtfs compiled on machine with 5.10 kernel.
|
|
||||||
|
|
||||||
Signed-off-by: Yangxin <yangxin102@huawei.com>
|
|
||||||
---
|
|
||||||
qtfs/qtfs/Makefile | 2 +-
|
|
||||||
qtfs/qtfs_server/Makefile | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/qtfs/qtfs/Makefile b/qtfs/qtfs/Makefile
|
|
||||||
index f3c6014..fb6a51e 100644
|
|
||||||
--- a/qtfs/qtfs/Makefile
|
|
||||||
+++ b/qtfs/qtfs/Makefile
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
ccflags-y += -I$(src)/../ -I$(src) -DQTFS_CLIENT
|
|
||||||
-KBUILD=/lib/modules/$(shell uname -r)/build/
|
|
||||||
+KBUILD=/lib/modules/5.10*/build/
|
|
||||||
|
|
||||||
obj-m:=qtfs.o
|
|
||||||
qtfs-objs:=qtfs-mod.o sb.o syscall.o ../conn.o xattr.o proc.o ../misc.o miss.o
|
|
||||||
diff --git a/qtfs/qtfs_server/Makefile b/qtfs/qtfs_server/Makefile
|
|
||||||
index c1c5ef6..13f9c3e 100644
|
|
||||||
--- a/qtfs/qtfs_server/Makefile
|
|
||||||
+++ b/qtfs/qtfs_server/Makefile
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
ccflags-y += -I$(src)/../ -I$(src) -DQTFS_SERVER
|
|
||||||
-KBUILD=/lib/modules/$(shell uname -r)/build/
|
|
||||||
+KBUILD=/lib/modules/5.10*/build/
|
|
||||||
|
|
||||||
obj-m:=qtfs_server.o
|
|
||||||
qtfs_server-objs:=../conn.o fsops.o qtfs-server.o ../misc.o
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
Binary file not shown.
@ -11,13 +11,18 @@ Conflicts: %{name} < %{version}-%{release}
|
|||||||
Provides: %{name} = %{version}-%{release}
|
Provides: %{name} = %{version}-%{release}
|
||||||
%define kernel_version %(ls /lib/modules/ | grep 5.10 -m1)
|
%define kernel_version %(ls /lib/modules/ | grep 5.10 -m1)
|
||||||
BuildRequires: kernel-devel, gcc, make
|
BuildRequires: kernel-devel, gcc, make
|
||||||
Patch0: 0001-Enable-qtfs-compiled-on-machine-with-5.10-kernel.patch
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the software utilities on dpu.
|
This package contains the software utilities on dpu.
|
||||||
|
|
||||||
|
%package -n dpuos-imageTailor-config
|
||||||
|
Summary: dpuos imageTailor configrations
|
||||||
|
Requires: imageTailor
|
||||||
|
%description -n dpuos-imageTailor-config
|
||||||
|
imageTailor configration files for dpuos
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
@ -33,12 +38,24 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin/
|
|||||||
install %_builddir/%{name}-%{version}/qtfs/qtfs/qtfs.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/
|
install %_builddir/%{name}-%{version}/qtfs/qtfs/qtfs.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/
|
||||||
install %_builddir/%{name}-%{version}/qtfs/qtfs_server/qtfs_server.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/
|
install %_builddir/%{name}-%{version}/qtfs/qtfs_server/qtfs_server.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/
|
||||||
install %_builddir/%{name}-%{version}/qtfs/qtfs_server/engine $RPM_BUILD_ROOT/usr/bin/
|
install %_builddir/%{name}-%{version}/qtfs/qtfs_server/engine $RPM_BUILD_ROOT/usr/bin/
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/opt/imageTailor
|
||||||
|
cp -rf %_builddir/%{name}-%{version}/dpuos/image_tailor_cfg/custom $RPM_BUILD_ROOT/opt/imageTailor
|
||||||
|
cp -rf %_builddir/%{name}-%{version}/dpuos/image_tailor_cfg/kiwi $RPM_BUILD_ROOT/opt/imageTailor
|
||||||
|
|
||||||
%files
|
%files
|
||||||
/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/qtfs.ko
|
/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/qtfs.ko
|
||||||
/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/qtfs_server.ko
|
/lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/qtfs_server.ko
|
||||||
%attr(644, root, root) /usr/bin/engine
|
%attr(644, root, root) /usr/bin/engine
|
||||||
|
|
||||||
|
%files -n dpuos-imageTailor-config
|
||||||
|
/opt/imageTailor/custom/*
|
||||||
|
/opt/imageTailor/kiwi/*
|
||||||
|
|
||||||
|
%post -n dpuos-imageTailor-config
|
||||||
|
sed -i '/# product_name product_type/a\dpuos PANGEA EMBEDDED DISK ISO install_mode=install install_media=CD install_repo=CD selinux=0' /opt/imageTailor/kiwi/eulerkiwi/product.conf
|
||||||
|
sed -i '/# product cut_conf/a\dpuos kiwi/minios/cfg_dpuos yes' /opt/imageTailor/kiwi/eulerkiwi/minios.conf
|
||||||
|
sed -i '/<repository_rule>/a\dpuos 1 rpm-dir euler_base' /opt/imageTailor/repos/RepositoryRule.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Aug 12 2022 yangxin <245051644@qq.com> 1.0-1
|
* Fri Aug 12 2022 yangxin <245051644@qq.com> 1.0-1
|
||||||
- First Spec Version Include qtfs shared filesystem Driver Code
|
- First Spec Version Include qtfs shared filesystem Driver Code
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user