From 04b3ed12456c9f604d4fd2cb04fcb0491ca77d13 Mon Sep 17 00:00:00 2001 From: Palash Vij Date: Wed, 25 Jun 2025 15:24:02 +0530 Subject: [PATCH 1/3] update issue with package dependency eval. --- packaging/aznfs/RPM/aznfs.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/aznfs/RPM/aznfs.spec b/packaging/aznfs/RPM/aznfs.spec index 445eb105e..3e0e475f2 100644 --- a/packaging/aznfs/RPM/aznfs.spec +++ b/packaging/aznfs/RPM/aznfs.spec @@ -11,6 +11,9 @@ Recommends: build-essential Requires: bash, PROCPS_PACKAGE_NAME, conntrack-tools, iptables, bind-utils, iproute, util-linux, nfs-utils, NETCAT_PACKAGE_NAME, newt, stunnel, net-tools %endif +# The included libraries should not be provided to the system as a whole +%global __provides_exclude_from ^/opt/microsoft/aznfs/libs/.*\\.so.*$ + %description Mount helper program for Azure Blob NFS mounts, providing a secure communication channel for Azure File NFS mounts, and supporting the Turbo NFS client From e6e5337234aba70730ee04caa0d10fc789a4b432 Mon Sep 17 00:00:00 2001 From: Palash Vij Date: Wed, 25 Jun 2025 16:14:06 +0530 Subject: [PATCH 2/3] update --- packaging/aznfs/RPM/aznfs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/aznfs/RPM/aznfs.spec b/packaging/aznfs/RPM/aznfs.spec index 3e0e475f2..9154df7d8 100644 --- a/packaging/aznfs/RPM/aznfs.spec +++ b/packaging/aznfs/RPM/aznfs.spec @@ -12,7 +12,8 @@ Requires: bash, PROCPS_PACKAGE_NAME, conntrack-tools, iptables, bind-utils, ipro %endif # The included libraries should not be provided to the system as a whole -%global __provides_exclude_from ^/opt/microsoft/aznfs/libs/.*\\.so.*$ +%global __provides_exclude_from ^/opt/microsoft/aznfs/libs/.*\.so.*$ +%global __requires_exclude_from ^/opt/microsoft/aznfs/libs/.*\.so.*$ %description Mount helper program for Azure Blob NFS mounts, providing a secure communication channel for Azure File NFS mounts, and supporting the Turbo NFS client From ed049db590f625d00fc46e38eac61155409ed63b Mon Sep 17 00:00:00 2001 From: Palash Vij Date: Thu, 26 Jun 2025 13:46:12 +0530 Subject: [PATCH 3/3] trying changes - nitin suggested --- packaging/aznfs/RPM/aznfs.spec | 56 ++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/packaging/aznfs/RPM/aznfs.spec b/packaging/aznfs/RPM/aznfs.spec index 9154df7d8..7860c71d8 100644 --- a/packaging/aznfs/RPM/aznfs.spec +++ b/packaging/aznfs/RPM/aznfs.spec @@ -15,6 +15,35 @@ Requires: bash, PROCPS_PACKAGE_NAME, conntrack-tools, iptables, bind-utils, ipro %global __provides_exclude_from ^/opt/microsoft/aznfs/libs/.*\.so.*$ %global __requires_exclude_from ^/opt/microsoft/aznfs/libs/.*\.so.*$ +%install +# Create necessary directories +mkdir -p %{buildroot}/opt/microsoft/aznfs/libs +mkdir -p %{buildroot}/opt/microsoft/aznfs +mkdir -p %{buildroot}/lib/systemd/system +mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}/usr/sbin + +# Install scripts and binaries +install -m 0755 opt/microsoft/aznfs/aznfs_install.sh %{buildroot}/opt/microsoft/aznfs/ +install -m 0755 opt/microsoft/aznfs/common.sh %{buildroot}/opt/microsoft/aznfs/ +install -m 0755 opt/microsoft/aznfs/mountscript.sh %{buildroot}/opt/microsoft/aznfs/ +install -m 0755 opt/microsoft/aznfs/nfsv3mountscript.sh %{buildroot}/opt/microsoft/aznfs/ +install -m 0755 opt/microsoft/aznfs/nfsv4mountscript.sh %{buildroot}/opt/microsoft/aznfs/ +install -m 0644 opt/microsoft/aznfs/sample-turbo-config.yaml %{buildroot}/opt/microsoft/aznfs/ + +# Install libraries +install -m 0644 opt/microsoft/aznfs/libs/*.so* %{buildroot}/opt/microsoft/aznfs/libs/ + +# Install systemd service files +install -m 0644 lib/systemd/system/aznfswatchdog.service %{buildroot}/lib/systemd/system/ +install -m 0644 lib/systemd/system/aznfswatchdogv4.service %{buildroot}/lib/systemd/system/ + +# Install executables +install -m 0755 sbin/aznfsclient %{buildroot}/sbin/ +install -m 0755 sbin/mount.aznfs %{buildroot}/sbin/ +install -m 0755 usr/sbin/aznfswatchdog %{buildroot}/usr/sbin/ +install -m 0755 usr/sbin/aznfswatchdogv4 %{buildroot}/usr/sbin/ + %description Mount helper program for Azure Blob NFS mounts, providing a secure communication channel for Azure File NFS mounts, and supporting the Turbo NFS client @@ -23,19 +52,34 @@ mkdir -p ${STG_DIR}/RPM_DIR/root/rpmbuild/SOURCES/ tar -xzvf ${STG_DIR}/AZNFS_PACKAGE_NAME-${RELEASE_NUMBER}-1.BUILD_ARCH.tar.gz -C ${STG_DIR}/RPM_DIR/ %files -/usr/sbin/aznfswatchdog -/usr/sbin/aznfswatchdogv4 -/sbin/mount.aznfs +%license LICENSE +%doc README.md + +# Scripts and config +/opt/microsoft/aznfs/aznfs_install.sh /opt/microsoft/aznfs/common.sh /opt/microsoft/aznfs/mountscript.sh /opt/microsoft/aznfs/nfsv3mountscript.sh /opt/microsoft/aznfs/nfsv4mountscript.sh -/opt/microsoft/aznfs/aznfs_install.sh +/opt/microsoft/aznfs/sample-turbo-config.yaml + +# Libraries +/opt/microsoft/aznfs/libs/ld-linux-x86-64.so.2 +/opt/microsoft/aznfs/libs/libc.so.6 +/opt/microsoft/aznfs/libs/libffi.so.8 +/opt/microsoft/aznfs/libs/libm.so.6 +/opt/microsoft/aznfs/libs/libp11-kit.so.0 +/opt/microsoft/aznfs/libs/libunistring.so.5 + +# Systemd service files /lib/systemd/system/aznfswatchdog.service /lib/systemd/system/aznfswatchdogv4.service -OPT_LIBS -/opt/microsoft/aznfs/sample-turbo-config.yaml + +# Executables /sbin/aznfsclient +/sbin/mount.aznfs +/usr/sbin/aznfswatchdog +/usr/sbin/aznfswatchdogv4 %pre init="$(ps -q 1 -o comm=)"