diff --git a/package/arm/mlx/mlnx_ofed_integrate_into_kernel.sh b/package/arm/mlx/mlnx_ofed_integrate_into_kernel.sh
index 38ea57edf..77b120bf0 100755
--- a/package/arm/mlx/mlnx_ofed_integrate_into_kernel.sh
+++ b/package/arm/mlx/mlnx_ofed_integrate_into_kernel.sh
@@ -214,7 +214,7 @@ distro=$(cat distro 2>/dev/null)
 echo "This MLNX_OFED was built for distro: ${distro}"
 
 #this will cause error in chroot environment
-#echo "%__os_install_post %{nil}" >> ~/.rpmmacros
+echo "%__os_install_post %{nil}" >> ~/.rpmmacros
 echo "%__brp_mangle_shebangs %{nil}" >> ~/.rpmmacros
 
 # compile modules against target kernel
diff --git a/package/default/mlx/mlnx_ofed_integrate_into_kernel.sh b/package/default/mlx/mlnx_ofed_integrate_into_kernel.sh
index 374ab4a10..196d4cc56 100755
--- a/package/default/mlx/mlnx_ofed_integrate_into_kernel.sh
+++ b/package/default/mlx/mlnx_ofed_integrate_into_kernel.sh
@@ -192,12 +192,12 @@ function handle_rpms_all()
 	done
 }
 
-__cleanup()
-{
-	sed -i '/__os_install_post/d' ~/.rpmmacros
-	sed -i '/__brp_mangle_shebangs/d' ~/.rpmmacros
-}
-trap '__cleanup' INT TERM ERR EXIT
+#__cleanup()
+#{
+#	sed -i '/__os_install_post/d' ~/.rpmmacros
+#	sed -i '/__brp_mangle_shebangs/d' ~/.rpmmacros
+#}
+#trap '__cleanup' INT TERM ERR EXIT
 
 ############################################################################
 
@@ -215,7 +215,7 @@ echo "This MLNX_OFED was built for distro: ${distro}"
 
 #this will cause error in chroot environment
 #echo "%__os_install_post %{nil}" >> ~/.rpmmacros
-echo "%__brp_mangle_shebangs %{nil}" >> ~/.rpmmacros
+#echo "%__brp_mangle_shebangs %{nil}" >> ~/.rpmmacros
 
 # compile modules against target kernel
 ./mlnxofedinstall \
@@ -228,8 +228,8 @@ echo "%__brp_mangle_shebangs %{nil}" >> ~/.rpmmacros
 	--skip-distro-check \
 	--skip-repo ${mlnxofedinstall_flags}
 
-sed -i '/__os_install_post/d' ~/.rpmmacros
-sed -i '/__brp_mangle_shebangs/d' ~/.rpmmacros
+#sed -i '/__os_install_post/d' ~/.rpmmacros
+#sed -i '/__brp_mangle_shebangs/d' ~/.rpmmacros
 
 # fix permissiosn
 chown -R ${USER} ${TMPD}