[oe-commits] org.oe.dev Move the RRECOMMEND for libgcc from glibc to busybox.

khem commit oe at amethyst.openembedded.net
Mon Sep 1 17:46:50 UTC 2008


Move the RRECOMMEND for libgcc from glibc to busybox.
Busybox/logger is the place where libgcc is really invoked.

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: e5938f5291bafdf3188ca7bfd40205414eeedf51
ViewMTN: http://monotone.openembedded.org/revision/info/e5938f5291bafdf3188ca7bfd40205414eeedf51
Files:
1
packages/busybox/busybox-static_1.2.1.bb
packages/busybox/busybox.inc
packages/busybox/busybox_1.11.1.bb
packages/busybox/busybox_1.2.1.bb
packages/busybox/busybox_1.2.2.bb
packages/busybox/busybox_1.3.1.bb
packages/busybox/busybox_1.7.2.bb
packages/busybox/busybox_1.9.2.bb
packages/busybox/slingbox_1.3.1.bb
packages/eglibc/eglibc.inc
packages/eglibc/eglibc_svn.bb
packages/glibc/glibc.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
Diffs:

#
# mt diff -r07e94cb324a339b56adbc89b90aec2f8007c999b -re5938f5291bafdf3188ca7bfd40205414eeedf51
#
#
#
# patch "packages/busybox/busybox-static_1.2.1.bb"
#  from [964734881c9c473a4514d47484b493b41dfd98c8]
#    to [c32c52c7c5bcb9d533c69cd98af6f1a918b8f81d]
# 
# patch "packages/busybox/busybox.inc"
#  from [e17706ff0f8357569cffa7704fe0c16990b62121]
#    to [99fe4e1235f3e8d6f57649a3b0c84a1fd120d775]
# 
# patch "packages/busybox/busybox_1.11.1.bb"
#  from [e55447ddfd5f9bcfbaa83e05a77b4079037f4649]
#    to [5f76d90d00b196b8def5acc8f2fafcd8bf4aab8d]
# 
# patch "packages/busybox/busybox_1.2.1.bb"
#  from [ed6ba775d0a82f9355ab82f0adfc2a97c840c9d7]
#    to [e948db887d57d3fe7353eb349f027afbea9bb373]
# 
# patch "packages/busybox/busybox_1.2.2.bb"
#  from [aabc3559e3dbf6202246fa76ec81735688a94a39]
#    to [fc9adccf12695a63a446e7d9856e79032bf81d56]
# 
# patch "packages/busybox/busybox_1.3.1.bb"
#  from [796375007e59d3356bee97868ee4a9484607272b]
#    to [5e499f83328550beac68463baaa84a6f1fabef58]
# 
# patch "packages/busybox/busybox_1.7.2.bb"
#  from [61b05f11ad827e5fe65f8b8140b7933dd41d915b]
#    to [61a905bc6c00b1a8212ad0482f9f929c7b664184]
# 
# patch "packages/busybox/busybox_1.9.2.bb"
#  from [a3a8f0f9c2f172464f5e3746ae507d0845fd473f]
#    to [d57bfa894a3e0caf97bd34c841fbe24ab3b167fd]
# 
# patch "packages/busybox/slingbox_1.3.1.bb"
#  from [f78be6906d6bb6a58789c13ef0e1593450784152]
#    to [7f1f87ae505480c02d92987b2ae97787be32db18]
# 
# patch "packages/eglibc/eglibc.inc"
#  from [08b9b1f3b71d0ea992ad8a5b349c51348b11f917]
#    to [b63e688acb3b4c647d0e8d4107b5534b4c325bb9]
# 
# patch "packages/eglibc/eglibc_svn.bb"
#  from [17bc96153f4c89522834fb62626b509064db5c9f]
#    to [175848d8e38b548d456707101f14158a0aef0c9f]
# 
# patch "packages/glibc/glibc.inc"
#  from [927e40aea451df01896552dc6d4aeafb51256604]
#    to [616d34fb71075168d558a2c23652b0847b62e379]
# 
# patch "packages/glibc/glibc_2.2.5.bb"
#  from [ba51bec78b675855eb7116970581ad0dfdcdb96d]
#    to [977307ad86a4d08e111fe20347de026e2ea0240f]
# 
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
#  from [a32da8f1be170e6519b62b6293fb148aeb82115a]
#    to [57c46b4138a561db517e401f964a383cb7264da6]
# 
# patch "packages/glibc/glibc_2.3.2.bb"
#  from [4f6b05a32c535fce34cdba7e735283f3df97cc25]
#    to [712d4e8a0c79d9f1d1046e8c2f1ac0443f3a1c01]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
#  from [df07870e2108f0e1f8052678a72335e56f8fd9aa]
#    to [2100cd4883f247821514a1a1bbc1097ddf5e56ac]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [a952adc9414b47b8206832f0d75d585c3e43fbe2]
#    to [580e95687b174a0e82711332575e2b3e75f11922]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
#  from [ba380ebe857f50552686909fcd13bbcef6f79539]
#    to [2d618404bbf66b0c82d29ba1068fc61e4dae8c3e]
# 
# patch "packages/glibc/glibc_2.3.3.bb"
#  from [8e9b799b018652d09ef1fc4f2b4b6be852cf6d27]
#    to [056f8f59b965ad32152cd543d185284dae6fc45e]
# 
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
#  from [08d38bef97b465bdbbd9988c3d75ff83cf44f0f2]
#    to [897918d6077f8b2a3aed92dbda0adbb3958d2a30]
# 
# patch "packages/glibc/glibc_2.3.6.bb"
#  from [fab77d02c64d34ef4ef3c628ae712ad0135f0e51]
#    to [b4091984d04a099c1dc19a92f029d78daa37824a]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [f68ade6f61a11d4095c2ba68793e93ff94386717]
#    to [ca1c1e1eb83235e2490efc63381e20537e48092b]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [f6b52e6b6d1513de5433a1a2c19635a6be187917]
#    to [28f2f9a3a57828b85bdecaf06acd329fee9c0b86]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [99f15a0f7f70175af2348206ce4d9af3cbd90e4c]
#    to [77cf632ae1fc1464c20204d36e370aa655ffa09a]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [1af6eb49cf20c7ff14c284e68d6b956d049ca292]
#    to [e91e43390c8241eaa333acc59cfd49359d7979fe]
# 
# patch "packages/glibc/glibc_cvs.bb"
#  from [0b88b80c48ad29d479a89c81290ce09e7a009b13]
#    to [102b99ab5ea2ce6a348a4ae833c77880609f5412]
#
============================================================
--- packages/busybox/busybox-static_1.2.1.bb	964734881c9c473a4514d47484b493b41dfd98c8
+++ packages/busybox/busybox-static_1.2.1.bb	c32c52c7c5bcb9d533c69cd98af6f1a918b8f81d
@@ -1,5 +1,4 @@ require busybox_${PV}.bb
 require busybox_${PV}.bb
-PR = "r2"
 
 S = "${WORKDIR}/busybox-1.2.1"
 
============================================================
--- packages/busybox/busybox.inc	e17706ff0f8357569cffa7704fe0c16990b62121
+++ packages/busybox/busybox.inc	99fe4e1235f3e8d6f57649a3b0c84a1fd120d775
@@ -32,7 +32,10 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
 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"
 
============================================================
--- packages/busybox/busybox_1.11.1.bb	e55447ddfd5f9bcfbaa83e05a77b4079037f4649
+++ packages/busybox/busybox_1.11.1.bb	5f76d90d00b196b8def5acc8f2fafcd8bf4aab8d
@@ -1,5 +1,5 @@ require busybox.inc
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
============================================================
--- packages/busybox/busybox_1.2.1.bb	ed6ba775d0a82f9355ab82f0adfc2a97c840c9d7
+++ packages/busybox/busybox_1.2.1.bb	e948db887d57d3fe7353eb349f027afbea9bb373
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r16"
+PR = "r17"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
============================================================
--- packages/busybox/busybox_1.2.2.bb	aabc3559e3dbf6202246fa76ec81735688a94a39
+++ packages/busybox/busybox_1.2.2.bb	fc9adccf12695a63a446e7d9856e79032bf81d56
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/busybox/busybox_1.3.1.bb	796375007e59d3356bee97868ee4a9484607272b
+++ packages/busybox/busybox_1.3.1.bb	5e499f83328550beac68463baaa84a6f1fabef58
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/busybox/busybox_1.7.2.bb	61b05f11ad827e5fe65f8b8140b7933dd41d915b
+++ packages/busybox/busybox_1.7.2.bb	61a905bc6c00b1a8212ad0482f9f929c7b664184
@@ -1,5 +1,5 @@ require busybox.inc
 require busybox.inc
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
============================================================
--- packages/busybox/busybox_1.9.2.bb	a3a8f0f9c2f172464f5e3746ae507d0845fd473f
+++ packages/busybox/busybox_1.9.2.bb	d57bfa894a3e0caf97bd34c841fbe24ab3b167fd
@@ -1,5 +1,5 @@ require busybox.inc
 require busybox.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
============================================================
--- packages/busybox/slingbox_1.3.1.bb	f78be6906d6bb6a58789c13ef0e1593450784152
+++ packages/busybox/slingbox_1.3.1.bb	7f1f87ae505480c02d92987b2ae97787be32db18
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
============================================================
--- packages/eglibc/eglibc.inc	08b9b1f3b71d0ea992ad8a5b349c51348b11f917
+++ packages/eglibc/eglibc.inc	b63e688acb3b4c647d0e8d4107b5534b4c325bb9
@@ -11,10 +11,6 @@ PROVIDES += "virtual/libintl virtual/lib
 #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"
============================================================
--- packages/eglibc/eglibc_svn.bb	17bc96153f4c89522834fb62626b509064db5c9f
+++ packages/eglibc/eglibc_svn.bb	175848d8e38b548d456707101f14158a0aef0c9f
@@ -3,7 +3,7 @@ PV = "2.8+svnr${SRCREV}"
 # 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 \
============================================================
--- packages/glibc/glibc.inc	927e40aea451df01896552dc6d4aeafb51256604
+++ packages/glibc/glibc.inc	616d34fb71075168d558a2c23652b0847b62e379
@@ -7,8 +7,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-i
 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"
 
============================================================
--- packages/glibc/glibc_2.2.5.bb	ba51bec78b675855eb7116970581ad0dfdcdb96d
+++ packages/glibc/glibc_2.2.5.bb	977307ad86a4d08e111fe20347de026e2ea0240f
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r17"
+PR = "r18"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb	a32da8f1be170e6519b62b6293fb148aeb82115a
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb	57c46b4138a561db517e401f964a383cb7264da6
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r28"
+PR = "r29"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.2.bb	4f6b05a32c535fce34cdba7e735283f3df97cc25
+++ packages/glibc/glibc_2.3.2.bb	712d4e8a0c79d9f1d1046e8c2f1ac0443f3a1c01
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r17"
+PR = "r18"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb	df07870e2108f0e1f8052678a72335e56f8fd9aa
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb	2100cd4883f247821514a1a1bbc1097ddf5e56ac
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r13"
+PR = "r14"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb	a952adc9414b47b8206832f0d75d585c3e43fbe2
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb	580e95687b174a0e82711332575e2b3e75f11922
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r13"
+PR = "r14"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb	ba380ebe857f50552686909fcd13bbcef6f79539
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb	2d618404bbf66b0c82d29ba1068fc61e4dae8c3e
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r12"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3.bb	8e9b799b018652d09ef1fc4f2b4b6be852cf6d27
+++ packages/glibc/glibc_2.3.3.bb	056f8f59b965ad32152cd543d185284dae6fc45e
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb	08d38bef97b465bdbbd9988c3d75ff83cf44f0f2
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb	897918d6077f8b2a3aed92dbda0adbb3958d2a30
@@ -2,7 +2,7 @@ SRCDATE = "20050627"
 
 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"
============================================================
--- packages/glibc/glibc_2.3.6.bb	fab77d02c64d34ef4ef3c628ae712ad0135f0e51
+++ packages/glibc/glibc_2.3.6.bb	b4091984d04a099c1dc19a92f029d78daa37824a
@@ -1,6 +1,6 @@ require glibc.inc
 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)}"
 
============================================================
--- packages/glibc/glibc_2.4.bb	f68ade6f61a11d4095c2ba68793e93ff94386717
+++ packages/glibc/glibc_2.4.bb	ca1c1e1eb83235e2490efc63381e20537e48092b
@@ -1,6 +1,6 @@ require glibc.inc
 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)'
============================================================
--- packages/glibc/glibc_2.5.bb	f6b52e6b6d1513de5433a1a2c19635a6be187917
+++ packages/glibc/glibc_2.5.bb	28f2f9a3a57828b85bdecaf06acd329fee9c0b86
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r15"
+PR = "r16"
 
 ARM_INSTRUCTION_SET = "arm"
 
============================================================
--- packages/glibc/glibc_2.6.1.bb	99f15a0f7f70175af2348206ce4d9af3cbd90e4c
+++ packages/glibc/glibc_2.6.1.bb	77cf632ae1fc1464c20204d36e370aa655ffa09a
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r9"
+PR = "r10"
 
 ARM_INSTRUCTION_SET = "arm"
 
============================================================
--- packages/glibc/glibc_2.7.bb	1af6eb49cf20c7ff14c284e68d6b956d049ca292
+++ packages/glibc/glibc_2.7.bb	e91e43390c8241eaa333acc59cfd49359d7979fe
@@ -5,7 +5,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 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}"
============================================================
--- packages/glibc/glibc_cvs.bb	0b88b80c48ad29d479a89c81290ce09e7a009b13
+++ packages/glibc/glibc_cvs.bb	102b99ab5ea2ce6a348a4ae833c77880609f5412
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 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"






More information about the Openembedded-commits mailing list