Djam/r11-builder-agent
1
0
Fork 0
mirror of https://tvoygit.ru/Djam/r11-builder-agent.git synced 2025-02-23 18:32:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix platform_name

Browse source
This commit is contained in:
Alexander Stefanov 2019-02-24 19:14:29 +03:00
parent 59f06afb29
commit a422a18c1a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build-rpm.sh
View file

@ -161,10 +161,10 @@ esac
if [ "$platform_arch" = 'aarch64' ]; then if [ "$platform_arch" = 'aarch64' ]; then
if [ $cpu != "aarch64" ] ; then if [ $cpu != "aarch64" ] ; then
# hack to copy qemu binary in non-existing path # hack to copy qemu binary in non-existing path
(while [ ! -e /var/lib/mock-urpm/openmandriva-$platform_arch/root/usr/bin/ ] (while [ ! -e /var/lib/mock-urpm/$platform_name-$platform_arch/root/usr/bin/ ]
do sleep 1; done do sleep 1; done
# rebuild docker builder with qemu packages # rebuild docker builder with qemu packages
sudo cp /usr/bin/qemu-static-aarch64 /var/lib/mock-urpm/openmandriva-$platform_arch/root/usr/bin/) & sudo cp /usr/bin/qemu-static-aarch64 /var/lib/mock-urpm/$platform_name-$platform_arch/root/usr/bin/) &
subshellpid=$! subshellpid=$!
fi fi
# remove me in future # remove me in future
@ -174,9 +174,9 @@ fi
if [ "$platform_arch" = 'armv7hl' ]; then if [ "$platform_arch" = 'armv7hl' ]; then
if [ $cpu != "arm" ] || [ $cpu != "aarch64" ] ; then if [ $cpu != "arm" ] || [ $cpu != "aarch64" ] ; then
# hack to copy qemu binary in non-existing path # hack to copy qemu binary in non-existing path
(while [ ! -e /var/lib/mock-urpm/openmandriva-$platform_arch/root/usr/bin/ ] (while [ ! -e /var/lib/mock-urpm/$platform_name-$platform_arch/root/usr/bin/ ]
do sleep 1; done do sleep 1; done
sudo cp /usr/bin/qemu-static-arm /var/lib/mock-urpm/openmandriva-$platform_arch/root/usr/bin/) & sudo cp /usr/bin/qemu-static-arm /var/lib/mock-urpm/$platform_name-$platform_arch/root/usr/bin/) &
subshellpid=$! subshellpid=$!
fi fi
# remove me in future # remove me in future
@ -375,11 +375,11 @@ echo '--> Done.'
echo "--> Grepping rpmlint logs from $OUTPUT_FOLDER/build.log to $OUTPUT_FOLDER/rpmlint.log" echo "--> Grepping rpmlint logs from $OUTPUT_FOLDER/build.log to $OUTPUT_FOLDER/rpmlint.log"
sed -n "/Executing \"\/usr\/bin\/rpmlint/,/packages and.*specfiles checked/p" $OUTPUT_FOLDER/build.log > $OUTPUT_FOLDER/rpmlint.log sed -n "/Executing \"\/usr\/bin\/rpmlint/,/packages and.*specfiles checked/p" $OUTPUT_FOLDER/build.log > $OUTPUT_FOLDER/rpmlint.log
echo '--> Create rpm -qa list' echo '--> Create rpm -qa list'
rpm --root=/var/lib/mock-urpm/openmandriva-$platform_arch/root/ -qa >> $OUTPUT_FOLDER/rpm-qa.log rpm --root=/var/lib/mock-urpm/$platform_name-$platform_arch/root/ -qa >> $OUTPUT_FOLDER/rpm-qa.log
# (tpg) Save build chroot # (tpg) Save build chroot
if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then
sudo tar --exclude=root/dev -zcvf "${OUTPUT_FOLDER}"/rpm-buildroot.tar.gz /var/lib/mock-urpm/openmandriva-$platform_arch/root/ sudo tar --exclude=root/dev -zcvf "${OUTPUT_FOLDER}"/rpm-buildroot.tar.gz /var/lib/mock-urpm/$platform_name-$platform_arch/root/
fi fi
# Test RPM files # Test RPM files