From c813d14c9ffb9c0672a28d68faf85bf3575e9a2f Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 27 Aug 2006 23:34:18 +0000
Subject: Change include x.inc -> require x.inc (sync with OE)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@666 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gcc/gcc-cross-initial_3.3.4.bb          | 2 +-
 meta/packages/gcc/gcc-cross-initial_3.4.3.bb          | 2 +-
 meta/packages/gcc/gcc-cross-initial_3.4.4.bb          | 2 +-
 meta/packages/gcc/gcc-cross-initial_4.0.2.bb          | 2 +-
 meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb | 2 +-
 meta/packages/gcc/gcc-cross_3.3.4.bb                  | 8 ++++----
 meta/packages/gcc/gcc-cross_3.4.3.bb                  | 8 ++++----
 meta/packages/gcc/gcc-cross_3.4.4.bb                  | 8 ++++----
 meta/packages/gcc/gcc-cross_4.0.2.bb                  | 8 ++++----
 meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb         | 8 ++++----
 meta/packages/gcc/gcc_3.4.3.bb                        | 4 ++--
 meta/packages/gcc/gcc_3.4.4.bb                        | 4 ++--
 meta/packages/gcc/gcc_4.0.2.bb                        | 4 ++--
 meta/packages/gcc/gcc_csl-arm-2005q3.bb               | 4 ++--
 14 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'meta/packages/gcc')

diff --git a/meta/packages/gcc/gcc-cross-initial_3.3.4.bb b/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
index e3b365da1..c650e4fe5 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_3.4.3.bb b/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
index 48c80864e..307c6f7d4 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_3.4.4.bb b/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
index 48c80864e..307c6f7d4 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_4.0.2.bb b/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
index 68dafe3f1..037f3032a 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 48c80864e..307c6f7d4 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/meta/packages/gcc/gcc-cross_3.3.4.bb b/meta/packages/gcc/gcc-cross_3.3.4.bb
index 597b47fba..f7a2cded5 100644
--- a/meta/packages/gcc/gcc-cross_3.3.4.bb
+++ b/meta/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,6 +1,6 @@
 SECTION = "devel"
-include gcc_${PV}.bb
-include gcc-paths-cross.inc
+require gcc_${PV}.bb
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
@@ -9,5 +9,5 @@ PR="r3"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-include gcc3-build-cross.inc
-include gcc-package-cross.inc
\ No newline at end of file
+require gcc3-build-cross.inc
+require gcc-package-cross.inc
\ No newline at end of file
diff --git a/meta/packages/gcc/gcc-cross_3.4.3.bb b/meta/packages/gcc/gcc-cross_3.4.3.bb
index a5d1bda17..b61223b39 100644
--- a/meta/packages/gcc/gcc-cross_3.4.3.bb
+++ b/meta/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_3.4.4.bb b/meta/packages/gcc/gcc-cross_3.4.4.bb
index d965e5b39..ef679365e 100644
--- a/meta/packages/gcc/gcc-cross_3.4.4.bb
+++ b/meta/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_4.0.2.bb b/meta/packages/gcc/gcc-cross_4.0.2.bb
index 6e299e829..d2dc24012 100644
--- a/meta/packages/gcc/gcc-cross_4.0.2.bb
+++ b/meta/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 93c58aca5..c61dc67bf 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,6 +1,6 @@
-include gcc_csl-arm-2005q3.bb
+require gcc_csl-arm-2005q3.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-cross-build.inc
+require gcc3-cross-build.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc_3.4.3.bb b/meta/packages/gcc/gcc_3.4.3.bb
index c92746be5..f1a154527 100644
--- a/meta/packages/gcc/gcc_3.4.3.bb
+++ b/meta/packages/gcc/gcc_3.4.3.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -24,4 +24,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1"
 
-include gcc3-build.inc
+require gcc3-build.inc
diff --git a/meta/packages/gcc/gcc_3.4.4.bb b/meta/packages/gcc/gcc_3.4.4.bb
index 5be603f2c..66bc4381d 100644
--- a/meta/packages/gcc/gcc_3.4.4.bb
+++ b/meta/packages/gcc/gcc_3.4.4.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -27,4 +27,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
 
-include gcc3-build.inc
+require gcc3-build.inc
diff --git a/meta/packages/gcc/gcc_4.0.2.bb b/meta/packages/gcc/gcc_4.0.2.bb
index f4eeb9bde..29f0b0f63 100644
--- a/meta/packages/gcc/gcc_4.0.2.bb
+++ b/meta/packages/gcc/gcc_4.0.2.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
@@ -25,4 +25,4 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
                    file://zecke-host-cpp-ac-hack.patch;patch=1 "
 
 
-include gcc4-build.inc
+require gcc4-build.inc
diff --git a/meta/packages/gcc/gcc_csl-arm-2005q3.bb b/meta/packages/gcc/gcc_csl-arm-2005q3.bb
index 62bacda14..aab182562 100644
--- a/meta/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
            file://gcc_optab_arm.patch;patch=1"
@@ -22,6 +22,6 @@ do_unpack2() {
 
 addtask unpack2 after do_unpack before do_patch
 
-include gcc3-build.inc
+require gcc3-build.inc
 
 S = "${WORKDIR}/gcc-2005q3"
-- 
cgit v1.2.3