* [PATCH] Remove scsi headers from linux-libc-headers
@ 2010-04-27 20:49 Tom Rini
2010-04-27 21:04 ` [PATCHv2] " Tom Rini
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Tom Rini @ 2010-04-27 20:49 UTC (permalink / raw)
To: oe-devel
linux-libc-headers: Go and delete include/scsi when it exists
With 2.6.31, the kernel started exporting SCSI headers again. After
talking with Christoph Hellwig and James Bottemley (scsi maintainer),
these really should be removed. A patch to the kernel to do so will be
happening shortly, but for now fixup the broken recipes we have.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 2e4041f..c2cf5d4 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
@@ -44,6 +44,7 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+ rm -rf ${D}${exec_prefix}/include/scsi
}
SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index d82a749..b8b109e 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
@@ -44,6 +44,7 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+ rm -rf ${D}${exec_prefix}/include/scsi
}
SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"
--
Tom Rini <tom_rini@mentor.com>
Mentor Graphics Corporation
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCHv2] Remove scsi headers from linux-libc-headers
2010-04-27 20:49 [PATCH] Remove scsi headers from linux-libc-headers Tom Rini
@ 2010-04-27 21:04 ` Tom Rini
2010-04-28 16:01 ` [PATCHv3] Remove scsi/scsi.h header " Tom Rini
2010-04-27 21:22 ` [PATCH] Remove scsi headers " Khem Raj
2010-04-27 21:54 ` Koen Kooi
2 siblings, 1 reply; 9+ messages in thread
From: Tom Rini @ 2010-04-27 21:04 UTC (permalink / raw)
To: openembedded-devel
linux-libc-headers: Go and delete include/scsi when it exists
With 2.6.31, the kernel started exporting SCSI headers again and in
particular scsi/scsi.h. After talking with Christoph Hellwig and James
Bottemley (scsi maintainer), the really big deal is scsi.h (the others
may or may not be clean enough, but do not conflict.
Removing this from the kernel, rather than trying to clean it up to be
userland parseable is the right way to go.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
diff --git
a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
deleted file mode 100644
index b754879..0000000
---
a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from
-http://patchwork.kernel.org/patch/38102/
-It seems its still under discussion and it will involve glibc to get it
fixed correctly.
-for now OE uses scsi headers from kernel and not from glibc.
-
--Khem
-
-Index: linux-2.6.31/include/scsi/scsi.h
-===================================================================
---- linux-2.6.31.orig/include/scsi/scsi.h 2010-03-11 19:44:49.134590561
-0800
-+++ linux-2.6.31/include/scsi/scsi.h 2010-03-11 19:45:12.744466326
-0800
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
-
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
-- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-- u8 control;
-- u8 misc[5];
-- u8 additional_cdb_length; /* total cdb length - 8 */
-+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-+ __u8 control;
-+ __u8 misc[5];
-+ __u8 additional_cdb_length; /* total cdb length - 8 */
- __be16 service_action;
- /* service specific data follows */
- };
diff --git
a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
deleted file mode 100644
index b754879..0000000
---
a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from
-http://patchwork.kernel.org/patch/38102/
-It seems its still under discussion and it will involve glibc to get it
fixed correctly.
-for now OE uses scsi headers from kernel and not from glibc.
-
--Khem
-
-Index: linux-2.6.31/include/scsi/scsi.h
-===================================================================
---- linux-2.6.31.orig/include/scsi/scsi.h 2010-03-11 19:44:49.134590561
-0800
-+++ linux-2.6.31/include/scsi/scsi.h 2010-03-11 19:45:12.744466326
-0800
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
-
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
-- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-- u8 control;
-- u8 misc[5];
-- u8 additional_cdb_length; /* total cdb length - 8 */
-+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-+ __u8 control;
-+ __u8 misc[5];
-+ __u8 additional_cdb_length; /* total cdb length - 8 */
- __be16 service_action;
- /* service specific data follows */
- };
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 2e4041f..953b065 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -2,13 +2,12 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
SRC_URI =
"${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
- file://scsi-use-__u8.patch;patch=1 \
"
S = "${WORKDIR}/linux-${PV}"
@@ -44,6 +43,7 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
}
SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index d82a749..f1c371d 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -2,13 +2,12 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
SRC_URI =
"${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://export_sa_family_t.patch;patch=1 \
- file://scsi-use-__u8.patch;patch=1 \
"
S = "${WORKDIR}/linux-${PV}"
@@ -44,6 +43,7 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
}
SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"
--
Tom Rini <tom_rini@mentor.com>
Mentor Graphics Corporation
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] Remove scsi headers from linux-libc-headers
2010-04-27 20:49 [PATCH] Remove scsi headers from linux-libc-headers Tom Rini
2010-04-27 21:04 ` [PATCHv2] " Tom Rini
@ 2010-04-27 21:22 ` Khem Raj
2010-04-27 21:54 ` Koen Kooi
2 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2010-04-27 21:22 UTC (permalink / raw)
To: openembedded-devel
On Tue, Apr 27, 2010 at 1:49 PM, Tom Rini <tom_rini@mentor.com> wrote:
> linux-libc-headers: Go and delete include/scsi when it exists
>
> With 2.6.31, the kernel started exporting SCSI headers again. After
> talking with Christoph Hellwig and James Bottemley (scsi maintainer),
> these really should be removed. A patch to the kernel to do so will be
> happening shortly, but for now fixup the broken recipes we have.
yeah back then it was not clear what the final solution will be.
So its decided now that they will follow the approach
"Don't export and let glibc supply the headers"
In that case this interim fix can be removed.
Acked-by: Khem Raj <raj.khem@gmail.com>
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>
> diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> index 2e4041f..c2cf5d4 100644
> --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> @@ -2,7 +2,7 @@ require linux-libc-headers.inc
>
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS += "unifdef-native"
> -PR = "r3"
> +PR = "r4"
>
> DEFAULT_PREFERENCE = "-1"
>
> @@ -44,6 +44,7 @@ do_compile () {
> do_install() {
> set_arch
> oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
> $ARCH
> + rm -rf ${D}${exec_prefix}/include/scsi
> }
>
> SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
> diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> index d82a749..b8b109e 100644
> --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> @@ -2,7 +2,7 @@ require linux-libc-headers.inc
>
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS += "unifdef-native"
> -PR = "r3"
> +PR = "r4"
>
> DEFAULT_PREFERENCE = "-1"
>
> @@ -44,6 +44,7 @@ do_compile () {
> do_install() {
> set_arch
> oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
> $ARCH
> + rm -rf ${D}${exec_prefix}/include/scsi
> }
>
> SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"
>
>
>
> --
> Tom Rini <tom_rini@mentor.com>
> Mentor Graphics Corporation
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Remove scsi headers from linux-libc-headers
2010-04-27 20:49 [PATCH] Remove scsi headers from linux-libc-headers Tom Rini
2010-04-27 21:04 ` [PATCHv2] " Tom Rini
2010-04-27 21:22 ` [PATCH] Remove scsi headers " Khem Raj
@ 2010-04-27 21:54 ` Koen Kooi
2010-04-27 22:06 ` Tom Rini
2 siblings, 1 reply; 9+ messages in thread
From: Koen Kooi @ 2010-04-27 21:54 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I think this needs a PR bump in glibc, otherwise packaged-staging blows
away the headers without replacing them
On 27-04-10 22:49, Tom Rini wrote:
> linux-libc-headers: Go and delete include/scsi when it exists
>
> With 2.6.31, the kernel started exporting SCSI headers again. After
> talking with Christoph Hellwig and James Bottemley (scsi maintainer),
> these really should be removed. A patch to the kernel to do so will be
> happening shortly, but for now fixup the broken recipes we have.
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>
> diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> index 2e4041f..c2cf5d4 100644
> --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
> @@ -2,7 +2,7 @@ require linux-libc-headers.inc
>
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS += "unifdef-native"
> -PR = "r3"
> +PR = "r4"
>
> DEFAULT_PREFERENCE = "-1"
>
> @@ -44,6 +44,7 @@ do_compile () {
> do_install() {
> set_arch
> oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
> $ARCH
> + rm -rf ${D}${exec_prefix}/include/scsi
> }
>
> SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
> diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> index d82a749..b8b109e 100644
> --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
> @@ -2,7 +2,7 @@ require linux-libc-headers.inc
>
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS += "unifdef-native"
> -PR = "r3"
> +PR = "r4"
>
> DEFAULT_PREFERENCE = "-1"
>
> @@ -44,6 +44,7 @@ do_compile () {
> do_install() {
> set_arch
> oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
> $ARCH
> + rm -rf ${D}${exec_prefix}/include/scsi
> }
>
> SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"
>
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD4DBQFL110SMkyGM64RGpERAg2oAJjNEGuVsWkATuhTviqWhb2EiyA9AKCgkZsI
ruc1mGv+sj2uKD6VCc2hIA==
=DZcH
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Remove scsi headers from linux-libc-headers
2010-04-27 21:54 ` Koen Kooi
@ 2010-04-27 22:06 ` Tom Rini
2010-04-28 6:34 ` Koen Kooi
0 siblings, 1 reply; 9+ messages in thread
From: Tom Rini @ 2010-04-27 22:06 UTC (permalink / raw)
To: openembedded-devel
On Tue, 2010-04-27 at 23:54 +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I think this needs a PR bump in glibc, otherwise packaged-staging blows
> away the headers without replacing them
Are you sure? This isn't a legacy staging so I thought we didn't have
that issue now.
--
Tom Rini <tom_rini@mentor.com>
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Remove scsi headers from linux-libc-headers
2010-04-27 22:06 ` Tom Rini
@ 2010-04-28 6:34 ` Koen Kooi
0 siblings, 0 replies; 9+ messages in thread
From: Koen Kooi @ 2010-04-28 6:34 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 28-04-10 00:06, Tom Rini wrote:
> On Tue, 2010-04-27 at 23:54 +0200, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> I think this needs a PR bump in glibc, otherwise packaged-staging blows
>> away the headers without replacing them
>
> Are you sure? This isn't a legacy staging so I thought we didn't have
> that issue now.
Yes, this I why I changed the scsi header logic a few weeks back :)
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFL19cQMkyGM64RGpERAhnHAKCkPckGzW2S1YmF4C6G5uqzXgFqOgCgtklR
BTqnd5o9rUlB+azBSw3vL9g=
=ebaA
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCHv3] Remove scsi/scsi.h header from linux-libc-headers
2010-04-27 21:04 ` [PATCHv2] " Tom Rini
@ 2010-04-28 16:01 ` Tom Rini
2010-04-28 16:22 ` Koen Kooi
2010-05-03 19:23 ` Tom Rini
0 siblings, 2 replies; 9+ messages in thread
From: Tom Rini @ 2010-04-28 16:01 UTC (permalink / raw)
To: openembedded-devel
linux-libc-headers: Delete include/scsi/scsi.h
With 2.6.31, the kernel started exporting certain SCSI headers again and
in particular scsi/scsi.h. After talking with Christoph Hellwig and
James Bottemley (scsi maintainer) the kernel shouldn't export
scsi/scsi.h. Removing this from the kernel, rather than trying to clean
it up to be userland parseable is the right way to go.
We bump the libc INC_PRs to make sure the end user has a sane
<scsi/scsi.h> again.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc
index 5c06ae6..10a4a23 100644
--- a/recipes/eglibc/eglibc.inc
+++ b/recipes/eglibc/eglibc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"
SECTION = "libs"
PRIORITY = "required"
LICENSE = "LGPL"
-INC_PR = "r9"
+INC_PR = "r10"
# nptl needs unwind support in gcc, which can't be built without glibc.
DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
#this leads to circular deps, so lets not add it yet
diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc
index 6741b21..19b5524 100644
--- a/recipes/glibc/glibc.inc
+++ b/recipes/glibc/glibc.inc
@@ -11,7 +11,7 @@ PROVIDES = "virtual/libc
virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES += "virtual/libintl virtual/libiconv"
# INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc
-INC_PR = "r35"
+INC_PR = "r36"
inherit autotools
diff --git
a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
deleted file mode 100644
index b754879..0000000
---
a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from
-http://patchwork.kernel.org/patch/38102/
-It seems its still under discussion and it will involve glibc to get it
fixed correctly.
-for now OE uses scsi headers from kernel and not from glibc.
-
--Khem
-
-Index: linux-2.6.31/include/scsi/scsi.h
-===================================================================
---- linux-2.6.31.orig/include/scsi/scsi.h 2010-03-11 19:44:49.134590561
-0800
-+++ linux-2.6.31/include/scsi/scsi.h 2010-03-11 19:45:12.744466326
-0800
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
-
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
-- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-- u8 control;
-- u8 misc[5];
-- u8 additional_cdb_length; /* total cdb length - 8 */
-+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-+ __u8 control;
-+ __u8 misc[5];
-+ __u8 additional_cdb_length; /* total cdb length - 8 */
- __be16 service_action;
- /* service specific data follows */
- };
diff --git
a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
deleted file mode 100644
index b754879..0000000
---
a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from
-http://patchwork.kernel.org/patch/38102/
-It seems its still under discussion and it will involve glibc to get it
fixed correctly.
-for now OE uses scsi headers from kernel and not from glibc.
-
--Khem
-
-Index: linux-2.6.31/include/scsi/scsi.h
-===================================================================
---- linux-2.6.31.orig/include/scsi/scsi.h 2010-03-11 19:44:49.134590561
-0800
-+++ linux-2.6.31/include/scsi/scsi.h 2010-03-11 19:45:12.744466326
-0800
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
-
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
-- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-- u8 control;
-- u8 misc[5];
-- u8 additional_cdb_length; /* total cdb length - 8 */
-+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-+ __u8 control;
-+ __u8 misc[5];
-+ __u8 additional_cdb_length; /* total cdb length - 8 */
- __be16 service_action;
- /* service specific data follows */
- };
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 2e4041f..953b065 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -2,13 +2,12 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
SRC_URI =
"${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
- file://scsi-use-__u8.patch;patch=1 \
"
S = "${WORKDIR}/linux-${PV}"
@@ -44,6 +43,7 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
}
SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index d82a749..f1c371d 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -2,13 +2,12 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
SRC_URI =
"${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://export_sa_family_t.patch;patch=1 \
- file://scsi-use-__u8.patch;patch=1 \
"
S = "${WORKDIR}/linux-${PV}"
@@ -44,6 +43,7 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
}
SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"
diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index f39a5e8..4686d34 100644
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "C library for embedded systems"
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "required"
-INC_PR = "r33"
+INC_PR = "r34"
#
# For now, we will skip building of a gcc package if it is a uclibc one
# and our build is not a uclibc one, and we skip a glibc one if our
build
--
Tom Rini <tom_rini@mentor.com>
Mentor Graphics Corporation
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCHv3] Remove scsi/scsi.h header from linux-libc-headers
2010-04-28 16:01 ` [PATCHv3] Remove scsi/scsi.h header " Tom Rini
@ 2010-04-28 16:22 ` Koen Kooi
2010-05-03 19:23 ` Tom Rini
1 sibling, 0 replies; 9+ messages in thread
From: Koen Kooi @ 2010-04-28 16:22 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 28-04-10 18:01, Tom Rini wrote:
> linux-libc-headers: Delete include/scsi/scsi.h
>
> With 2.6.31, the kernel started exporting certain SCSI headers again and
> in particular scsi/scsi.h. After talking with Christoph Hellwig and
> James Bottemley (scsi maintainer) the kernel shouldn't export
> scsi/scsi.h. Removing this from the kernel, rather than trying to clean
> it up to be userland parseable is the right way to go.
>
> We bump the libc INC_PRs to make sure the end user has a sane
> <scsi/scsi.h> again.
>
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
Acked-By: Koen Kooi <k-kooi@ti.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFL2GDaMkyGM64RGpERAljVAJ4/fRKFn5ygDZoqdFMBFh3aWxQwYwCgqree
vh/O7agUqeF0RE9LGPz7Wq4=
=yE6h
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv3] Remove scsi/scsi.h header from linux-libc-headers
2010-04-28 16:01 ` [PATCHv3] Remove scsi/scsi.h header " Tom Rini
2010-04-28 16:22 ` Koen Kooi
@ 2010-05-03 19:23 ` Tom Rini
1 sibling, 0 replies; 9+ messages in thread
From: Tom Rini @ 2010-05-03 19:23 UTC (permalink / raw)
To: openembedded-devel
On Wed, 2010-04-28 at 09:01 -0700, Tom Rini wrote:
> linux-libc-headers: Delete include/scsi/scsi.h
>
> With 2.6.31, the kernel started exporting certain SCSI headers again and
> in particular scsi/scsi.h. After talking with Christoph Hellwig and
> James Bottemley (scsi maintainer) the kernel shouldn't export
> scsi/scsi.h. Removing this from the kernel, rather than trying to clean
> it up to be userland parseable is the right way to go.
So FYI all. The kernel patch is now queued up for the .35 merge window.
--
Tom Rini <tom_rini@mentor.com>
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-05-03 19:27 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-27 20:49 [PATCH] Remove scsi headers from linux-libc-headers Tom Rini
2010-04-27 21:04 ` [PATCHv2] " Tom Rini
2010-04-28 16:01 ` [PATCHv3] Remove scsi/scsi.h header " Tom Rini
2010-04-28 16:22 ` Koen Kooi
2010-05-03 19:23 ` Tom Rini
2010-04-27 21:22 ` [PATCH] Remove scsi headers " Khem Raj
2010-04-27 21:54 ` Koen Kooi
2010-04-27 22:06 ` Tom Rini
2010-04-28 6:34 ` Koen Kooi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.