From c2a9ce5a680bf339ca183418e25eb6ed15c8751f Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 4 Mar 2013 10:05:27 +0100 Subject: [PATCH] meta-digi: Use a single Digi premirror. This commit adds a Digi premirror to the DEL distribution file. This premirror will be tried first. It default to build-linux.digi.conf but will be customized for the layer public release. This still allows for a project to be customizes with a SOURCE_MIRROR_URL which will be tried before the premirrors. Fixes https://jira.digi.com/browse/DEL-186 Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/layer.conf | 5 ----- .../amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb | 2 +- meta-digi-del/conf/distro/del.conf | 6 ++++++ meta-digi-del/conf/layer.conf | 4 ---- .../btfilter/btfilter_v3.4p1-b3.4.0.51.bb | 2 +- meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb | 8 ++------ 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf index 6c055ab74..0c70c9154 100644 --- a/meta-digi-arm/conf/layer.conf +++ b/meta-digi-arm/conf/layer.conf @@ -18,13 +18,8 @@ DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA" # This is Digi's Open Source license agreement. DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA" -DIGI_MIRROR ?= "http://www.digi.com/yocto/" -DIGI_LOG_MIRROR ?= "http://build-linux.digi.com/LxNETES-4/pooldir/" DIGI_LOG_GIT ?= "git://log-sln-git.digi.com/" DIGI_MTK_GIT ?= "git://git.digi.com/" -# PREMIRRORS and tried first and if not found, all MIRRORS next. -MIRRORS += "${DIGI_MIRROR} ${DIGI_LOG_MIRROR} \n" - # Accept FSL licenses ACCEPT_FSL_EULA = "1" diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb index fe10dbb67..26475a219 100644 --- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb +++ b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd7696 PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" -SRC_URI = "${DIGI_LOG_MIRROR}/amd-gpu-bin-mx51-${PV}.tar.gz" +SRC_URI = "${DIGI_MIRROR}/amd-gpu-bin-mx51-${PV}.tar.gz" SRC_URI[md5sum] = "15ede91135590fc12cc29a2bba46c12c" SRC_URI[sha256sum] = "c87ad4e0c721a10e9faed9e096e180b326162e342d41cdfc14c5119110bde0f4" diff --git a/meta-digi-del/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf index 9cb524ae4..b78088f89 100644 --- a/meta-digi-del/conf/distro/del.conf +++ b/meta-digi-del/conf/distro/del.conf @@ -60,7 +60,13 @@ QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64" # Some packages like gst-plugins-ugly need this LICENSE_FLAGS_WHITELIST += "commercial" +DIGI_MIRROR = "http://build-linux.digi.com/yocto/downloads" + PREMIRRORS ?= "\ +git://.*/.* ${DIGI_MIRROR} \n \ +ftp://.*/.* ${DIGI_MIRROR} \n \ +http://.*/.* ${DIGI_MIRROR} \n \ +https://.*/.* ${DIGI_MIRROR} \n \ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ diff --git a/meta-digi-del/conf/layer.conf b/meta-digi-del/conf/layer.conf index 7e535586c..2329c9f8a 100644 --- a/meta-digi-del/conf/layer.conf +++ b/meta-digi-del/conf/layer.conf @@ -9,10 +9,6 @@ BBFILE_COLLECTIONS += "del" BBFILE_PATTERN_del := "^${LAYERDIR}/" BBFILE_PRIORITY_del = "6" -DIGI_MIRROR ?= "http://www.digi.com/yocto/" -DIGI_LOG_MIRROR ?= "http://build-linux.digi.com/LxNETES-4/pooldir/" -MIRRORS += "${DIGI_MIRROR} ${DIGI_LOG_MIRROR} \n" - # This is Digi's General license agreement. DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA" diff --git a/meta-digi-del/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bb b/meta-digi-del/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bb index db4fc0db9..efb69e49c 100644 --- a/meta-digi-del/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bb +++ b/meta-digi-del/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bb @@ -7,7 +7,7 @@ DEPENDS = "bluez4 dbus libnl" PR = "r0" -SRC_URI = "${DIGI_LOG_MIRROR}${PN}-${PV}.tar.bz2 \ +SRC_URI = "${DIGI_MIRROR}${PN}-${PV}.tar.bz2 \ file://0001-enable-libnl3.patch \ file://0002-cross-compile.patch \ file://bluez-init" diff --git a/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb b/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb index 6948faff9..949b65f38 100644 --- a/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb +++ b/meta-digi-del/recipes-connectivity/crda/crda_1.1.3.bb @@ -18,12 +18,8 @@ RDEPENDS_${PN} = '${VIRTUAL-RUNTIME_device_manager}' FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -# Original SRC_URIs -# http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \ -# http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2011.04.28-regulatory.bin;name=reg - -SRC_URI = "${DIGI_LOG_MIRROR}${PN}-${PV}.tar.bz2;name=crda \ - ${DIGI_LOG_MIRROR}2011.04.28-regulatory.bin;name=reg \ +SRC_URI = "http://wireless.kernel.org/download/crda/${PN}-${PV}.tar.bz2;name=crda \ + http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2011.04.28-regulatory.bin;name=reg \ " SRC_URI += '${@base_conditional("VIRTUAL-RUNTIME_crda_use_gcrypt", "1" , "", "file://0001-Make-crypto-optional.patch", d)}'