From 4ed9d0c80ac02b65a8cd73f1f28aeab3e1158e08 Mon Sep 17 00:00:00 2001 From: yaroslavborbat Date: Wed, 25 Dec 2024 15:49:47 +0300 Subject: [PATCH] test Signed-off-by: yaroslavborbat --- images/virt-launcher/werf.inc.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index f09c91ff8f..e508c71479 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -299,18 +299,12 @@ shell: rpm2cpio edk2-20241117-1.el9.src.rpm > edk2.cpio cpio -id < edk2.cpio - PATCH_COUNTER=1 find ./ -iname "*.patch" | while read p ; do - cp $p /home/builder/RPM/SOURCES/ - - PATCH_NAME=$(basename $p) - PATCH_NUM=$((PATCH_COUNTER + 1)) - - sed -i "/^Patch${PATCH_COUNTER}:/a Patch${PATCH_NUM}: ${PATCH_NAME}" /home/builder/RPM/SPECS/edk2.spec - sed -i "/^%patch${PATCH_COUNTER} -p1/a %patch${PATCH_NUM} -p1 || true" /home/builder/RPM/SPECS/edk2.spec - - PATCH_COUNTER=$((PATCH_COUNTER + 1)) + NAME=$(echo $p | sed 's!.patch!-rhel.patch) + cp $p /home/builder/RPM/SOURCES/$NAME done + sed -i "/^%patch1 -p1/a for p in %{_sourcedir}/*-rhel.patch; do patch -p1 --force --verbose < \$p ; done" /home/builder/RPM/SPECS/edk2.spec + # Build RPMs. edk2 package prints a huge log with about 770k lines, # we can keep only last 1k lines, it should be enough to get error