From 12efc6b44cce0db98ae07f5310861a19749a81f6 Mon Sep 17 00:00:00 2001 From: Jybz Date: Sat, 15 Aug 2020 23:10:11 +0200 Subject: Permits patching for bug with aarch64 on x86_64 build --- create_arm_image.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/create_arm_image.sh b/create_arm_image.sh index 0e037f8..01855e6 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -205,12 +205,20 @@ function addurpmimedia() /sbin/urpmi.removemedia --urpmi-root "${BUILD_PATH}" -a info "Adding media" + if [ -e "${CONFIG_PATH}/media.pm.patch" ]; then + warning "A patch for media.pm found, patching host system script /usr/share/perl5/vendor_perl/urpm/media.pm ..." + patch -i "${CONFIG_PATH}/media.pm.patch" /usr/share/perl5/vendor_perl/urpm/media.pm + fi if [ ! -z "${MIRROR}" ] ; then /sbin/urpmi.addmedia --urpmi-root "${BUILD_PATH}" --distrib "${MIRROR}" else info "MIRROR variable not set, using mirrorlist." /sbin/urpmi.addmedia --urpmi-root "${BUILD_PATH}" --distrib --mirrorlist "http://mirrors.mageia.org/api/mageia.${MAGEIA_VERSION}.${ARM_VERSION}.list" fi + if [ -e "${CONFIG_PATH}/media.pm.patch" ]; then + warning "Reverting patch on host system script..." + patch -R -i "${CONFIG_PATH}/media.pm.patch" /usr/share/perl5/vendor_perl/urpm/media.pm + fi err=${?} if [ ${err} -ne 0 ]; then -- cgit v1.2.1