uek-rpm: Add --no-run-if-empty option to xargs for a remove command

This change is already present in LUCI, make this change to UEK8 as
well. This is useful when you really don't have any of the modules.list,
let us say in future we are adding some new flavour like embedded for
UEK8 and it doesn't have modules-extra package which is when we don't
have modules-extra.list file to remove, in those cases it is useful to
use --no-run-if-empty option to avoid running into a failure.

Orabug: 37453041

Signed-off-by: Harshit Mogalapalli <[email protected]>
Reviewed-by: Jack Vogel <[email protected]>

Author: harshimogalapalli

uek-rpm/ol10/kernel-uek.spec

@@ -1346,8 +1346,8 @@ BuildKernel() {
     cp -r lib/modules/$KernelVer/* restore/.
 
     # don't include anything going into kernel%{?variant}-modules-(extra|deprecated) in the file lists
-    grep '^/lib/modules' ${modlistVariant}-modules-extra.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-deprecated.list | sed -e 's/^\///'  %{?unzipsed} | xargs rm
+    grep '^/lib/modules' ${modlistVariant}-modules-extra.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-deprecated.list | sed -e 's/^\///'  %{?unzipsed} | xargs --no-run-if-empty rm
 
     # Run depmod on the resulting module tree and make sure it isn't broken
     depmod -b . -aeF ./System.map $KernelVer &> depmod.out
@@ -1362,10 +1362,10 @@ BuildKernel() {
     remove_depmod_files
 
     # don't include anything going into kernel%{?variant}-modules-(desktop|usb|wireless|netfilter) in the file lists
-    grep '^/lib/modules' ${modlistVariant}-modules-desktop.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-extra-netfilter.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-usb.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-wireless.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
+    grep '^/lib/modules' ${modlistVariant}-modules-desktop.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-extra-netfilter.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-usb.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-wireless.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
     depmod -b . -aeF ./System.map $KernelVer &> depmod.out
     # Run depmod on the resulting module tree and make sure it isn't broken
     if [ -s depmod.out ]; then
@@ -1378,7 +1378,7 @@ BuildKernel() {
 
     remove_depmod_files
 
-    grep '^/lib/modules' ${modlistVariant}-modules.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
+    grep '^/lib/modules' ${modlistVariant}-modules.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
 
     # Run depmod on the resulting module tree and make sure it isn't broken
     depmod -b . -aeF ./System.map $KernelVer &> depmod.out

uek-rpm/ol9/kernel-uek.spec

@@ -1356,8 +1356,8 @@ BuildKernel() {
     cp -r lib/modules/$KernelVer/* restore/.
 
     # don't include anything going into kernel%{?variant}-modules-(extra|deprecated) in the file lists
-    grep '^/lib/modules' ${modlistVariant}-modules-extra.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-deprecated.list | sed -e 's/^\///'  %{?unzipsed} | xargs rm
+    grep '^/lib/modules' ${modlistVariant}-modules-extra.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-deprecated.list | sed -e 's/^\///'  %{?unzipsed} | xargs --no-run-if-empty rm
 
     # Run depmod on the resulting module tree and make sure it isn't broken
     depmod -b . -aeF ./System.map $KernelVer &> depmod.out
@@ -1372,10 +1372,10 @@ BuildKernel() {
     remove_depmod_files
 
     # don't include anything going into kernel%{?variant}-modules-(desktop|usb|wireless|netfilter) in the file lists
-    grep '^/lib/modules' ${modlistVariant}-modules-desktop.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-extra-netfilter.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-usb.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
-    grep '^/lib/modules' ${modlistVariant}-modules-wireless.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
+    grep '^/lib/modules' ${modlistVariant}-modules-desktop.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-extra-netfilter.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-usb.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
+    grep '^/lib/modules' ${modlistVariant}-modules-wireless.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
     depmod -b . -aeF ./System.map $KernelVer &> depmod.out
     # Run depmod on the resulting module tree and make sure it isn't broken
     if [ -s depmod.out ]; then
@@ -1388,7 +1388,7 @@ BuildKernel() {
 
     remove_depmod_files
 
-    grep '^/lib/modules' ${modlistVariant}-modules.list | sed -e 's/^\///' %{?unzipsed} | xargs rm
+    grep '^/lib/modules' ${modlistVariant}-modules.list | sed -e 's/^\///' %{?unzipsed} | xargs --no-run-if-empty rm
 
     # Run depmod on the resulting module tree and make sure it isn't broken
     depmod -b . -aeF ./System.map $KernelVer &> depmod.out