[meta-freescale] [for-danny][PATCH v2] udev: Drop bbappend and mask out Meta-OpenEmbedded udev
Otavio Salvador
otavio at ossystems.com.br
Wed Feb 6 08:19:33 PST 2013
This allows use of meta-fsl-arm without meta-oe by default allowing
Yocto autobuilder to succeed in testing danny branch.
The cons of this change is that people using udev with feed will need
to unmask udev and add an udev bbappend in their internal layer to
restore upgrade path.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
Changes for v2:
- Remove dependency of meta-oe
README | 9 ---------
conf/layer.conf | 3 +++
conf/machine/include/fsl-default-versions.inc | 2 --
recipes-core/udev/udev_173.bbappend | 8 --------
4 files changed, 3 insertions(+), 19 deletions(-)
delete mode 100644 recipes-core/udev/udev_173.bbappend
diff --git a/README b/README
index 1987424..36b7d80 100644
--- a/README
+++ b/README
@@ -10,15 +10,6 @@ URI: git://git.openembedded.org/openembedded-core
branch: danny
revision: HEAD
-URI: git://git.openembedded.org/meta-openembedded
-layer: meta-oe
-branch: danny
-revision: HEAD
-
-To avoid the meta-oe dependency add to local.conf:
-
-BBMASK = "udev_.*\.bbappend$"
-
EULA
----
diff --git a/conf/layer.conf b/conf/layer.conf
index c4b9cd1..0f5b3f2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,6 +9,9 @@ BBFILE_COLLECTIONS += "fsl-arm"
BBFILE_PATTERN_fsl-arm := "^${LAYERDIR}/"
BBFILE_PRIORITY_fsl-arm = "5"
+# Mask out meta-oe newer udev
+BBMASK = "meta-oe/recipes-core/udev/udev_(173|175|182)\.bb$"
+
FSL_EULA_FILE = "${LAYERDIR}/EULA"
FSL_MIRROR ?= "http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/"
diff --git a/conf/machine/include/fsl-default-versions.inc b/conf/machine/include/fsl-default-versions.inc
index 5319f34..d2a4e93 100644
--- a/conf/machine/include/fsl-default-versions.inc
+++ b/conf/machine/include/fsl-default-versions.inc
@@ -1,3 +1 @@
# Freescale BSP default versions
-
-PREFERRED_VERSION_udev = "173"
diff --git a/recipes-core/udev/udev_173.bbappend b/recipes-core/udev/udev_173.bbappend
deleted file mode 100644
index 29b20bd..0000000
--- a/recipes-core/udev/udev_173.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-# Switch to git source
-# 173 tag
-SRCREV = "ad667dff51711fed763a23283d973486de3cd6b5"
-SRC_URI := "${@oe_filter_out('${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.bz2', '${SRC_URI}', d)}"
-SRC_URI_prepend = "git://git.kernel.org/pub/scm/linux/hotplug/udev.git;protocol=git "
-S = "${WORKDIR}/git"
--
1.8.1
More information about the meta-freescale
mailing list