diff --git a/0001-Enable-qtfs-compiled-on-machine-with-5.10-kernel.patch b/0001-Enable-qtfs-compiled-on-machine-with-5.10-kernel.patch deleted file mode 100644 index f177fd543725d7e24106dde360898fca721bc95f..0000000000000000000000000000000000000000 --- a/0001-Enable-qtfs-compiled-on-machine-with-5.10-kernel.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 61bf2162d88247a6595a17a00c66e31c3b8e19c0 Mon Sep 17 00:00:00 2001 -From: Yangxin -Date: Fri, 12 Aug 2022 16:31:02 +0800 -Subject: [PATCH] Enable qtfs compiled on machine with 5.10 kernel. - -Signed-off-by: Yangxin ---- - 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 - diff --git a/dpu-utilities-1.0.tar.gz b/dpu-utilities-1.0.tar.gz index 5faa9d5e4cddeb6200c57c858c58309f8c1b055d..98576346cd6e96901f3abd5006dd6e661b2e6786 100644 Binary files a/dpu-utilities-1.0.tar.gz and b/dpu-utilities-1.0.tar.gz differ diff --git a/dpu-utilities.spec b/dpu-utilities.spec index 2488b66534d6dd994f5378eacbfe84bcbca6f27c..d76921fc5e6f1918a8144a9971ebf00937127f99 100644 --- a/dpu-utilities.spec +++ b/dpu-utilities.spec @@ -11,13 +11,18 @@ Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} %define kernel_version %(ls /lib/modules/ | grep 5.10 -m1) BuildRequires: kernel-devel, gcc, make -Patch0: 0001-Enable-qtfs-compiled-on-machine-with-5.10-kernel.patch %description 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 %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_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/ +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 /lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/qtfs.ko /lib/modules/%{kernel_version}/kernel/drivers/dpu-utilities/qtfs_server.ko %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 '//a\dpuos 1 rpm-dir euler_base' /opt/imageTailor/repos/RepositoryRule.conf + %changelog * Fri Aug 12 2022 yangxin <245051644@qq.com> 1.0-1 - First Spec Version Include qtfs shared filesystem Driver Code