[oe] [PATCH 2/2] sane-srcrevs.inc: remove it from distro configs, and file itself
Martin Jansa
martin.jansa at gmail.com
Wed Dec 1 11:55:40 UTC 2010
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
conf/distro/angstrom-2008.1.conf | 1 -
conf/distro/angstrom-2010.x.conf | 1 -
conf/distro/chinook-compat.conf | 2 --
conf/distro/include/preferred-shr-versions.inc | 3 ---
conf/distro/include/slugos.inc | 1 -
conf/distro/jlime-2010.1.conf | 1 -
conf/distro/kaeilos-2010.conf | 1 -
conf/distro/kaeilos.conf | 1 -
conf/distro/maemo5-compat.conf | 2 --
conf/distro/mamona.conf | 2 --
conf/distro/metano.conf | 1 -
conf/distro/micro.conf | 1 -
conf/distro/minimal.conf | 1 -
conf/distro/openprotium.conf | 2 --
conf/distro/shr.conf | 1 -
15 files changed, 0 insertions(+), 21 deletions(-)
delete mode 100644 conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 3fa8e3e..ec03276 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -20,7 +20,6 @@ DISTRO_PR = ".6"
OLDEST_KERNEL ?= "2.6.16"
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2008-preferred-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 5942dca..f2b20f9 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -25,7 +25,6 @@ DISTRO_PR = ".9"
OLDEST_KERNEL ?= "2.6.16"
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2010-preferred-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index ca1e3ce..e9e2e1a 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -84,8 +84,6 @@ PREFERRED_VERSION_libtool-native = "1.5.10"
PREFERRED_VERSION_libtool-cross = "1.5.10"
PREFERRED_VERSION_libtool = "1.5.6"
-require conf/distro/include/sane-srcrevs.inc
-
PREFERRED_VERSION_fontconfig = "2.4.1"
PREFERRED_VERSION_freetype = "2.2.1"
PREFERRED_VERSION_freetype-native = "2.2.1"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 6d3cec9..75c31d1 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -20,9 +20,6 @@ LINUX_LIBC_HEADERS_VERSION ?= "2.6.32"
PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}"
PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}"
-# override EFL_SRCREV from sane-srcrevs.inc
-# EFL_SRCREV ?= "44424"
-
# specifically set an openssh version
# NOTE: whenever changing the version here make sure
# to check we won't loose our specific config !!!
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
deleted file mode 100644
index e69de29..0000000
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index eaa50bc..c2a380d 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -187,4 +187,3 @@ PREFERRED_PROVIDER_bluez-utils = "bluez4"
# Include any package preferred versions and srcrevs:
require conf/distro/include/preferred-slugos-versions.inc
-require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index f01b949..28c1dda 100644
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -88,7 +88,6 @@ require conf/distro/include/arm-thumb.inc
# Bootstrap & Init
#
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcrevs.inc
#
# Framebuffer & X
diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf
index a9743dd..8575254 100644
--- a/conf/distro/kaeilos-2010.conf
+++ b/conf/distro/kaeilos-2010.conf
@@ -18,7 +18,6 @@ DISTRO_PR = ".2"
OLDEST_KERNEL ?= "2.6.28"
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/kaeilos-2009-preferred-versions.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index fdec1e9..815d40f 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -18,7 +18,6 @@ DISTRO_PR = ".6"
OLDEST_KERNEL ?= "2.6.16"
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/kaeilos-2009-preferred-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
diff --git a/conf/distro/maemo5-compat.conf b/conf/distro/maemo5-compat.conf
index b3e5da0..c1f0e4b 100644
--- a/conf/distro/maemo5-compat.conf
+++ b/conf/distro/maemo5-compat.conf
@@ -81,8 +81,6 @@ PREFERRED_VERSION_libtool-native = "2.2.6b"
PREFERRED_VERSION_libtool-cross = "2.2.6b"
PREFERRED_VERSION_libtool = "2.2.6b"
-require conf/distro/include/sane-srcrevs.inc
-
PREFERRED_VERSION_fontconfig = "2.6.0"
PREFERRED_VERSION_freetype = "2.3.6"
PREFERRED_VERSION_freetype-native = "2.3.6"
diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
index a9df496..c834ca7 100644
--- a/conf/distro/mamona.conf
+++ b/conf/distro/mamona.conf
@@ -11,8 +11,6 @@ MAINTAINER = "Mamona Team <mamona-devel at garage.maemo.org>"
TARGET_VENDOR = "-mamona"
-require conf/distro/include/sane-srcrevs.inc
-
INHERIT += "angstrom-mirrors mamona-mirrors"
INHERIT += "package_deb debian"
INHERIT += "buildallpkgs"
diff --git a/conf/distro/metano.conf b/conf/distro/metano.conf
index d9fb1e9..7f82791 100644
--- a/conf/distro/metano.conf
+++ b/conf/distro/metano.conf
@@ -88,7 +88,6 @@ require conf/distro/include/arm-thumb.inc
#############################################################################
# PREFERRED VERSIONS
#############################################################################
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index f3b9846..102afa1 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -77,7 +77,6 @@ MACHINE_OVERRIDES += "${MACHINE_CLASS}"
#############################################################################
# PREFERRED VERSIONS
#############################################################################
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
#############################################################################
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 5c7efbd..5b92a36 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -96,7 +96,6 @@ require conf/distro/include/arm-thumb.inc
#############################################################################
# PREFERRED VERSIONS
#############################################################################
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index 749b832..902890c 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -75,5 +75,3 @@ PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_gconf ?= "gconf"
-
-require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 140a6d3..0258231 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -181,7 +181,6 @@ PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
#############################################################################
# PREFERRED VERSIONS
#############################################################################
-require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
--
1.7.3.2
More information about the Openembedded-devel
mailing list