glibc-intermediate: Factor common code into a .inc file

6 files changed, 17 insertions, 56 deletions

diff --git a/packages/glibc/glibc-intermediate.inc b/packages/glibc/glibc-intermediate.inc
new file mode 100644
index 0000000000..c226d8658d
--- /dev/null
+++ b/packages/glibc/glibc-intermediate.inc
@@ -0,0 +1,12 @@
+SECTION = "libs"
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+
+do_install () {
+	:
+}
+
+GLIBC_ADDONS = "nptl,ports"
+GLIBC_EXTRA_OECONF = ""
diff --git a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb
index 243c3d1cd9..aba5ac0451 100644
--- a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb
@@ -1,15 +1,6 @@
-SECTION = "libs"
 require glibc_${PV}.bb
+require glibc-intermediate.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
-do_install () {
-	:
-}
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS += " virtual/${TARGET_PREFIX}gcc-initial "
 GLIBC_ADDONS = "linuxthreads"
-GLIBC_EXTRA_OECONF = ""
diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb
index e6aad1cc63..e1c7ecfbd1 100644
--- a/packages/glibc/glibc-intermediate_2.4.bb
+++ b/packages/glibc/glibc-intermediate_2.4.bb
@@ -1,14 +1,4 @@
 require glibc_${PV}.bb
+require glibc-intermediate.inc
 
 DEFAULT_PREFERENCE = "-1"
-
-do_install () {
-	:
-}
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-GLIBC_ADDONS = "nptl,ports"
-GLIBC_EXTRA_OECONF = ""
diff --git a/packages/glibc/glibc-intermediate_2.5.bb b/packages/glibc/glibc-intermediate_2.5.bb
index 7610f560a7..661a69a10d 100644
--- a/packages/glibc/glibc-intermediate_2.5.bb
+++ b/packages/glibc/glibc-intermediate_2.5.bb
@@ -1,19 +1,7 @@
 require glibc_${PV}.bb
-
-do_install () {
-	:
-}
+require glibc-intermediate.inc
 
 # gcc uses -Werror which break on a "you have no thumb interwork" _warning_
 do_configure_prepend() {
 	sed -i s:-Werror:: ${S}/configure
 }
-
-
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-GLIBC_ADDONS = "nptl,ports"
-GLIBC_EXTRA_OECONF = ""
diff --git a/packages/glibc/glibc-intermediate_2.6.1.bb b/packages/glibc/glibc-intermediate_2.6.1.bb
index 7610f560a7..05d6250783 100644
--- a/packages/glibc/glibc-intermediate_2.6.1.bb
+++ b/packages/glibc/glibc-intermediate_2.6.1.bb
@@ -1,19 +1,8 @@
 require glibc_${PV}.bb
-
-do_install () {
-	:
-}
+require glibc-intermediate.inc
 
 # gcc uses -Werror which break on a "you have no thumb interwork" _warning_
 do_configure_prepend() {
 	sed -i s:-Werror:: ${S}/configure
 }
 
-
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-GLIBC_ADDONS = "nptl,ports"
-GLIBC_EXTRA_OECONF = ""
diff --git a/packages/glibc/glibc-intermediate_cvs.bb b/packages/glibc/glibc-intermediate_cvs.bb
index 4f9d58ee6f..ad615a1911 100644
--- a/packages/glibc/glibc-intermediate_cvs.bb
+++ b/packages/glibc/glibc-intermediate_cvs.bb
@@ -1,15 +1,6 @@
-SECTION = "libs"
 require glibc_${PV}.bb
+require glibc-intermediate.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-do_install () {
-	:
-}
-
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
 GLIBC_ADDONS = "linuxthreads"
-GLIBC_EXTRA_OECONF = ""