Merge openembedded@openembedded.bkbits.net:packages

into linux.local:/home/kergoth/code/packages

2004/05/14 17:50:22-05:00 (none)!kergoth
Merge kergoth@siasl.dyndns.org:code/packages
into odin.(none):/home/kergoth/code/packages

2004/05/14 16:32:02-05:00 (none)!kergoth
Adapt packages to make use of INHERIT_DEFAULT_DEPS.

BKrev: 40a55006XrXQTwGXgFD4W0J0dJRwkw

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 261f13f..4fd7256 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -15,6 +15,7 @@ kergoth@direwolf.itg.ti.com
 kergoth@direwolf.ppp.ti.com
 kergoth@linux.local
 kergoth@nexus.(none)
+kergoth@odin.(none)
 kergoth@zelda.tuxnami.org
 mallum@shuttle.(none)
 mickey@allanon.vanille.de

diff --git a/glibc/glibc-initial_2.3.2.oe b/glibc/glibc-initial_2.3.2.oe
index ad040c0..361d93f 100644 (file)
--- a/glibc/glibc-initial_2.3.2.oe
+++ b/glibc/glibc-initial_2.3.2.oe
@@ -1,6 +1,6 @@
 include glibc_${PV}.oe
 
-DEPENDS = ""
+DEPENDS = "patcher-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-${PV}"
 S = "${WORKDIR}/glibc-${PV}"

diff --git a/glibc/glibc-initial_cvs.oe b/glibc/glibc-initial_cvs.oe
index 25d1f82..00f6a9b 100644 (file)
--- a/glibc/glibc-initial_cvs.oe
+++ b/glibc/glibc-initial_cvs.oe
@@ -1,6 +1,6 @@
 include glibc_${PV}.oe
 
-DEPENDS = ""
+DEPENDS = "patcher-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
 

diff --git a/glibc/glibc-intermediate_cvs.oe b/glibc/glibc-intermediate_cvs.oe
index 1250bce..f35d819 100644 (file)
--- a/glibc/glibc-intermediate_cvs.oe
+++ b/glibc/glibc-intermediate_cvs.oe
@@ -6,6 +6,6 @@ do_install () {
 
 PACKAGES = ""
 PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "patcher-native virtual/${TARGET_PREFIX}gcc-initial"
 GLIBC_ADDONS = "linuxthreads"
 GLIBC_EXTRA_OECONF = ""

diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index a44f897..9678a18 100644 (file)
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -23,7 +23,8 @@ python __anonymous () {
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "glibc glibc-dev glibc-doc glibc-i18n glibc-locale"
 
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "patcher-native virtual/${TARGET_PREFIX}gcc-initial"
+INHIBIT_DEFAULT_DEPS = "1"
 
 FILES_glibc_append = " ${datadir}/zoneinfo"
 FILES_glibc-dev_append = " ${libdir}/*.o"

diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index 04000db..f6bd420 100644 (file)
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -30,7 +30,8 @@ PACKAGES = "glibc glibc-dev glibc-doc glibc-i18n glibc-locale"
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
-DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']}"
+DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']}"
+INHIBIT_DEFAULT_DEPS = "1"
 
 FILES_glibc_append = " ${datadir}/zoneinfo"
 FILES_glibc-dev_append = " ${libdir}/*.o"

diff --git a/patcher/patcher-native.oe b/patcher/patcher-native.oe
index 3218204..91bf4ce 100644 (file)
--- a/patcher/patcher-native.oe
+++ b/patcher/patcher-native.oe
@@ -1,6 +1,7 @@
 include patcher.oe
 inherit native
 DEPENDS = ""
+INHIBIT_DEFAULT_DEPS = "1"
 
 do_stage() {
        install -m 0755 ${DL_DIR}/patcher ${STAGING_BINDIR}/

diff --git a/patcher/patcher.oe b/patcher/patcher.oe
index 10b394d..7bd88be 100644 (file)
--- a/patcher/patcher.oe
+++ b/patcher/patcher.oe
@@ -4,6 +4,7 @@ DEPENDS = ""
 SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "http://www.holgerschurig.de/files/linux/patcher"
 

diff --git a/uclibc/uclibc-initial_0.9.26.oe b/uclibc/uclibc-initial_0.9.26.oe
index 7b66a8d..abc0383 100644 (file)
--- a/uclibc/uclibc-initial_0.9.26.oe
+++ b/uclibc/uclibc-initial_0.9.26.oe
@@ -2,7 +2,7 @@ include uclibc_${PV}.oe
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
 
-DEPENDS = ""
+DEPENDS = "patcher-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 

diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index b6a90f9..973c8eb 100644 (file)
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -35,8 +35,9 @@ python __anonymous () {
 }
 
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}binutils \
+DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
           virtual/${TARGET_PREFIX}gcc-initial"
+INHIBIT_DEFAULT_DEPS = "1"
 
 #
 # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to