glibc and make headers_install_all provide /usr/include/scsi

glibc and make headers_install_all provide /usr/include/scsi

[Olaf Hering]

glibc and make headers_install_all provide /usr/include/scsi
One of them has to go.

A quick diff shows no differences, expect:

scsi.h:
     glibc #define STATUS_MASK          0x3e
     Linux #define STATUS_MASK          0xfe

     glibc #define ABORT               0x06
     Linux #define ABORT_TASK_SET      0x06

sg.h:struct sg_iovec ->sg_iovec
     unsigned char * in glibc
     void * in Linux

     glibc #define SG_DEFAULT_RETRIES 1
     Linux #define SG_DEFAULT_RETRIES 0


Which copy should be provided by a distributor?

Re: glibc and make headers_install_all provide /usr/include/scsi

[Christoph Hellwig]

On Mon, Aug 06, 2007 at 02:45:46PM +0200, Olaf Hering wrote:
> 
> glibc and make headers_install_all provide /usr/include/scsi
> One of them has to go.
> 
> A quick diff shows no differences, expect:

..

> Which copy should be provided by a distributor?

The glibc one of course.  The kernel scsi.h should never have been
added to the list of exportable headers.  

[PATCH] do not export /usr/include/scsi in make headers_install

[Olaf Hering]

On Mon, Aug 06, Christoph Hellwig wrote:

> On Mon, Aug 06, 2007 at 02:45:46PM +0200, Olaf Hering wrote:
> > 
> > glibc and make headers_install_all provide /usr/include/scsi
> > One of them has to go.
> > 
> > A quick diff shows no differences, expect:
> 
> ..
> 
> > Which copy should be provided by a distributor?
> 
> The glibc one of course.  The kernel scsi.h should never have been
> added to the list of exportable headers.  

/usr/include/scsi is provided by glibc.
Remove the scsi export from make headers_install target.


Signed-off-by: Olaf Hering <olh@suse.de>

---
 include/Kbuild      |    1 -
 include/scsi/Kbuild |    4 ----
 2 files changed, 5 deletions(-)

--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,6 +1,5 @@
 header-y += asm-generic/
 header-y += linux/
-header-y += scsi/
 header-y += sound/
 header-y += mtd/
 header-y += rdma/
--- a/include/scsi/Kbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-header-y += scsi.h
-
-unifdef-y += scsi_ioctl.h
-unifdef-y += sg.h

Re: [PATCH] do not export /usr/include/scsi in make headers_install

[David Woodhouse]

On Mon, 2007-08-06 at 15:02 +0200, Olaf Hering wrote:
> On Mon, Aug 06, Christoph Hellwig wrote:
> 
> > On Mon, Aug 06, 2007 at 02:45:46PM +0200, Olaf Hering wrote:
> > > 
> > > glibc and make headers_install_all provide /usr/include/scsi
> > > One of them has to go.
> > > 
> > > A quick diff shows no differences, expect:
> > 
> > ..
> > 
> > > Which copy should be provided by a distributor?
> > 
> > The glibc one of course.  The kernel scsi.h should never have been
> > added to the list of exportable headers.  
> 
> /usr/include/scsi is provided by glibc.
> Remove the scsi export from make headers_install target.
> 
> 
> Signed-off-by: Olaf Hering <olh@suse.de>

Acked-by: David Woodhouse <dwmw2@infradead.org>

> ---
>  include/Kbuild      |    1 -
>  include/scsi/Kbuild |    4 ----
>  2 files changed, 5 deletions(-)
> 
> --- a/include/Kbuild
> +++ b/include/Kbuild
> @@ -1,6 +1,5 @@
>  header-y += asm-generic/
>  header-y += linux/
> -header-y += scsi/
>  header-y += sound/
>  header-y += mtd/
>  header-y += rdma/
> --- a/include/scsi/Kbuild
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -header-y += scsi.h
> -
> -unifdef-y += scsi_ioctl.h
> -unifdef-y += sg.h
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
-- 
dwmw2