diff options
-rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
-rw-r--r-- | glibc/glibc-initial_2.3.2.oe | 2 | ||||
-rw-r--r-- | glibc/glibc-initial_cvs.oe | 2 | ||||
-rw-r--r-- | glibc/glibc-intermediate_cvs.oe | 2 | ||||
-rw-r--r-- | glibc/glibc_2.3.2.oe | 3 | ||||
-rw-r--r-- | glibc/glibc_cvs.oe | 3 | ||||
-rw-r--r-- | patcher/patcher-native.oe | 1 | ||||
-rw-r--r-- | patcher/patcher.oe | 1 | ||||
-rw-r--r-- | uclibc/uclibc-initial_0.9.26.oe | 2 | ||||
-rw-r--r-- | uclibc/uclibc_0.9.26.oe | 3 |
10 files changed, 13 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 261f13f8db..4fd72560f2 100644 --- 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 ad040c0701..361d93ff41 100644 --- 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 25d1f82d58..00f6a9b19a 100644 --- 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 1250bce73f..f35d819298 100644 --- 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 a44f897e0c..9678a185eb 100644 --- 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 04000db628..f6bd42006d 100644 --- 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 3218204427..91bf4cee2f 100644 --- 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 10b394d20e..7bd88be3ac 100644 --- 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 7b66a8d4b5..abc03831bd 100644 --- 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 b6a90f9b54..973c8eba1f 100644 --- 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 |