Re: [PATCH] Remove scsi headers from linux-libc-headers

[Koen Kooi <k.kooi@student.utwente.nl>]

-----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-----