diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-12-01 09:40:11 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-12-02 14:51:12 +0100 |
commit | bd51926f215d2c7408026b6bc074d2cc6a6aa85d (patch) | |
tree | 458c9ed967ff87524a75fd1f7e809d36690934f9 /conf | |
parent | 20b9a2052ec41118d3833ced95d758991c1eedf8 (diff) | |
download | openembedded-bd51926f215d2c7408026b6bc074d2cc6a6aa85d.tar.gz |
sane-srcrevs.inc: remove it from distro configs, and file itself
Acked-by: Klaus Kurzmann <mok@fluxnetz.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 1 | ||||
-rw-r--r-- | conf/distro/angstrom-2010.x.conf | 1 | ||||
-rw-r--r-- | conf/distro/chinook-compat.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 3 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 0 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc | 1 | ||||
-rw-r--r-- | conf/distro/jlime-2010.1.conf | 1 | ||||
-rw-r--r-- | conf/distro/kaeilos-2010.conf | 1 | ||||
-rw-r--r-- | conf/distro/kaeilos.conf | 1 | ||||
-rw-r--r-- | conf/distro/maemo5-compat.conf | 2 | ||||
-rw-r--r-- | conf/distro/mamona.conf | 2 | ||||
-rw-r--r-- | conf/distro/metano.conf | 1 | ||||
-rw-r--r-- | conf/distro/micro.conf | 1 | ||||
-rw-r--r-- | conf/distro/minimal.conf | 1 | ||||
-rw-r--r-- | conf/distro/openprotium.conf | 2 | ||||
-rw-r--r-- | conf/distro/shr.conf | 1 |
16 files changed, 0 insertions, 21 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 3fa8e3ed85..ec032760f7 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 5942dca0e9..f2b20f9bad 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 ca1e3cefbf..e9e2e1a953 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 6d3cec9712..75c31d1262 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 e69de29bb2..0000000000 --- a/conf/distro/include/sane-srcrevs.inc +++ /dev/null diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index eaa50bc4e5..c2a380dcd2 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 f01b949d90..28c1ddadcf 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 a9743dd6f9..857525414a 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 fdec1e9197..815d40f3da 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 b3e5da0c38..c1f0e4be5b 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 a9df496122..c834ca71bb 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -11,8 +11,6 @@ MAINTAINER = "Mamona Team <mamona-devel@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 d9fb1e9d59..7f82791edd 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 f3b984687c..102afa1dcc 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 5c7efbda45..5b92a3652b 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 749b832515..902890c88d 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 140a6d3c1b..02582313b3 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 |