[OE stablebranch] [BUG] /usr/include/scsi headers may be missing
Tom Rini
trini at kernel.crashing.org
Tue May 20 00:03:54 CEST 2008
Hello all,
First, I plan on doing a few of these, at least so if you'd prefer a
different subject or patches down differently or anything, please let me
know.
This bug filed into bugzilla and is bug 4280
(http://bugs.openembedded.net/show_bug.cgi?id=4280). This is a clone of
bug 4264 which has now been committed to .dev. In short, the kernel
guys have decreed (and as of 2.6.24 enforced by not exporting) that the
/usr/include/scsi headers should come from the libc package, not kernel.
The following patch (also attached to the bug) enforces this by taking
out the removal of the glibc version of these headers and adds a
mechanism to ensure that the versions of linux-libc-headers which do use
the headers_install mechanism but are older than 2.6.24 will not package
these up.
The reason we need this pushed into the stable branch is that it's quite
likely vendors basing off of .stable will bring in newer kernel headers
than what's in here as well as fixing the minor issue (it's just an
iconsistency as both have to be binary compatible) not spelled out in
the original, that in some cases we build things vs glibc scsi headers
but install kernel scsi headers.
---
packages/glibc/eglibc_svn.bb | 2 +-
packages/glibc/glibc-package.bbclass | 3 ---
packages/glibc/glibc_2.2.5.bb | 2 +-
packages/glibc/glibc_2.3.2+cvs20040726.bb | 2 +-
packages/glibc/glibc_2.3.2.bb | 2 +-
packages/glibc/glibc_2.3.3+cvs20041128.bb | 2 +-
packages/glibc/glibc_2.3.3+cvs20050221.bb | 2 +-
packages/glibc/glibc_2.3.3+cvs20050420.bb | 2 +-
packages/glibc/glibc_2.3.3.bb | 2 +-
packages/glibc/glibc_2.3.5+cvs20050627.bb | 2 +-
packages/glibc/glibc_2.4.bb | 2 +-
packages/glibc/glibc_2.5.bb | 2 +-
packages/glibc/glibc_2.6.1.bb | 2 +-
packages/glibc/glibc_2.7.bb | 2 +-
packages/glibc/glibc_cvs.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers.inc | 6 +++++-
packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb | 1 +
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb | 2 +-
packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb | 2 +-
25 files changed, 28 insertions(+), 26 deletions(-)
Index: stable/packages/glibc/eglibc_svn.bb
===================================================================
--- stable.orig/packages/glibc/eglibc_svn.bb
+++ stable/packages/glibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require glibc.inc
DEFAULT_PREFERENCE = "-1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
PV = "2.7+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
file://etc/ld.so.conf \
file://generate-supported.mk"
Index: stable/packages/glibc/glibc-package.bbclass
===================================================================
--- stable.orig/packages/glibc/glibc-package.bbclass
+++ stable/packages/glibc/glibc-package.bbclass
@@ -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"
Index: stable/packages/glibc/glibc_2.2.5.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.2.5.bb
+++ stable/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 = "r13"
+PR = "r14"
DEFAULT_PREFERENCE_sh3 = "-99"
Index: stable/packages/glibc/glibc_2.3.2+cvs20040726.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ stable/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 = "r23"
+PR = "r24"
GLIBC_ADDONS ?= "linuxthreads"
Index: stable/packages/glibc/glibc_2.3.2.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.2.bb
+++ stable/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
require glibc.inc
-PR = "r12"
+PR = "r13"
DEFAULT_PREFERENCE_sh3 = "-99"
Index: stable/packages/glibc/glibc_2.3.3+cvs20041128.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ stable/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 = "r8"
+PR = "r9"
GLIBC_ADDONS ?= "linuxthreads"
Index: stable/packages/glibc/glibc_2.3.3+cvs20050221.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ stable/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 = "r8"
+PR = "r9"
GLIBC_ADDONS ?= "linuxthreads"
Index: stable/packages/glibc/glibc_2.3.3+cvs20050420.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ stable/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 = "r6"
+PR = "r7"
GLIBC_ADDONS ?= "linuxthreads"
Index: stable/packages/glibc/glibc_2.3.3.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.3.bb
+++ stable/packages/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
require glibc.inc
-PR = "r9"
+PR = "r10"
DEFAULT_PREFERENCE_sh3 = "-99"
Index: stable/packages/glibc/glibc_2.3.5+cvs20050627.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ stable/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 = "r15"
+PR = "r16"
#Doesnt build for sh3
DEFAULT_PREFERENCE_sh3="-1"
Index: stable/packages/glibc/glibc_2.4.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.4.bb
+++ stable/packages/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
require glibc.inc
-PR = "r13"
+PR = "r14"
#add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
Index: stable/packages/glibc/glibc_2.5.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.5.bb
+++ stable/packages/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
require glibc.inc
-PR = "r9"
+PR = "r10"
ARM_INSTRUCTION_SET = "arm"
Index: stable/packages/glibc/glibc_2.6.1.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.6.1.bb
+++ stable/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
require glibc.inc
-PR = "r2"
+PR = "r3"
ARM_INSTRUCTION_SET = "arm"
Index: stable/packages/glibc/glibc_2.7.bb
===================================================================
--- stable.orig/packages/glibc/glibc_2.7.bb
+++ stable/packages/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
-PR = "r0"
+PR = "r1"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
Index: stable/packages/glibc/glibc_cvs.bb
===================================================================
--- stable.orig/packages/glibc/glibc_cvs.bb
+++ stable/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 = "r6"
+PR = "r7"
PV = "2.3.5+cvs${SRCDATE}"
GLIBC_ADDONS ?= "ports,linuxthreads"
Index: stable/packages/linux-libc-headers/linux-libc-headers.inc
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers.inc
+++ stable/packages/linux-libc-headers/linux-libc-headers.inc
@@ -2,4 +2,8 @@ DESCRIPTION = "Sanitized set of 2.6 kern
SECTION = "devel"
LICENSE = "GPL"
-DEPENDS = "cross-linkage"
\ No newline at end of file
+DEPENDS = "cross-linkage"
+
+do_install_append() {
+ rm -rf ${D}${includedir}/scsi
+}
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~m
# 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"
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
@@ -13,7 +13,7 @@ require linux-libc-headers.inc
# 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 \
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -2,6 +2,7 @@ require linux-libc-headers.inc
DEFAULT_PREFERENCE = "-1"
INHIBIT_DEFAULT_DEPS = "1"
+PR = "r1"
SRC_URI = " \
${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
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"
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
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"
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
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"
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
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"
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
@@ -1,7 +1,7 @@
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 = ""
Index: stable/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
===================================================================
--- stable.orig/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ stable/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~m
# 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 = ""
--
Tom Rini
More information about the Openembedded-stablebranch
mailing list