diff options
| author | Jybz <j.biernacki@free.fr> | 2020-08-30 00:37:37 +0200 |
|---|---|---|
| committer | Jybz <j.biernacki@free.fr> | 2020-08-30 00:37:37 +0200 |
| commit | 99f560857ff2a294ea47f74ce2337f027d2df312 (patch) | |
| tree | 7892776b413115c92951c4814bcfa88683b292f1 | |
| parent | cc0fd97a55489cebd8f2ae9d28816d758405e4d0 (diff) | |
| download | mageia4arm-99f560857ff2a294ea47f74ce2337f027d2df312.tar mageia4arm-99f560857ff2a294ea47f74ce2337f027d2df312.tar.gz mageia4arm-99f560857ff2a294ea47f74ce2337f027d2df312.tar.bz2 mageia4arm-99f560857ff2a294ea47f74ce2337f027d2df312.tar.xz mageia4arm-99f560857ff2a294ea47f74ce2337f027d2df312.zip | |
Add ignorearch instead of patching urpmi.addmedia. NEED urpm patch not upstream yet.
| -rwxr-xr-x | create_arm_image.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh index 5142231..b60d8a9 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -205,19 +205,11 @@ 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}" + /sbin/urpmi.addmedia --urpmi-root "${BUILD_PATH}" --ignorearch --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 + /sbin/urpmi.addmedia --urpmi-root "${BUILD_PATH}" --ignorearch --distrib --mirrorlist "http://mirrors.mageia.org/api/mageia.${MAGEIA_VERSION}.${ARM_VERSION}.list" fi err=${?} |