Skip to contentSkip to conversation

meta-oe, meta-efl: Restore few MIRROR variables

PATCH In review Martin Jansa 2 participants 2 messages Nov 20, 2013 – Nov 21, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meta-oe, meta-efl: Restore few MIRROR variables

* these were correctly removed from oe-core in
commit 3b333896c71689c664475d53daed52404bf6b21b
Author: Phil Blundell <[email protected]>
Date: Thu Nov 14 18:15:46 2013 +0000

bitbake.conf: Remove obsolete/unused MIRROR cruft
but we still need them here, so add them to layer.conf

* FREESMARTPHONE_GIT is used by 4 recipes in meta-oe and a lot more in meta-fso (which depends on meta-oe) meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb:SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;branch=master" meta-oe/recipes-support/serial-utils/pty-forward-native.bb:SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia" meta-oe/recipes-support/serial-utils/serial-forward_git.bb:SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia" meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb:SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;branch=master"

* E_MIRROR/E_SVN are used in many recipes in meta-efl, even with upstream moveing to git, not all components are already in git and for distros with populated PREMIRROR these variables are still important to parse the recipes.

---
 meta-efl/conf/layer.conf | 3 +++
 meta-oe/conf/layer.conf  | 2 ++
 2 files changed, 5 insertions(+)
meta-efl/conf/layer.conf +3 -0
index 272fc04..fb9a7ce 100644
@@ -7,3 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "efl-layer"
 BBFILE_PATTERN_efl-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_efl-layer = "7"
+
+E_MIRROR = "http://download.enlightenment.org/releases"
+E_SVN = "svn://svn.enlightenment.org/svn/e"
meta-oe/conf/layer.conf +2 -0
index bd7eceb..393b4e6 100644
@@ -37,3 +37,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   usb-modeswitch-data->usb-modeswitch \
 "
+
+FREESMARTPHONE_GIT = "git://git.freesmartphone.org"
Signature · 1 line
1.8.4.3
Acked-by on v1 1/1
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Jansa schreef op 20-11-13 23:15:

Quoted 7 lines

* these were correctly removed from oe-core in commit 3b333896c71689c664475d53daed52404bf6b21b Author: Phil Blundell
<[email protected]> Date: Thu Nov 14 18:15:46 2013 +0000

bitbake.conf: Remove obsolete/unused MIRROR cruft but we still need them here, so add them to layer.conf

Quoted 10 lines

* FREESMARTPHONE_GIT is used by 4 recipes in meta-oe and a lot more in meta-fso (which depends on meta-oe) meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb:SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;branch=master" meta-oe/recipes-support/serial-utils/pty-forward-native.bb:SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia" meta-oe/recipes-support/serial-utils/serial-forward_git.bb:SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia" meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb:SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;branch=master"

Our CI loop at linaro caught that as well :)

Quoted 15 lines

* E_MIRROR/E_SVN are used in many recipes in meta-efl, even with upstream moveing to git, not all components are already in git and for distros with populated PREMIRROR these variables are still important to parse the recipes.

meta-efl/conf/layer.conf | 3 +++ meta-oe/conf/layer.conf | 2 ++ 2 files changed, 5 insertions(+)

meta-efl/conf/layer.conf index renamed from meta-efl/conf/layer.conf +0 -0

272fc04..fb9a7ce 100644 --- a/meta-efl/conf/layer.conf +++ b/meta-efl/conf/layer.conf @@ -7,3 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "efl-layer" BBFILE_PATTERN_efl-layer :=

Quoted 9 lines

"^${LAYERDIR}/" BBFILE_PRIORITY_efl-layer = "7" + +E_MIRROR = "http://download.enlightenment.org/releases" +E_SVN = "svn://svn.enlightenment.org/svn/e" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index bd7eceb..393b4e6 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -37,3 +37,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ usb-modeswitch-data->usb-modeswitch \ " + +FREESMARTPHONE_GIT = "git://git.freesmartphone.org"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSjcQ9MkyGM64RGpERAu33AJ40U+DxY/MdA6gnfziq19wdL+EJQgCffoFc ABj35a+jEvyH7I0JBCL0oEY=
=MRUa
-----END PGP SIGNATURE-----