Move the RRECOMMEND for libgcc from glibc to busybox.

Busybox/logger is the place where libgcc is really invoked.

diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb
index e51bb86da0eea2914da54291da2b4c8d4f3c102b..abc127ad93d8b3f1ef6755d6a24d1558d356e5df 100644 (file)
--- a/packages/busybox/busybox-static_1.2.1.bb
+++ b/packages/busybox/busybox-static_1.2.1.bb
@@ -1,5 +1,4 @@
 require busybox_${PV}.bb
-PR = "r2"
 
 S = "${WORKDIR}/busybox-1.2.1"
 

diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc
index 0fb3b5efff479f8d671b53d3f3aa2dd8f763b880..04decf61b2f48df11d531ec13eca52a2278730a9 100644 (file)
--- a/packages/busybox/busybox.inc
+++ b/packages/busybox/busybox.inc
@@ -32,7 +32,10 @@ SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
-
+# We need this RRECOMMENDS because libc dlopens libgcc
+# and shlib mechanism can not detect it because its not
+# listed in the NEEDED field.
+RDEPENDS += "libgcc"
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 

diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.1.bb
index 945ab7f718de7da884855be9f0f4dd4744fdcfe4..e170a20512b0deb03a32f3e5bede63114fd574a3 100644 (file)
--- a/packages/busybox/busybox_1.11.1.bb
+++ b/packages/busybox/busybox_1.11.1.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \

diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 1accc790a2e7b1c950515f22f4e69ff4af06d439..4ef3cfeb66f59d9f3ca5244f1ca3019f6364ad9f 100644 (file)
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r16"
+PR = "r17"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
           file://df_rootfs.patch;patch=1 \

diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index fbf05e71825631fb9e92d40e941bee89a732d236..14379a5da67379fedb8746b9ef2204c891a8a0b5 100644 (file)
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 1eea1edea2a1e69d95d551391fcb1d55711adf83..31a2f1abe7641e4f3659007f5ce31684010f70e8 100644 (file)
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 75f59cf9325cf0c7f66e5ab79880643ff3ff7a87..53304df387588d126a737ed082edcbf4c8e5bdeb 100644 (file)
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \

diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index 5da0f03093d67efdbc5011661b07fb17af9fbfea..c9440e7b4f5fb0eeac637e82a60f2ea765e5d0e6 100644 (file)
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \

diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb
index a680efc84347a2ed848cef2a8886f9f1e7f47335..cbcce6c675f567eb694532d9bb424aa90c73850a 100644 (file)
--- a/packages/busybox/slingbox_1.3.1.bb
+++ b/packages/busybox/slingbox_1.3.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \

diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc
index 0309a7f1b2624c0cdcf00d93a7d4e66551e2eb87..e91ddaa40ec21534efd4611451cb27474e1a1399 100644 (file)
--- a/packages/eglibc/eglibc.inc
+++ b/packages/eglibc/eglibc.inc
@@ -11,10 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
-# We need this RRECOMMENDS because libc dlopens libgcc
-# and shlib mechanism can not detect it because its not
-# listed in the NEEDED field.
-RRECOMMENDS += "libgcc"
 inherit autotools
 
 LEAD_SONAME = "libc.so"

diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index 3e8a5a0c9924ce50d440a02b48991c698e14a371..a47e94ef2e8a4fae848ce51f1cf624ca723b64dd 100644 (file)
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r8"
+PR = "r9"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \

diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc
index e8d56c2a42410fa90fb6fd82bc020485095bbbd2..8f9b34b252fb3d90082f3b0a30bf4f7be8251812 100644 (file)
--- a/packages/glibc/glibc.inc
+++ b/packages/glibc/glibc.inc
@@ -7,8 +7,6 @@ LICENSE = "LGPL"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #this leads to circular deps, so lets not add it yet
 #RDEPENDS_ldd += " bash"
-# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
-RRECOMMENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
 

diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 2d37d5cf7fc3c1662607f54d5c86bf95c46177ee..3e57d857ae74394cab722e17f123f13cea014adb 100644 (file)
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r17"
+PR = "r18"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 

diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 7bb7cf5e434b04859901a7181b0c3862fd76da84..c53c2dd62000c1367c7a7379b760cd25da866711 100644 (file)
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r28"
+PR = "r29"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 22fa33ec44bebb17da71bfb6c4a359c4deb07530..05b46ba2e944ce9c14b19c83d932a3d7771dec11 100644 (file)
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r17"
+PR = "r18"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 

diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 89dd366c865443bf0a8b1e2ec4b74f4348e97986..a2492f68019ef7520c1e30fa2cecd94792625d81 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r13"
+PR = "r14"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 3d21504842346acf40b20b89b264e0174eaf2800..16525029dab76f8ad70237c308066dd43756d6d4 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r13"
+PR = "r14"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index fdb9ad15199c324df065f8caf3113517b9b0f394..bd394921b9a026bc18fbb8efb531f3732fd5cb84 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r12"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 1b527fbc10bf638f0c4b420a8d434ec5d901d678..2908baf4cba397a8965a55f8b895dad44805f8f6 100644 (file)
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 

diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index e00836b7bef7081e7ffe2fba4e0aa6bc28c72af6..54a1654404a3b2e585f994f9eace9e3540c42f56 100644 (file)
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r20"
+PR = "r21"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"

diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb
index 31a06de9cd53fbe22e2b3d897f279147fd2d5141..edf15cab61af857afb3d17dda30473caddf18ee5 100644 (file)
--- a/packages/glibc/glibc_2.3.6.bb
+++ b/packages/glibc/glibc_2.3.6.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r2"
+PR = "r3"
 
 #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
 

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 62a4e36768e03c9bbb67d3c754571e30105d915e..17cebf8921dd4eac2f812902f09dae1d447e7a47 100644 (file)
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r18"
+PR = "r19"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'

diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index c58561a67912a9fa9bf6541a8826328f62aa1937..701556d35a67f4ead0a9f38f46a1aab24d49c3ba 100644 (file)
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r15"
+PR = "r16"
 
 ARM_INSTRUCTION_SET = "arm"
 

diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 8d38c4890dde450d1b297bfe966c1d95528472b0..60eb071032fba3a2a658e091da6d75f62875113d 100644 (file)
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r9"
+PR = "r10"
 
 ARM_INSTRUCTION_SET = "arm"
 

diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb
index 8c8220302426eae5feee7126dd7c2d9449b2ce4c..0e5a96234b5949c5a38e106d00327f2458229950 100644 (file)
--- a/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
-PR = "r5"
+PR = "r6"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"

diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 14de0300cf459842e480727f3096c950e5f3603c..186c7d6be7051181d8ef823e66a95ded094795c9 100644 (file)
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-PR = "r10"
+PR = "r11"
 PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"