[oe-commits] org.oe.dev glibc/linux-libc-headers: make sure that scsi headers are available when needed. Fixes 4262.

TomRini commit oe at amethyst.openembedded.net
Mon May 19 18:03:39 UTC 2008


glibc/linux-libc-headers: make sure that scsi headers are available when needed.  Fixes 4262.
* commit by Laibsch

Author: TomRini
Branch: org.openembedded.dev
Revision: 54f92ebb261ee619bb7206811608fa3cf0d5de26
ViewMTN: http://monotone.openembedded.org/revision/info/54f92ebb261ee619bb7206811608fa3cf0d5de26
Files:
1
packages/glibc/eglibc_svn.bb
packages/glibc/glibc-package.bbclass
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.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
packages/linux-libc-headers/linux-libc-headers.inc
packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
Diffs:

#
# mt diff -r4b2e5f44e10900a502ea3952af7e1b6969306984 -r54f92ebb261ee619bb7206811608fa3cf0d5de26
#
#
#
# patch "packages/glibc/eglibc_svn.bb"
#  from [c35e8bfcdde601cae0e1daac27f6eadc06d385d8]
#    to [693cfbc95cb7166e12ced9da2affddab022ac474]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [ad5d2085797fa01b1f94d1ff231db24757badb90]
#    to [2d2b8c3ea8f41c3fc6f5410c830c9e148ffbeaf6]
# 
# patch "packages/glibc/glibc_2.2.5.bb"
#  from [34af38798fe6eb076ee1e44612cfb2e740abf174]
#    to [d3eb7489c6594b3f99cf2bc22dcb08f3ebea954d]
# 
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
#  from [808ed86ced75140a1d3fc3218b2496f9cc4bf940]
#    to [2796a2ca3f43cc68cb8dcab23c538f9d43671bfc]
# 
# patch "packages/glibc/glibc_2.3.2.bb"
#  from [c9271dd5bdf2fac00df5b90d4757176c5c7bb687]
#    to [6ce928a3a50aaa74484d58ca109097ecf56dfdf6]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
#  from [de5dc3446aa94c3abfdc1f8edff39f19084142f7]
#    to [c52302457e46cbf50f3c743a36911af5c5ef5249]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6]
#    to [6fcb1be9e4e8d1a32a5f67f6c5d828934cc23bfa]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
#  from [07a49aaf94192d47ee2118328e09b13cf4c5aaa4]
#    to [f54bdcea04b98f19a0b0200969fc2346af827228]
# 
# patch "packages/glibc/glibc_2.3.3.bb"
#  from [94f418faf76e360cb344f13e886941c63faeaa1c]
#    to [a2b16ae14389f9b1f928da2651ce17295e946eb8]
# 
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
#  from [002681533641cc0727653c163caa2b89d9554585]
#    to [e767bb71ec3f4cc71f4c93cb973621df12f2ffa8]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [90ea22d4701fd976ebf54996b4f0f0f75fcbcb15]
#    to [06f918a79a1f11a8d3ec0bb653752c014ce40e33]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [0df9115aff23a65cf60cf318463e92afd9d4187d]
#    to [1e078613766f3dd8fc94f432bbe07c4e1f98e30f]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [e44cc81d7e42c307cc3fa0165f19e3c2cc9c1dab]
#    to [157296447567bd27d06a4c65f01df9c9fb53b53d]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [0315c4d0fd55ed746d83fbe2e7512ce1dfe46237]
#    to [bb41e38f1cd4eaa7b688b45abf9e3ba2b19d20c8]
# 
# patch "packages/glibc/glibc_cvs.bb"
#  from [65a43c48f600ea8305861ae2b9bc8d44ac65c8d6]
#    to [7822dea5a8190361462aaba3a5865a3f1a2c82d8]
# 
# patch "packages/linux-libc-headers/linux-libc-headers.inc"
#  from [5c98632deeb64f09ea2d1409ebfb3f52ca329b18]
#    to [b2222f137bb2d5024aabdd95ce25e23a2b0a3b9e]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb"
#  from [a5e398b392cdf0d939f0d10034f2326567a46b5e]
#    to [47e4d26b80d13dc103a57f5405e696bb41fa6482]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb"
#  from [2462887f80c983eb3bd388e906229f9f58bc4aa7]
#    to [15a52afa51d66a10c4e65d8999d9150de03b1ecf]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
#  from [1591ece17925b88a031d76f96246cad5d04d3424]
#    to [315b1efcbbcf61f41ebcdd6ff78e4306089eb779]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.20.bb"
#  from [6ca5c4e670c6594210c1afa9d59511ab71dfe839]
#    to [bb5b016cdec7c47517f8a6f0f98bb2bf0553754b]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.22.bb"
#  from [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
#    to [9848fbf9a03e26527896520878c57d533bebc91e]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
#  from [9848fbf9a03e26527896520878c57d533bebc91e]
#    to [bf5ec08a1649841a180f829658d288158043c847]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb"
#  from [a9f62e9c41ff4489d4ce3097d04a44c1688c5b9b]
#    to [db7b347929e1b904058af4bf2e4aaa167edee882]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb"
#  from [d9d8521f857b98b5a68a1e131113d039c7fe6854]
#    to [007380e042cf950f943a583ba518965455d16b39]
#
============================================================
--- packages/glibc/eglibc_svn.bb	c35e8bfcdde601cae0e1daac27f6eadc06d385d8
+++ packages/glibc/eglibc_svn.bb	693cfbc95cb7166e12ced9da2affddab022ac474
@@ -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 = "r5"
+PR = "r6"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-cargs6.patch;patch=1 \
            file://eglibc-svn-arm-check_pf.patch;patch=1 \
============================================================
--- packages/glibc/glibc-package.bbclass	ad5d2085797fa01b1f94d1ff231db24757badb90
+++ packages/glibc/glibc-package.bbclass	2d2b8c3ea8f41c3fc6f5410c830c9e148ffbeaf6
@@ -79,9 +79,6 @@ do_install() {
 		mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
 	done
 	rm -f ${D}/etc/rpc
-	rm -f ${D}${includedir}/scsi/sg.h
-	rm -f ${D}${includedir}/scsi/scsi_ioctl.h
-	rm -f ${D}${includedir}/scsi/scsi.h
 }
 
 TMP_LOCALE="/tmp/locale${libdir}/locale"
============================================================
--- packages/glibc/glibc_2.2.5.bb	34af38798fe6eb076ee1e44612cfb2e740abf174
+++ packages/glibc/glibc_2.2.5.bb	d3eb7489c6594b3f99cf2bc22dcb08f3ebea954d
@@ -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 = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb	808ed86ced75140a1d3fc3218b2496f9cc4bf940
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb	2796a2ca3f43cc68cb8dcab23c538f9d43671bfc
@@ -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 = "r24"
+PR = "r25"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.2.bb	c9271dd5bdf2fac00df5b90d4757176c5c7bb687
+++ packages/glibc/glibc_2.3.2.bb	6ce928a3a50aaa74484d58ca109097ecf56dfdf6
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb	de5dc3446aa94c3abfdc1f8edff39f19084142f7
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb	c52302457e46cbf50f3c743a36911af5c5ef5249
@@ -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 = "r9"
+PR = "r10"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb	cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb	6fcb1be9e4e8d1a32a5f67f6c5d828934cc23bfa
@@ -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 = "r9"
+PR = "r10"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb	07a49aaf94192d47ee2118328e09b13cf4c5aaa4
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb	f54bdcea04b98f19a0b0200969fc2346af827228
@@ -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 = "r7"
+PR = "r8"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3.bb	94f418faf76e360cb344f13e886941c63faeaa1c
+++ packages/glibc/glibc_2.3.3.bb	a2b16ae14389f9b1f928da2651ce17295e946eb8
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r10"
+PR = "r11"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb	002681533641cc0727653c163caa2b89d9554585
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb	e767bb71ec3f4cc71f4c93cb973621df12f2ffa8
@@ -2,7 +2,7 @@ SRCDATE = "20050627"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r16"
+PR = "r17"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"
============================================================
--- packages/glibc/glibc_2.4.bb	90ea22d4701fd976ebf54996b4f0f0f75fcbcb15
+++ packages/glibc/glibc_2.4.bb	06f918a79a1f11a8d3ec0bb653752c014ce40e33
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r14"
+PR = "r15"
 
 #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	0df9115aff23a65cf60cf318463e92afd9d4187d
+++ packages/glibc/glibc_2.5.bb	1e078613766f3dd8fc94f432bbe07c4e1f98e30f
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r11"
+PR = "r12"
 
 ARM_INSTRUCTION_SET = "arm"
 
============================================================
--- packages/glibc/glibc_2.6.1.bb	e44cc81d7e42c307cc3fa0165f19e3c2cc9c1dab
+++ packages/glibc/glibc_2.6.1.bb	157296447567bd27d06a4c65f01df9c9fb53b53d
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r4"
+PR = "r5"
 
 ARM_INSTRUCTION_SET = "arm"
 
============================================================
--- packages/glibc/glibc_2.7.bb	0315c4d0fd55ed746d83fbe2e7512ce1dfe46237
+++ packages/glibc/glibc_2.7.bb	bb41e38f1cd4eaa7b688b45abf9e3ba2b19d20c8
@@ -5,7 +5,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
-PR = "r1"
+PR = "r2"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_cvs.bb	65a43c48f600ea8305861ae2b9bc8d44ac65c8d6
+++ packages/glibc/glibc_cvs.bb	7822dea5a8190361462aaba3a5865a3f1a2c82d8
@@ -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 = "r7"
+PR = "r8"
 PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
============================================================
--- packages/linux-libc-headers/linux-libc-headers.inc	5c98632deeb64f09ea2d1409ebfb3f52ca329b18
+++ packages/linux-libc-headers/linux-libc-headers.inc	b2222f137bb2d5024aabdd95ce25e23a2b0a3b9e
@@ -4,3 +4,7 @@ RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${
 
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
+
+do_install_append() {
+	rm -rf ${D}${includedir}/scsi
+}
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb	a5e398b392cdf0d939f0d10034f2326567a46b5e
+++ packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb	47e4d26b80d13dc103a57f5405e696bb41fa6482
@@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 #   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
 	file://keyboard.patch;patch=1"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb	2462887f80c983eb3bd388e906229f9f58bc4aa7
+++ packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb	15a52afa51d66a10c4e65d8999d9150de03b1ecf
@@ -13,7 +13,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 # since we assume GPL for linux i think we can also assume it here
 DEFAULT_PREFERENCE = "-1"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-${PV}.tar.bz2 \
 	file://keyboard.patch;patch=1 \
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.18.bb	1591ece17925b88a031d76f96246cad5d04d3424
+++ packages/linux-libc-headers/linux-libc-headers_2.6.18.bb	315b1efcbbcf61f41ebcdd6ff78e4306089eb779
@@ -2,7 +2,7 @@ DEPENDS += "unifdef-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.20.bb	6ca5c4e670c6594210c1afa9d59511ab71dfe839
+++ packages/linux-libc-headers/linux-libc-headers_2.6.20.bb	bb5b016cdec7c47517f8a6f0f98bb2bf0553754b
@@ -2,7 +2,7 @@ DEPENDS += "unifdef-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.22.bb	66ed33603a1599bc68718e22c5e7fe1d81ff51cc
+++ packages/linux-libc-headers/linux-libc-headers_2.6.22.bb	9848fbf9a03e26527896520878c57d533bebc91e
@@ -2,7 +2,7 @@ DEPENDS += "unifdef-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.23.bb	9848fbf9a03e26527896520878c57d533bebc91e
+++ packages/linux-libc-headers/linux-libc-headers_2.6.23.bb	bf5ec08a1649841a180f829658d288158043c847
@@ -2,7 +2,7 @@ DEPENDS += "unifdef-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb	a9f62e9c41ff4489d4ce3097d04a44c1688c5b9b
+++ packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb	db7b347929e1b904058af4bf2e4aaa167edee882
@@ -1,7 +1,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r3"
+PR = "r4"
 # NOTE: no need to package these headers, since the c library includes them.
 PACKAGES = ""
 
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb	d9d8521f857b98b5a68a1e131113d039c7fe6854
+++ packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb	007380e042cf950f943a583ba518965455d16b39
@@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 #   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r7"
+PR = "r8"
 
 # NOTE: no need to package these headers, since the c library includes them.
 PACKAGES = ""






More information about the Openembedded-commits mailing list